From 4373593d5111a8ed3b6d47ad4a458ee28ec942e3 Mon Sep 17 00:00:00 2001 From: Max Reitz Date: Fri, 20 Dec 2013 19:28:15 +0100 Subject: [PATCH] blkdebug: Allow command-line file configuration Introduce the "image" option as an alternative to specifying the image through the filename. Signed-off-by: Max Reitz Signed-off-by: Kevin Wolf --- block/blkdebug.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/block/blkdebug.c b/block/blkdebug.c index 21a4931594..c8f8d56758 100644 --- a/block/blkdebug.c +++ b/block/blkdebug.c @@ -374,7 +374,7 @@ static int blkdebug_open(BlockDriverState *bs, QDict *options, int flags, BDRVBlkdebugState *s = bs->opaque; QemuOpts *opts; Error *local_err = NULL; - const char *filename, *config; + const char *config; int ret; opts = qemu_opts_create(&runtime_opts, NULL, 0, &error_abort); @@ -396,14 +396,8 @@ static int blkdebug_open(BlockDriverState *bs, QDict *options, int flags, s->state = 1; /* Open the backing file */ - filename = qemu_opt_get(opts, "x-image"); - if (filename == NULL) { - error_setg(errp, "Could not retrieve image file name"); - ret = -EINVAL; - goto fail; - } - - ret = bdrv_file_open(&bs->file, filename, NULL, NULL, flags, &local_err); + ret = bdrv_open_image(&bs->file, qemu_opt_get(opts, "x-image"), options, "image", + flags, true, false, &local_err); if (ret < 0) { error_propagate(errp, local_err); goto fail;