[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 19/20] block: Allow overriding backing.file.filename
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 19/20] block: Allow overriding backing.file.filename |
Date: |
Mon, 22 Apr 2013 13:31:33 +0200 |
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 <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
block.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/block.c b/block.c
index 6e07f45..819eb4e 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;
}
--
1.8.1.4
- [Qemu-devel] [PATCH 08/20] raw-posix: Use bdrv_open options instead of filename, (continued)
- [Qemu-devel] [PATCH 08/20] raw-posix: Use bdrv_open options instead of filename, Kevin Wolf, 2013/04/22
- [Qemu-devel] [PATCH 10/20] blkdebug: Use bdrv_open options instead of filename, Kevin Wolf, 2013/04/22
- [Qemu-devel] [PATCH 09/20] raw-win32: Use bdrv_open options instead of filename, Kevin Wolf, 2013/04/22
- [Qemu-devel] [PATCH 11/20] blkverify: Use bdrv_open options instead of filename, Kevin Wolf, 2013/04/22
- [Qemu-devel] [PATCH 13/20] gluster: Use bdrv_open options instead of filename, Kevin Wolf, 2013/04/22
- [Qemu-devel] [PATCH 15/20] rbd: Use bdrv_open options instead of filename, Kevin Wolf, 2013/04/22
- [Qemu-devel] [PATCH 12/20] curl: Use bdrv_open options instead of filename, Kevin Wolf, 2013/04/22
- [Qemu-devel] [PATCH 14/20] iscsi: Use bdrv_open options instead of filename, Kevin Wolf, 2013/04/22
- [Qemu-devel] [PATCH 17/20] vvfat: Use bdrv_open options instead of filename, Kevin Wolf, 2013/04/22
- [Qemu-devel] [PATCH 16/20] sheepdog: Use bdrv_open options instead of filename, Kevin Wolf, 2013/04/22
- [Qemu-devel] [PATCH 19/20] block: Allow overriding backing.file.filename,
Kevin Wolf <=
- [Qemu-devel] [PATCH 20/20] qemu-iotests: add 053 unaligned compressed image size test, Kevin Wolf, 2013/04/22
- [Qemu-devel] [PATCH 18/20] block: Remove filename parameter from .bdrv_file_open(), Kevin Wolf, 2013/04/22