From 1cb6f506444ddf00bb163e5ffa28ab1051b65642 Mon Sep 17 00:00:00 2001 From: Kevin Wolf Date: Fri, 12 Apr 2013 20:27:07 +0200 Subject: [PATCH] block: Allow overriding backing.file.filename If a filename is passed in the driver-specific options from the command line, the backing file path from the image is ignored now. Signed-off-by: Kevin Wolf Reviewed-by: Eric Blake --- block.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/block.c b/block.c index 6e07f4572b..819eb4e009 100644 --- a/block.c +++ b/block.c @@ -889,7 +889,9 @@ int bdrv_open_backing_file(BlockDriverState *bs, QDict *options) } bs->open_flags &= ~BDRV_O_NO_BACKING; - if (bs->backing_file[0] == '\0' && qdict_size(options) == 0) { + if (qdict_haskey(options, "file.filename")) { + backing_filename[0] = '\0'; + } else if (bs->backing_file[0] == '\0' && qdict_size(options) == 0) { QDECREF(options); return 0; } -- 2.39.5