[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 27/42] block: Allow block devices without files
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 27/42] block: Allow block devices without files |
Date: |
Wed, 15 Jan 2014 11:22:40 +0100 |
From: Max Reitz <address@hidden>
blkdebug and blkverify will, in order to retain compatibility, not
support the field "file" implicitly through bdrv_open(). In order to be
able to use those drivers without giving a filename anyway, it is
necessary to be able to have block devices without files implicitly
opened by bdrv_open(). This is the case, if there was neither a file
name, a reference to an existing block device to use as a file nor
options specific to the file.
Signed-off-by: Max Reitz <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
block.c | 23 ++++++++++++++++-------
1 file changed, 16 insertions(+), 7 deletions(-)
diff --git a/block.c b/block.c
index bef4f82..7464fb2 100644
--- a/block.c
+++ b/block.c
@@ -1145,11 +1145,14 @@ int bdrv_open(BlockDriverState *bs, const char
*filename, QDict *options,
qdict_extract_subqdict(options, &file_options, "file.");
file_reference = qdict_get_try_str(options, "file");
- ret = bdrv_file_open(&file, filename, file_reference, file_options,
- bdrv_open_flags(bs, flags | BDRV_O_UNMAP),
&local_err);
- qdict_del(options, "file");
- if (ret < 0) {
- goto fail;
+ if (filename || file_reference || qdict_size(file_options)) {
+ ret = bdrv_file_open(&file, filename, file_reference, file_options,
+ bdrv_open_flags(bs, flags | BDRV_O_UNMAP),
+ &local_err);
+ qdict_del(options, "file");
+ if (ret < 0) {
+ goto fail;
+ }
}
/* Find the right image format driver */
@@ -1165,7 +1168,13 @@ int bdrv_open(BlockDriverState *bs, const char
*filename, QDict *options,
}
if (!drv) {
- ret = find_image_format(file, filename, &drv, &local_err);
+ if (file) {
+ ret = find_image_format(file, filename, &drv, &local_err);
+ } else {
+ error_setg(errp, "Must specify either driver or file");
+ ret = -EINVAL;
+ goto unlink_and_fail;
+ }
}
if (!drv) {
@@ -1178,7 +1187,7 @@ int bdrv_open(BlockDriverState *bs, const char *filename,
QDict *options,
goto unlink_and_fail;
}
- if (bs->file != file) {
+ if (file && (bs->file != file)) {
bdrv_unref(file);
file = NULL;
}
--
1.8.1.4
- Re: [Qemu-devel] [PULL 36/42] qapi: QMP interface for blkdebug and blkverify, (continued)
[Qemu-devel] [PULL 37/42] qemu-io: Make filename optional, Kevin Wolf, 2014/01/15
[Qemu-devel] [PULL 39/42] tests: Add test for qdict_flatten(), Kevin Wolf, 2014/01/15
[Qemu-devel] [PULL 40/42] iotests: Test new blkdebug/blkverify interface, Kevin Wolf, 2014/01/15
[Qemu-devel] [PULL 38/42] tests: Add test for qdict_array_split(), Kevin Wolf, 2014/01/15
[Qemu-devel] [PULL 41/42] iotests: Test file format nesting, Kevin Wolf, 2014/01/15
[Qemu-devel] [PULL 42/42] block: fix backing file segfault, Kevin Wolf, 2014/01/15
[Qemu-devel] [PULL 27/42] block: Allow block devices without files,
Kevin Wolf <=