[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 14/21] blockdev: Set 'format' indicates non-empty
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH v3 14/21] blockdev: Set 'format' indicates non-empty drive |
Date: |
Fri, 4 Dec 2015 14:35:17 +0100 |
Creating an empty drive while specifying 'format' doesn't make sense.
The specified format driver would simply be ignored.
Make a set 'format' option an indication that a non-empty drive should
be created. This makes 'format' consistent with 'driver' and allows
using it with a block driver that doesn't need any other options (like
null-co/null-aio).
Signed-off-by: Kevin Wolf <address@hidden>
---
blockdev.c | 5 +----
tests/hd-geo-test.c | 4 ++--
tests/qemu-iotests/iotests.py | 2 +-
3 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index 313841b..afaeef9 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -490,7 +490,6 @@ static BlockBackend *blockdev_init(const char *file, QDict
*bs_opts,
QDict *interval_dict = NULL;
QList *interval_list = NULL;
const char *id;
- bool has_driver_specific_opts;
BlockdevDetectZeroesOptions detect_zeroes =
BLOCKDEV_DETECT_ZEROES_OPTIONS_OFF;
const char *throttling_group = NULL;
@@ -514,8 +513,6 @@ static BlockBackend *blockdev_init(const char *file, QDict
*bs_opts,
qdict_del(bs_opts, "id");
}
- has_driver_specific_opts = !!qdict_size(bs_opts);
-
/* extract parameters */
snapshot = qemu_opt_get_bool(opts, "snapshot", 0);
@@ -578,7 +575,7 @@ static BlockBackend *blockdev_init(const char *file, QDict
*bs_opts,
}
/* init */
- if ((!file || !*file) && !has_driver_specific_opts) {
+ if ((!file || !*file) && !qdict_size(bs_opts)) {
BlockBackendRootState *blk_rs;
blk = blk_new(qemu_opts_id(opts), errp);
diff --git a/tests/hd-geo-test.c b/tests/hd-geo-test.c
index 00afc20..13b763d 100644
--- a/tests/hd-geo-test.c
+++ b/tests/hd-geo-test.c
@@ -206,13 +206,13 @@ static int setup_ide(int argc, char *argv[], int argv_sz,
{
char *s1, *s2, *s3;
- s1 = g_strdup_printf("-drive id=drive%d,if=%s,format=raw",
+ s1 = g_strdup_printf("-drive id=drive%d,if=%s",
ide_idx, dev ? "none" : "ide");
s2 = dev ? g_strdup("") : g_strdup_printf(",index=%d", ide_idx);
if (img_secs[img_idx] >= 0) {
setup_mbr(img_idx, mbr);
- s3 = g_strdup_printf(",file=%s", img_file_name[img_idx]);
+ s3 = g_strdup_printf(",format=raw,file=%s", img_file_name[img_idx]);
} else {
s3 = g_strdup(",media=cdrom");
}
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index e02245e..27eddec 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -148,12 +148,12 @@ class VM(object):
def add_drive(self, path, opts='', interface='virtio'):
'''Add a virtio-blk drive to the VM'''
options = ['if=%s' % interface,
- 'format=%s' % imgfmt,
'cache=%s' % cachemode,
'id=drive%d' % self._num_drives]
if path is not None:
options.append('file=%s' % path)
+ options.append('format=%s' % imgfmt)
if opts:
options.append(opts)
--
1.8.3.1
- Re: [Qemu-devel] [PATCH v3 06/21] block: Exclude nested options only for children in append_open_options(), (continued)
- [Qemu-devel] [PATCH v3 04/21] block: Allow references for backing files, Kevin Wolf, 2015/12/04
- [Qemu-devel] [PATCH v3 07/21] block: Pass driver-specific options to .bdrv_refresh_filename(), Kevin Wolf, 2015/12/04
- [Qemu-devel] [PATCH v3 05/21] block: Consider all block layer options in append_open_options, Kevin Wolf, 2015/12/04
- [Qemu-devel] [PATCH v3 09/21] block: Allow specifying child options in reopen, Kevin Wolf, 2015/12/04
- [Qemu-devel] [PATCH v3 08/21] block: Keep "driver" in bs->options, Kevin Wolf, 2015/12/04
- [Qemu-devel] [PATCH v3 10/21] block: reopen: Document option precedence and refactor accordingly, Kevin Wolf, 2015/12/04
- [Qemu-devel] [PATCH v3 11/21] block: Add infrastructure for option inheritance, Kevin Wolf, 2015/12/04
- [Qemu-devel] [PATCH v3 13/21] block: Introduce bs->explicit_options, Kevin Wolf, 2015/12/04
- [Qemu-devel] [PATCH v3 14/21] blockdev: Set 'format' indicates non-empty drive,
Kevin Wolf <=
- [Qemu-devel] [PATCH v3 15/21] qemu-iotests: Remove cache mode test without medium, Kevin Wolf, 2015/12/04
- [Qemu-devel] [PATCH v3 12/21] block: Split out parse_json_protocol(), Kevin Wolf, 2015/12/04
- [Qemu-devel] [PATCH v3 18/21] blkdebug: Enable reopen, Kevin Wolf, 2015/12/04
- [Qemu-devel] [PATCH v3 16/21] block: reopen: Extract QemuOpts for generic block layer options, Kevin Wolf, 2015/12/04
- [Qemu-devel] [PATCH v3 17/21] block: Move cache options into options QDict, Kevin Wolf, 2015/12/04
- [Qemu-devel] [PATCH v3 21/21] qemu-iotests: Test reopen with node-name/driver options, Kevin Wolf, 2015/12/04
- [Qemu-devel] [PATCH v3 19/21] qemu-iotests: Try setting cache mode for children, Kevin Wolf, 2015/12/04
- [Qemu-devel] [PATCH v3 20/21] qemu-iotests: Test cache mode option inheritance, Kevin Wolf, 2015/12/04