1
The following changes since commit 38441756b70eec5807b5f60dad11a93a91199866:
1
The following changes since commit b2f7a038bb4c4fc5ce6b8486e8513dfd97665e2a:
2
2
3
Update version for v3.0.0 release (2018-08-14 16:38:43 +0100)
3
Merge remote-tracking branch 'remotes/rth/tags/pull-softfloat-20181104' into staging (2018-11-05 10:32:49 +0000)
4
4
5
are available in the git repository at:
5
are available in the Git repository at:
6
6
7
git://repo.or.cz/qemu/kevin.git tags/for-upstream
7
git://repo.or.cz/qemu/kevin.git tags/for-upstream
8
8
9
for you to fetch changes up to b5fc2d306664c0c1c6c5cf8e164ffa7b8892283e:
9
for you to fetch changes up to 1240ac558d348f6c7a5752b1a57c1da58e4efe3e:
10
10
11
qapi: block: Remove mentions of error types which were removed (2018-08-15 12:50:39 +0200)
11
include: Add a comment to explain the origin of sizes' lookup table (2018-11-05 15:29:59 +0100)
12
12
13
----------------------------------------------------------------
13
----------------------------------------------------------------
14
Block layer patches:
14
Block layer patches:
15
15
16
- Remove deprecated -drive options for geometry/serial/addr
16
- auto-read-only option to fix commit job when used with -blockdev
17
- luks: Allow shared writers if the parents allow them (share-rw=on)
17
- Fix help text related qemu-iotests failure (by improving the help text
18
- qemu-img: Fix error when trying to convert to encrypted target image
18
and updating the reference output)
19
- mirror: Fail gracefully for source == target
19
- quorum: Add missing checks when adding/removing child nodes
20
- I/O throttling: Fix behaviour during drain (always ignore the limits)
20
- Don't take address of fields in packed structs
21
- bdrv_reopen() related fixes for bs->options/explicit_options content
21
- vvfat: Fix crash when reporting error about too many files in directory
22
- Documentation improvements
23
22
24
----------------------------------------------------------------
23
----------------------------------------------------------------
25
Alberto Garcia (9):
24
Alberto Garcia (7):
26
qemu-iotests: Test removing a throttle group member with a pending timer
25
block: replace "discard" literal with BDRV_OPT_DISCARD macro
27
throttle-groups: Skip the round-robin if a member is being drained
26
qcow2: Get the request alignment for encrypted images from QCryptoBlock
28
qemu-iotests: Update 093 to improve the draining test
27
quorum: Remove quorum_err()
29
throttle-groups: Don't allow timers without throttled requests
28
quorum: Return an error if the blkverify mode has invalid settings
30
qdict: Make qdict_extract_subqdict() accept dst = NULL
29
iotest: Test the blkverify mode of the Quorum driver
31
block: Remove children options from bs->{options,explicit_options}
30
quorum: Forbid adding children in blkverify mode
32
block: Simplify bdrv_reopen_abort()
31
iotest: Test x-blockdev-change on a Quorum
33
block: Update bs->options if bdrv_reopen() succeeds
32
34
block: Simplify append_open_options()
33
Cleber Rosa (1):
34
iotests: make 083 specific to raw
35
35
36
Daniel P. Berrangé (1):
36
Daniel P. Berrangé (1):
37
qemu-img: fix regression copying secrets during convert
37
crypto: initialize sector size even when opening with no IO flag
38
38
39
Fam Zheng (1):
39
Kevin Wolf (12):
40
luks: Allow share-rw=on
40
vpc: Don't leak opts in vpc_open()
41
block: Update flags in bdrv_set_read_only()
42
block: Add auto-read-only option
43
rbd: Close image in qemu_rbd_open() error path
44
block: Require auto-read-only for existing fallbacks
45
nbd: Support auto-read-only option
46
file-posix: Support auto-read-only option
47
curl: Support auto-read-only option
48
gluster: Support auto-read-only option
49
iscsi: Support auto-read-only option
50
block: Make auto-read-only=on default for -drive
51
qemu-iotests: Test auto-read-only with -drive and -blockdev
41
52
42
Kevin Wolf (7):
53
Leonid Bloch (2):
43
block/qapi: Fix memory leak in qmp_query_blockstats()
54
vdi: Use a literal number of bytes for DEFAULT_CLUSTER_SIZE
44
block: Remove deprecated -drive geometry options
55
include: Add a comment to explain the origin of sizes' lookup table
45
block: Remove deprecated -drive option addr
46
block: Remove deprecated -drive option serial
47
block: Remove dead deprecation warning code
48
qapi/block: Document restrictions for node names
49
mirror: Fail gracefully for source == target
50
56
51
Peter Krempa (1):
57
Li Qiang (1):
52
qapi: block: Remove mentions of error types which were removed
58
block: change some function return type to bool
53
59
54
Vladimir Sementsov-Ogievskiy (2):
60
Max Reitz (5):
55
block: make .bdrv_close optional
61
option: Make option help nicer to read
56
block: drop empty .bdrv_close handlers
62
chardev: Indent list of chardevs
63
qdev-monitor: Make device options help nicer
64
object: Make option help nicer to read
65
fw_cfg: Drop newline in @file description
57
66
58
qapi/block-core.json | 8 ++--
67
Peter Maydell (5):
59
include/hw/block/block.h | 1 -
68
block/qcow2: Don't take address of fields in packed structs
60
include/sysemu/blockdev.h | 3 --
69
block/qcow: Don't take address of fields in packed structs
61
block.c | 46 ++++++++++++++-----
70
block/qcow2-bitmap: Don't take address of fields in packed structs
62
block/blkreplay.c | 5 ---
71
block/vhdx: Don't take address of fields in packed structs
63
block/block-backend.c | 1 -
72
block/vdi: Don't take address of fields in packed structs
64
block/commit.c | 5 ---
65
block/copy-on-read.c | 6 ---
66
block/crypto.c | 4 +-
67
block/mirror.c | 10 ++---
68
block/null.c | 6 ---
69
block/qapi.c | 3 +-
70
block/raw-format.c | 5 ---
71
block/snapshot.c | 4 +-
72
block/throttle-groups.c | 41 ++++++++++++-----
73
blockdev.c | 110 ---------------------------------------------
74
device-hotplug.c | 4 --
75
hw/block/block.c | 27 -----------
76
hw/block/nvme.c | 1 -
77
hw/block/virtio-blk.c | 1 -
78
hw/ide/qdev.c | 1 -
79
hw/scsi/scsi-disk.c | 1 -
80
hw/usb/dev-storage.c | 1 -
81
qemu-img.c | 32 +++++++------
82
qobject/block-qdict.c | 11 +++--
83
tests/ahci-test.c | 6 +--
84
tests/hd-geo-test.c | 37 +++------------
85
tests/ide-test.c | 8 ++--
86
hmp-commands.hx | 1 -
87
qemu-deprecated.texi | 15 -------
88
qemu-options.hx | 14 +-----
89
tests/qemu-iotests/041 | 6 +++
90
tests/qemu-iotests/041.out | 4 +-
91
tests/qemu-iotests/093 | 55 +++++++++++++++++++++++
92
tests/qemu-iotests/093.out | 4 +-
93
35 files changed, 185 insertions(+), 302 deletions(-)
94
73
74
Stefan Weil (1):
75
qemu-io-cmds: Fix two format strings
76
77
Thomas Huth (1):
78
block/vvfat: Fix crash when reporting error about too many files in directory
79
80
qapi/block-core.json | 7 +
81
block/vhdx.h | 12 +-
82
include/block/block.h | 5 +-
83
include/qemu/option.h | 2 +-
84
include/qemu/units.h | 18 +
85
include/sysemu/block-backend.h | 6 +-
86
block.c | 60 ++-
87
block/block-backend.c | 8 +-
88
block/bochs.c | 17 +-
89
block/cloop.c | 16 +-
90
block/curl.c | 8 +-
91
block/dmg.c | 16 +-
92
block/file-posix.c | 19 +-
93
block/gluster.c | 12 +-
94
block/iscsi.c | 8 +-
95
block/nbd-client.c | 10 +-
96
block/qcow.c | 18 +-
97
block/qcow2-bitmap.c | 24 +-
98
block/qcow2.c | 66 +--
99
block/quorum.c | 45 +-
100
block/rbd.c | 14 +-
101
block/vdi.c | 68 +--
102
block/vhdx-endian.c | 118 ++---
103
block/vhdx-log.c | 4 +-
104
block/vhdx.c | 18 +-
105
block/vpc.c | 2 +
106
block/vvfat.c | 15 +-
107
blockdev.c | 3 +-
108
chardev/char.c | 2 +-
109
crypto/block-qcow.c | 2 +
110
qdev-monitor.c | 13 +-
111
qemu-img.c | 4 +-
112
qemu-io-cmds.c | 4 +-
113
util/qemu-option.c | 32 +-
114
vl.c | 15 +-
115
tests/qemu-iotests/081 | 116 +++++
116
tests/qemu-iotests/081.out | 70 +++
117
tests/qemu-iotests/082.out | 956 ++++++++++++++++++++---------------------
118
tests/qemu-iotests/083 | 2 +-
119
tests/qemu-iotests/232 | 147 +++++++
120
tests/qemu-iotests/232.out | 59 +++
121
tests/qemu-iotests/group | 1 +
122
42 files changed, 1266 insertions(+), 776 deletions(-)
123
create mode 100755 tests/qemu-iotests/232
124
create mode 100644 tests/qemu-iotests/232.out
125
diff view generated by jsdifflib
New patch
1
From: Thomas Huth <thuth@redhat.com>
1
2
3
When using the vvfat driver with a directory that contains too many files,
4
QEMU currently crashes. This can be triggered like this for example:
5
6
mkdir /tmp/vvfattest
7
cd /tmp/vvfattest
8
for ((x=0;x<=513;x++)); do mkdir $x; done
9
qemu-system-x86_64 -drive \
10
file.driver=vvfat,file.dir=.,read-only=on,media=cdrom
11
12
Seems like read_directory() is changing the mapping->path variable. Make
13
sure we use the right pointer instead.
14
15
Signed-off-by: Thomas Huth <thuth@redhat.com>
16
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
17
---
18
block/vvfat.c | 4 ++--
19
1 file changed, 2 insertions(+), 2 deletions(-)
20
21
diff --git a/block/vvfat.c b/block/vvfat.c
22
index XXXXXXX..XXXXXXX 100644
23
--- a/block/vvfat.c
24
+++ b/block/vvfat.c
25
@@ -XXX,XX +XXX,XX @@ static int init_directories(BDRVVVFATState* s,
26
mapping = array_get(&(s->mapping), i);
27
28
if (mapping->mode & MODE_DIRECTORY) {
29
+ char *path = mapping->path;
30
mapping->begin = cluster;
31
if(read_directory(s, i)) {
32
- error_setg(errp, "Could not read directory %s",
33
- mapping->path);
34
+ error_setg(errp, "Could not read directory %s", path);
35
return -1;
36
}
37
mapping = array_get(&(s->mapping), i);
38
--
39
2.19.1
40
41
diff view generated by jsdifflib
1
From: Alberto Garcia <berto@igalia.com>
1
From: Alberto Garcia <berto@igalia.com>
2
3
When bdrv_open_inherit() opens a BlockDriverState the options QDict
4
can contain options for some of its children, passed in the form of
5
child-name.option=value
6
7
So while each child is opened with that subset of options, those same
8
options remain stored in the parent BDS, leaving (at least) two copies
9
of each one of them ("child-name.option=value" in the parent and
10
"option=value" in the child).
11
12
Having the children options stored in the parent is unnecessary and it
13
can easily lead to an inconsistent state:
14
15
$ qemu-img create -f qcow2 hd0.qcow2 10M
16
$ qemu-img create -f qcow2 -b hd0.qcow2 hd1.qcow2
17
$ qemu-img create -f qcow2 -b hd1.qcow2 hd2.qcow2
18
19
$ $QEMU -drive file=hd2.qcow2,node-name=hd2,backing.node-name=hd1
20
21
This opens a chain of images hd0 <- hd1 <- hd2. Now let's remove hd1
22
using block_stream:
23
24
(qemu) block_stream hd2 0 hd0.qcow2
25
26
After this hd2 contains backing.node-name=hd1, which is no longer
27
correct because hd1 doesn't exist anymore.
28
29
This patch removes all children options from the parent dictionaries
30
at the end of bdrv_open_inherit() and bdrv_reopen_queue_child().
31
2
32
Signed-off-by: Alberto Garcia <berto@igalia.com>
3
Signed-off-by: Alberto Garcia <berto@igalia.com>
33
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
4
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
34
---
5
---
35
block.c | 11 +++++++++++
6
block.c | 6 +++---
36
1 file changed, 11 insertions(+)
7
1 file changed, 3 insertions(+), 3 deletions(-)
37
8
38
diff --git a/block.c b/block.c
9
diff --git a/block.c b/block.c
39
index XXXXXXX..XXXXXXX 100644
10
index XXXXXXX..XXXXXXX 100644
40
--- a/block.c
11
--- a/block.c
41
+++ b/block.c
12
+++ b/block.c
42
@@ -XXX,XX +XXX,XX @@ static BlockDriverState *bdrv_open_inherit(const char *filename,
13
@@ -XXX,XX +XXX,XX @@ QemuOptsList bdrv_runtime_opts = {
43
BlockBackend *file = NULL;
14
.help = "try to optimize zero writes (off, on, unmap)",
44
BlockDriverState *bs;
15
},
45
BlockDriver *drv = NULL;
16
{
46
+ BdrvChild *child;
17
- .name = "discard",
47
const char *drvname;
18
+ .name = BDRV_OPT_DISCARD,
48
const char *backing;
19
.type = QEMU_OPT_STRING,
49
Error *local_err = NULL;
20
.help = "discard operation (ignore/off, unmap/on)",
50
@@ -XXX,XX +XXX,XX @@ static BlockDriverState *bdrv_open_inherit(const char *filename,
21
},
22
@@ -XXX,XX +XXX,XX @@ static int bdrv_open_common(BlockDriverState *bs, BlockBackend *file,
51
}
23
}
52
}
24
}
53
25
54
+ /* Remove all children options from bs->options and bs->explicit_options */
26
- discard = qemu_opt_get(opts, "discard");
55
+ QLIST_FOREACH(child, &bs->children, next) {
27
+ discard = qemu_opt_get(opts, BDRV_OPT_DISCARD);
56
+ char *child_key_dot;
28
if (discard != NULL) {
57
+ child_key_dot = g_strdup_printf("%s.", child->name);
29
if (bdrv_parse_discard_flags(discard, &bs->open_flags) != 0) {
58
+ qdict_extract_subqdict(bs->explicit_options, NULL, child_key_dot);
30
error_setg(errp, "Invalid discard option");
59
+ qdict_extract_subqdict(bs->options, NULL, child_key_dot);
31
@@ -XXX,XX +XXX,XX @@ int bdrv_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQueue *queue,
60
+ g_free(child_key_dot);
32
61
+ }
33
update_flags_from_options(&reopen_state->flags, opts);
62
+
34
63
bdrv_refresh_filename(bs);
35
- discard = qemu_opt_get_del(opts, "discard");
64
36
+ discard = qemu_opt_get_del(opts, BDRV_OPT_DISCARD);
65
/* Check if any unknown options were used */
37
if (discard != NULL) {
66
@@ -XXX,XX +XXX,XX @@ static BlockReopenQueue *bdrv_reopen_queue_child(BlockReopenQueue *bs_queue,
38
if (bdrv_parse_discard_flags(discard, &reopen_state->flags) != 0) {
67
}
39
error_setg(errp, "Invalid discard option");
68
69
child_key_dot = g_strdup_printf("%s.", child->name);
70
+ qdict_extract_subqdict(explicit_options, NULL, child_key_dot);
71
qdict_extract_subqdict(options, &new_child_options, child_key_dot);
72
g_free(child_key_dot);
73
74
--
40
--
75
2.13.6
41
2.19.1
76
42
77
43
diff view generated by jsdifflib
New patch
1
From: Stefan Weil <sw@weilnetz.de>
1
2
3
Use %zu instead of %zd for unsigned numbers.
4
5
This fixes two error messages from the LSTM static code analyzer:
6
7
This argument should be of type 'ssize_t' but is of type 'unsigned long'
8
9
Signed-off-by: Stefan Weil <sw@weilnetz.de>
10
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
11
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
12
---
13
qemu-io-cmds.c | 4 ++--
14
1 file changed, 2 insertions(+), 2 deletions(-)
15
16
diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c
17
index XXXXXXX..XXXXXXX 100644
18
--- a/qemu-io-cmds.c
19
+++ b/qemu-io-cmds.c
20
@@ -XXX,XX +XXX,XX @@ static int readv_f(BlockBackend *blk, int argc, char **argv)
21
memset(cmp_buf, pattern, qiov.size);
22
if (memcmp(buf, cmp_buf, qiov.size)) {
23
printf("Pattern verification failed at offset %"
24
- PRId64 ", %zd bytes\n", offset, qiov.size);
25
+ PRId64 ", %zu bytes\n", offset, qiov.size);
26
ret = -EINVAL;
27
}
28
g_free(cmp_buf);
29
@@ -XXX,XX +XXX,XX @@ static void aio_read_done(void *opaque, int ret)
30
memset(cmp_buf, ctx->pattern, ctx->qiov.size);
31
if (memcmp(ctx->buf, cmp_buf, ctx->qiov.size)) {
32
printf("Pattern verification failed at offset %"
33
- PRId64 ", %zd bytes\n", ctx->offset, ctx->qiov.size);
34
+ PRId64 ", %zu bytes\n", ctx->offset, ctx->qiov.size);
35
}
36
g_free(cmp_buf);
37
}
38
--
39
2.19.1
40
41
diff view generated by jsdifflib
New patch
1
From: Peter Maydell <peter.maydell@linaro.org>
1
2
3
Taking the address of a field in a packed struct is a bad idea, because
4
it might not be actually aligned enough for that pointer type (and
5
thus cause a crash on dereference on some host architectures). Newer
6
versions of clang warn about this. Avoid the bug by not using the
7
"modify in place" byte swapping functions.
8
9
There are a few places where the in-place swap function is
10
used on something other than a packed struct field; we convert
11
those anyway, for consistency.
12
13
This patch was produced with the following spatch script
14
(and hand-editing to fold a few resulting overlength lines):
15
16
@@
17
expression E;
18
@@
19
-be16_to_cpus(&E);
20
+E = be16_to_cpu(E);
21
@@
22
expression E;
23
@@
24
-be32_to_cpus(&E);
25
+E = be32_to_cpu(E);
26
@@
27
expression E;
28
@@
29
-be64_to_cpus(&E);
30
+E = be64_to_cpu(E);
31
@@
32
expression E;
33
@@
34
-cpu_to_be16s(&E);
35
+E = cpu_to_be16(E);
36
@@
37
expression E;
38
@@
39
-cpu_to_be32s(&E);
40
+E = cpu_to_be32(E);
41
@@
42
expression E;
43
@@
44
-cpu_to_be64s(&E);
45
+E = cpu_to_be64(E);
46
47
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
48
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
49
Tested-by: John Snow <jsnow@redhat.com>
50
Reviewed-by: John Snow <jsnow@redhat.com>
51
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
52
---
53
block/qcow2.c | 64 +++++++++++++++++++++++++++------------------------
54
1 file changed, 34 insertions(+), 30 deletions(-)
55
56
diff --git a/block/qcow2.c b/block/qcow2.c
57
index XXXXXXX..XXXXXXX 100644
58
--- a/block/qcow2.c
59
+++ b/block/qcow2.c
60
@@ -XXX,XX +XXX,XX @@ static int qcow2_read_extensions(BlockDriverState *bs, uint64_t start_offset,
61
"pread fail from offset %" PRIu64, offset);
62
return 1;
63
}
64
- be32_to_cpus(&ext.magic);
65
- be32_to_cpus(&ext.len);
66
+ ext.magic = be32_to_cpu(ext.magic);
67
+ ext.len = be32_to_cpu(ext.len);
68
offset += sizeof(ext);
69
#ifdef DEBUG_EXT
70
printf("ext.magic = 0x%x\n", ext.magic);
71
@@ -XXX,XX +XXX,XX @@ static int qcow2_read_extensions(BlockDriverState *bs, uint64_t start_offset,
72
"Unable to read CRYPTO header extension");
73
return ret;
74
}
75
- be64_to_cpus(&s->crypto_header.offset);
76
- be64_to_cpus(&s->crypto_header.length);
77
+ s->crypto_header.offset = be64_to_cpu(s->crypto_header.offset);
78
+ s->crypto_header.length = be64_to_cpu(s->crypto_header.length);
79
80
if ((s->crypto_header.offset % s->cluster_size) != 0) {
81
error_setg(errp, "Encryption header offset '%" PRIu64 "' is "
82
@@ -XXX,XX +XXX,XX @@ static int qcow2_read_extensions(BlockDriverState *bs, uint64_t start_offset,
83
return -EINVAL;
84
}
85
86
- be32_to_cpus(&bitmaps_ext.nb_bitmaps);
87
- be64_to_cpus(&bitmaps_ext.bitmap_directory_size);
88
- be64_to_cpus(&bitmaps_ext.bitmap_directory_offset);
89
+ bitmaps_ext.nb_bitmaps = be32_to_cpu(bitmaps_ext.nb_bitmaps);
90
+ bitmaps_ext.bitmap_directory_size =
91
+ be64_to_cpu(bitmaps_ext.bitmap_directory_size);
92
+ bitmaps_ext.bitmap_directory_offset =
93
+ be64_to_cpu(bitmaps_ext.bitmap_directory_offset);
94
95
if (bitmaps_ext.nb_bitmaps > QCOW2_MAX_BITMAPS) {
96
error_setg(errp,
97
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn qcow2_do_open(BlockDriverState *bs, QDict *options,
98
error_setg_errno(errp, -ret, "Could not read qcow2 header");
99
goto fail;
100
}
101
- be32_to_cpus(&header.magic);
102
- be32_to_cpus(&header.version);
103
- be64_to_cpus(&header.backing_file_offset);
104
- be32_to_cpus(&header.backing_file_size);
105
- be64_to_cpus(&header.size);
106
- be32_to_cpus(&header.cluster_bits);
107
- be32_to_cpus(&header.crypt_method);
108
- be64_to_cpus(&header.l1_table_offset);
109
- be32_to_cpus(&header.l1_size);
110
- be64_to_cpus(&header.refcount_table_offset);
111
- be32_to_cpus(&header.refcount_table_clusters);
112
- be64_to_cpus(&header.snapshots_offset);
113
- be32_to_cpus(&header.nb_snapshots);
114
+ header.magic = be32_to_cpu(header.magic);
115
+ header.version = be32_to_cpu(header.version);
116
+ header.backing_file_offset = be64_to_cpu(header.backing_file_offset);
117
+ header.backing_file_size = be32_to_cpu(header.backing_file_size);
118
+ header.size = be64_to_cpu(header.size);
119
+ header.cluster_bits = be32_to_cpu(header.cluster_bits);
120
+ header.crypt_method = be32_to_cpu(header.crypt_method);
121
+ header.l1_table_offset = be64_to_cpu(header.l1_table_offset);
122
+ header.l1_size = be32_to_cpu(header.l1_size);
123
+ header.refcount_table_offset = be64_to_cpu(header.refcount_table_offset);
124
+ header.refcount_table_clusters =
125
+ be32_to_cpu(header.refcount_table_clusters);
126
+ header.snapshots_offset = be64_to_cpu(header.snapshots_offset);
127
+ header.nb_snapshots = be32_to_cpu(header.nb_snapshots);
128
129
if (header.magic != QCOW_MAGIC) {
130
error_setg(errp, "Image is not in qcow2 format");
131
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn qcow2_do_open(BlockDriverState *bs, QDict *options,
132
header.refcount_order = 4;
133
header.header_length = 72;
134
} else {
135
- be64_to_cpus(&header.incompatible_features);
136
- be64_to_cpus(&header.compatible_features);
137
- be64_to_cpus(&header.autoclear_features);
138
- be32_to_cpus(&header.refcount_order);
139
- be32_to_cpus(&header.header_length);
140
+ header.incompatible_features =
141
+ be64_to_cpu(header.incompatible_features);
142
+ header.compatible_features = be64_to_cpu(header.compatible_features);
143
+ header.autoclear_features = be64_to_cpu(header.autoclear_features);
144
+ header.refcount_order = be32_to_cpu(header.refcount_order);
145
+ header.header_length = be32_to_cpu(header.header_length);
146
147
if (header.header_length < 104) {
148
error_setg(errp, "qcow2 header too short");
149
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn qcow2_do_open(BlockDriverState *bs, QDict *options,
150
goto fail;
151
}
152
for(i = 0;i < s->l1_size; i++) {
153
- be64_to_cpus(&s->l1_table[i]);
154
+ s->l1_table[i] = be64_to_cpu(s->l1_table[i]);
155
}
156
}
157
158
@@ -XXX,XX +XXX,XX @@ int qcow2_update_header(BlockDriverState *bs)
159
160
/* Full disk encryption header pointer extension */
161
if (s->crypto_header.offset != 0) {
162
- cpu_to_be64s(&s->crypto_header.offset);
163
- cpu_to_be64s(&s->crypto_header.length);
164
+ s->crypto_header.offset = cpu_to_be64(s->crypto_header.offset);
165
+ s->crypto_header.length = cpu_to_be64(s->crypto_header.length);
166
ret = header_ext_add(buf, QCOW2_EXT_MAGIC_CRYPTO_HEADER,
167
&s->crypto_header, sizeof(s->crypto_header),
168
buflen);
169
- be64_to_cpus(&s->crypto_header.offset);
170
- be64_to_cpus(&s->crypto_header.length);
171
+ s->crypto_header.offset = be64_to_cpu(s->crypto_header.offset);
172
+ s->crypto_header.length = be64_to_cpu(s->crypto_header.length);
173
if (ret < 0) {
174
goto fail;
175
}
176
--
177
2.19.1
178
179
diff view generated by jsdifflib
New patch
1
From: Peter Maydell <peter.maydell@linaro.org>
1
2
3
Taking the address of a field in a packed struct is a bad idea, because
4
it might not be actually aligned enough for that pointer type (and
5
thus cause a crash on dereference on some host architectures). Newer
6
versions of clang warn about this. Avoid the bug by not using the
7
"modify in place" byte swapping functions.
8
9
There are a few places where the in-place swap function is
10
used on something other than a packed struct field; we convert
11
those anyway, for consistency.
12
13
This patch was produced with the following spatch script:
14
15
@@
16
expression E;
17
@@
18
-be16_to_cpus(&E);
19
+E = be16_to_cpu(E);
20
@@
21
expression E;
22
@@
23
-be32_to_cpus(&E);
24
+E = be32_to_cpu(E);
25
@@
26
expression E;
27
@@
28
-be64_to_cpus(&E);
29
+E = be64_to_cpu(E);
30
@@
31
expression E;
32
@@
33
-cpu_to_be16s(&E);
34
+E = cpu_to_be16(E);
35
@@
36
expression E;
37
@@
38
-cpu_to_be32s(&E);
39
+E = cpu_to_be32(E);
40
@@
41
expression E;
42
@@
43
-cpu_to_be64s(&E);
44
+E = cpu_to_be64(E);
45
46
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
47
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
48
Tested-by: John Snow <jsnow@redhat.com>
49
Reviewed-by: John Snow <jsnow@redhat.com>
50
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
51
---
52
block/qcow.c | 18 +++++++++---------
53
1 file changed, 9 insertions(+), 9 deletions(-)
54
55
diff --git a/block/qcow.c b/block/qcow.c
56
index XXXXXXX..XXXXXXX 100644
57
--- a/block/qcow.c
58
+++ b/block/qcow.c
59
@@ -XXX,XX +XXX,XX @@ static int qcow_open(BlockDriverState *bs, QDict *options, int flags,
60
if (ret < 0) {
61
goto fail;
62
}
63
- be32_to_cpus(&header.magic);
64
- be32_to_cpus(&header.version);
65
- be64_to_cpus(&header.backing_file_offset);
66
- be32_to_cpus(&header.backing_file_size);
67
- be32_to_cpus(&header.mtime);
68
- be64_to_cpus(&header.size);
69
- be32_to_cpus(&header.crypt_method);
70
- be64_to_cpus(&header.l1_table_offset);
71
+ header.magic = be32_to_cpu(header.magic);
72
+ header.version = be32_to_cpu(header.version);
73
+ header.backing_file_offset = be64_to_cpu(header.backing_file_offset);
74
+ header.backing_file_size = be32_to_cpu(header.backing_file_size);
75
+ header.mtime = be32_to_cpu(header.mtime);
76
+ header.size = be64_to_cpu(header.size);
77
+ header.crypt_method = be32_to_cpu(header.crypt_method);
78
+ header.l1_table_offset = be64_to_cpu(header.l1_table_offset);
79
80
if (header.magic != QCOW_MAGIC) {
81
error_setg(errp, "Image not in qcow format");
82
@@ -XXX,XX +XXX,XX @@ static int qcow_open(BlockDriverState *bs, QDict *options, int flags,
83
}
84
85
for(i = 0;i < s->l1_size; i++) {
86
- be64_to_cpus(&s->l1_table[i]);
87
+ s->l1_table[i] = be64_to_cpu(s->l1_table[i]);
88
}
89
90
/* alloc L2 cache (max. 64k * 16 * 8 = 8 MB) */
91
--
92
2.19.1
93
94
diff view generated by jsdifflib
1
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
1
From: Peter Maydell <peter.maydell@linaro.org>
2
2
3
.bdrv_close handler is optional after previous commit, no needs to keep
3
Taking the address of a field in a packed struct is a bad idea, because
4
empty functions more.
4
it might not be actually aligned enough for that pointer type (and
5
thus cause a crash on dereference on some host architectures). Newer
6
versions of clang warn about this. Avoid the bug by not using the
7
"modify in place" byte swapping functions.
5
8
6
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
9
There are a few places where the in-place swap function is
10
used on something other than a packed struct field; we convert
11
those anyway, for consistency.
12
13
This patch was produced with the following spatch script:
14
15
@@
16
expression E;
17
@@
18
-be16_to_cpus(&E);
19
+E = be16_to_cpu(E);
20
@@
21
expression E;
22
@@
23
-be32_to_cpus(&E);
24
+E = be32_to_cpu(E);
25
@@
26
expression E;
27
@@
28
-be64_to_cpus(&E);
29
+E = be64_to_cpu(E);
30
@@
31
expression E;
32
@@
33
-cpu_to_be16s(&E);
34
+E = cpu_to_be16(E);
35
@@
36
expression E;
37
@@
38
-cpu_to_be32s(&E);
39
+E = cpu_to_be32(E);
40
@@
41
expression E;
42
@@
43
-cpu_to_be64s(&E);
44
+E = cpu_to_be64(E);
45
46
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
47
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
48
Tested-by: John Snow <jsnow@redhat.com>
49
Reviewed-by: John Snow <jsnow@redhat.com>
7
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
50
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
8
---
51
---
9
block/blkreplay.c | 5 -----
52
block/qcow2-bitmap.c | 24 ++++++++++++------------
10
block/commit.c | 5 -----
53
1 file changed, 12 insertions(+), 12 deletions(-)
11
block/copy-on-read.c | 6 ------
12
block/mirror.c | 5 -----
13
block/null.c | 6 ------
14
block/raw-format.c | 5 -----
15
6 files changed, 32 deletions(-)
16
54
17
diff --git a/block/blkreplay.c b/block/blkreplay.c
55
diff --git a/block/qcow2-bitmap.c b/block/qcow2-bitmap.c
18
index XXXXXXX..XXXXXXX 100755
56
index XXXXXXX..XXXXXXX 100644
19
--- a/block/blkreplay.c
57
--- a/block/qcow2-bitmap.c
20
+++ b/block/blkreplay.c
58
+++ b/block/qcow2-bitmap.c
59
@@ -XXX,XX +XXX,XX @@ static inline void bitmap_table_to_be(uint64_t *bitmap_table, size_t size)
60
size_t i;
61
62
for (i = 0; i < size; ++i) {
63
- cpu_to_be64s(&bitmap_table[i]);
64
+ bitmap_table[i] = cpu_to_be64(bitmap_table[i]);
65
}
66
}
67
68
@@ -XXX,XX +XXX,XX @@ static int bitmap_table_load(BlockDriverState *bs, Qcow2BitmapTable *tb,
69
}
70
71
for (i = 0; i < tb->size; ++i) {
72
- be64_to_cpus(&table[i]);
73
+ table[i] = be64_to_cpu(table[i]);
74
ret = check_table_entry(table[i], s->cluster_size);
75
if (ret < 0) {
76
goto fail;
21
@@ -XXX,XX +XXX,XX @@ fail:
77
@@ -XXX,XX +XXX,XX @@ fail:
22
return ret;
78
79
static inline void bitmap_dir_entry_to_cpu(Qcow2BitmapDirEntry *entry)
80
{
81
- be64_to_cpus(&entry->bitmap_table_offset);
82
- be32_to_cpus(&entry->bitmap_table_size);
83
- be32_to_cpus(&entry->flags);
84
- be16_to_cpus(&entry->name_size);
85
- be32_to_cpus(&entry->extra_data_size);
86
+ entry->bitmap_table_offset = be64_to_cpu(entry->bitmap_table_offset);
87
+ entry->bitmap_table_size = be32_to_cpu(entry->bitmap_table_size);
88
+ entry->flags = be32_to_cpu(entry->flags);
89
+ entry->name_size = be16_to_cpu(entry->name_size);
90
+ entry->extra_data_size = be32_to_cpu(entry->extra_data_size);
23
}
91
}
24
92
25
-static void blkreplay_close(BlockDriverState *bs)
93
static inline void bitmap_dir_entry_to_be(Qcow2BitmapDirEntry *entry)
26
-{
27
-}
28
-
29
static int64_t blkreplay_getlength(BlockDriverState *bs)
30
{
94
{
31
return bdrv_getlength(bs->file->bs);
95
- cpu_to_be64s(&entry->bitmap_table_offset);
32
@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_blkreplay = {
96
- cpu_to_be32s(&entry->bitmap_table_size);
33
.instance_size = 0,
97
- cpu_to_be32s(&entry->flags);
34
98
- cpu_to_be16s(&entry->name_size);
35
.bdrv_open = blkreplay_open,
99
- cpu_to_be32s(&entry->extra_data_size);
36
- .bdrv_close = blkreplay_close,
100
+ entry->bitmap_table_offset = cpu_to_be64(entry->bitmap_table_offset);
37
.bdrv_child_perm = bdrv_filter_default_perms,
101
+ entry->bitmap_table_size = cpu_to_be32(entry->bitmap_table_size);
38
.bdrv_getlength = blkreplay_getlength,
102
+ entry->flags = cpu_to_be32(entry->flags);
39
103
+ entry->name_size = cpu_to_be16(entry->name_size);
40
diff --git a/block/commit.c b/block/commit.c
104
+ entry->extra_data_size = cpu_to_be32(entry->extra_data_size);
41
index XXXXXXX..XXXXXXX 100644
42
--- a/block/commit.c
43
+++ b/block/commit.c
44
@@ -XXX,XX +XXX,XX @@ static void bdrv_commit_top_refresh_filename(BlockDriverState *bs, QDict *opts)
45
bs->backing->bs->filename);
46
}
105
}
47
106
48
-static void bdrv_commit_top_close(BlockDriverState *bs)
107
static inline int calc_dir_entry_size(size_t name_size, size_t extra_data_size)
49
-{
50
-}
51
-
52
static void bdrv_commit_top_child_perm(BlockDriverState *bs, BdrvChild *c,
53
const BdrvChildRole *role,
54
BlockReopenQueue *reopen_queue,
55
@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_commit_top = {
56
.bdrv_co_preadv = bdrv_commit_top_preadv,
57
.bdrv_co_block_status = bdrv_co_block_status_from_backing,
58
.bdrv_refresh_filename = bdrv_commit_top_refresh_filename,
59
- .bdrv_close = bdrv_commit_top_close,
60
.bdrv_child_perm = bdrv_commit_top_child_perm,
61
};
62
63
diff --git a/block/copy-on-read.c b/block/copy-on-read.c
64
index XXXXXXX..XXXXXXX 100644
65
--- a/block/copy-on-read.c
66
+++ b/block/copy-on-read.c
67
@@ -XXX,XX +XXX,XX @@ static int cor_open(BlockDriverState *bs, QDict *options, int flags,
68
}
69
70
71
-static void cor_close(BlockDriverState *bs)
72
-{
73
-}
74
-
75
-
76
#define PERM_PASSTHROUGH (BLK_PERM_CONSISTENT_READ \
77
| BLK_PERM_WRITE \
78
| BLK_PERM_RESIZE)
79
@@ -XXX,XX +XXX,XX @@ BlockDriver bdrv_copy_on_read = {
80
.format_name = "copy-on-read",
81
82
.bdrv_open = cor_open,
83
- .bdrv_close = cor_close,
84
.bdrv_child_perm = cor_child_perm,
85
86
.bdrv_getlength = cor_getlength,
87
diff --git a/block/mirror.c b/block/mirror.c
88
index XXXXXXX..XXXXXXX 100644
89
--- a/block/mirror.c
90
+++ b/block/mirror.c
91
@@ -XXX,XX +XXX,XX @@ static void bdrv_mirror_top_refresh_filename(BlockDriverState *bs, QDict *opts)
92
bs->backing->bs->filename);
93
}
94
95
-static void bdrv_mirror_top_close(BlockDriverState *bs)
96
-{
97
-}
98
-
99
static void bdrv_mirror_top_child_perm(BlockDriverState *bs, BdrvChild *c,
100
const BdrvChildRole *role,
101
BlockReopenQueue *reopen_queue,
102
@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_mirror_top = {
103
.bdrv_co_flush = bdrv_mirror_top_flush,
104
.bdrv_co_block_status = bdrv_co_block_status_from_backing,
105
.bdrv_refresh_filename = bdrv_mirror_top_refresh_filename,
106
- .bdrv_close = bdrv_mirror_top_close,
107
.bdrv_child_perm = bdrv_mirror_top_child_perm,
108
};
109
110
diff --git a/block/null.c b/block/null.c
111
index XXXXXXX..XXXXXXX 100644
112
--- a/block/null.c
113
+++ b/block/null.c
114
@@ -XXX,XX +XXX,XX @@ static int null_file_open(BlockDriverState *bs, QDict *options, int flags,
115
return ret;
116
}
117
118
-static void null_close(BlockDriverState *bs)
119
-{
120
-}
121
-
122
static int64_t null_getlength(BlockDriverState *bs)
123
{
124
BDRVNullState *s = bs->opaque;
125
@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_null_co = {
126
127
.bdrv_file_open = null_file_open,
128
.bdrv_parse_filename = null_co_parse_filename,
129
- .bdrv_close = null_close,
130
.bdrv_getlength = null_getlength,
131
132
.bdrv_co_preadv = null_co_preadv,
133
@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_null_aio = {
134
135
.bdrv_file_open = null_file_open,
136
.bdrv_parse_filename = null_aio_parse_filename,
137
- .bdrv_close = null_close,
138
.bdrv_getlength = null_getlength,
139
140
.bdrv_aio_preadv = null_aio_preadv,
141
diff --git a/block/raw-format.c b/block/raw-format.c
142
index XXXXXXX..XXXXXXX 100644
143
--- a/block/raw-format.c
144
+++ b/block/raw-format.c
145
@@ -XXX,XX +XXX,XX @@ static int raw_open(BlockDriverState *bs, QDict *options, int flags,
146
return 0;
147
}
148
149
-static void raw_close(BlockDriverState *bs)
150
-{
151
-}
152
-
153
static int raw_probe(const uint8_t *buf, int buf_size, const char *filename)
154
{
155
/* smallest possible positive score so that raw is used if and only if no
156
@@ -XXX,XX +XXX,XX @@ BlockDriver bdrv_raw = {
157
.bdrv_reopen_commit = &raw_reopen_commit,
158
.bdrv_reopen_abort = &raw_reopen_abort,
159
.bdrv_open = &raw_open,
160
- .bdrv_close = &raw_close,
161
.bdrv_child_perm = bdrv_filter_default_perms,
162
.bdrv_co_create_opts = &raw_co_create_opts,
163
.bdrv_co_preadv = &raw_co_preadv,
164
--
108
--
165
2.13.6
109
2.19.1
166
110
167
111
diff view generated by jsdifflib
New patch
1
From: Daniel P. Berrangé <berrange@redhat.com>
1
2
3
The qcow2 block driver expects to see a valid sector size even when it
4
has opened the crypto layer with QCRYPTO_BLOCK_OPEN_NO_IO.
5
6
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
7
Reviewed-by: Alberto Garcia <berto@igalia.com>
8
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
9
---
10
crypto/block-qcow.c | 2 ++
11
1 file changed, 2 insertions(+)
12
13
diff --git a/crypto/block-qcow.c b/crypto/block-qcow.c
14
index XXXXXXX..XXXXXXX 100644
15
--- a/crypto/block-qcow.c
16
+++ b/crypto/block-qcow.c
17
@@ -XXX,XX +XXX,XX @@ qcrypto_block_qcow_open(QCryptoBlock *block,
18
Error **errp)
19
{
20
if (flags & QCRYPTO_BLOCK_OPEN_NO_IO) {
21
+ block->sector_size = QCRYPTO_BLOCK_QCOW_SECTOR_SIZE;
22
+ block->payload_offset = 0;
23
return 0;
24
} else {
25
if (!options->u.qcow.key_secret) {
26
--
27
2.19.1
28
29
diff view generated by jsdifflib
1
From: Alberto Garcia <berto@igalia.com>
1
From: Alberto Garcia <berto@igalia.com>
2
2
3
If bdrv_reopen() succeeds then bs->explicit_options is updated with
3
This doesn't have any practical effect at the moment because the
4
the new values, but bs->options never changes.
4
values of BDRV_SECTOR_SIZE, QCRYPTO_BLOCK_LUKS_SECTOR_SIZE and
5
5
QCRYPTO_BLOCK_QCOW_SECTOR_SIZE are all the same (512 bytes), but
6
Here's an example:
6
future encryption methods could have different requirements.
7
8
{ "execute": "blockdev-add",
9
"arguments": {
10
"driver": "qcow2",
11
"node-name": "hd0",
12
"overlap-check": "all",
13
"file": {
14
"driver": "file",
15
"filename": "hd0.qcow2"
16
}
17
}
18
}
19
20
After this, both bs->options and bs->explicit_options contain
21
"overlap-check": "all".
22
23
Now let's change that using qemu-io's reopen command:
24
25
(qemu) qemu-io hd0 "reopen -o overlap-check=none"
26
27
After this, bs->explicit_options contains the new value but
28
bs->options still keeps the old one.
29
30
This patch updates bs->options after a BDS has been successfully
31
reopened.
32
7
33
Signed-off-by: Alberto Garcia <berto@igalia.com>
8
Signed-off-by: Alberto Garcia <berto@igalia.com>
9
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
34
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
10
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
35
---
11
---
36
block.c | 15 ++++++++++++++-
12
block/qcow2.c | 2 +-
37
1 file changed, 14 insertions(+), 1 deletion(-)
13
1 file changed, 1 insertion(+), 1 deletion(-)
38
14
39
diff --git a/block.c b/block.c
15
diff --git a/block/qcow2.c b/block/qcow2.c
40
index XXXXXXX..XXXXXXX 100644
16
index XXXXXXX..XXXXXXX 100644
41
--- a/block.c
17
--- a/block/qcow2.c
42
+++ b/block.c
18
+++ b/block/qcow2.c
43
@@ -XXX,XX +XXX,XX @@ cleanup:
19
@@ -XXX,XX +XXX,XX @@ static void qcow2_refresh_limits(BlockDriverState *bs, Error **errp)
44
bdrv_reopen_abort(&bs_entry->state);
20
45
}
21
if (bs->encrypted) {
46
qobject_unref(bs_entry->state.explicit_options);
22
/* Encryption works on a sector granularity */
47
+ qobject_unref(bs_entry->state.options);
23
- bs->bl.request_alignment = BDRV_SECTOR_SIZE;
48
}
24
+ bs->bl.request_alignment = qcrypto_block_get_sector_size(s->crypto);
49
- qobject_unref(bs_entry->state.options);
50
g_free(bs_entry);
51
}
25
}
52
g_free(bs_queue);
26
bs->bl.pwrite_zeroes_alignment = s->cluster_size;
53
@@ -XXX,XX +XXX,XX @@ int bdrv_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQueue *queue,
27
bs->bl.pdiscard_alignment = s->cluster_size;
54
Error *local_err = NULL;
55
BlockDriver *drv;
56
QemuOpts *opts;
57
+ QDict *orig_reopen_opts;
58
const char *value;
59
bool read_only;
60
61
@@ -XXX,XX +XXX,XX @@ int bdrv_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQueue *queue,
62
assert(reopen_state->bs->drv != NULL);
63
drv = reopen_state->bs->drv;
64
65
+ /* This function and each driver's bdrv_reopen_prepare() remove
66
+ * entries from reopen_state->options as they are processed, so
67
+ * we need to make a copy of the original QDict. */
68
+ orig_reopen_opts = qdict_clone_shallow(reopen_state->options);
69
+
70
/* Process generic block layer options */
71
opts = qemu_opts_create(&bdrv_runtime_opts, NULL, 0, &error_abort);
72
qemu_opts_absorb_qdict(opts, reopen_state->options, &local_err);
73
@@ -XXX,XX +XXX,XX @@ int bdrv_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQueue *queue,
74
75
ret = 0;
76
77
+ /* Restore the original reopen_state->options QDict */
78
+ qobject_unref(reopen_state->options);
79
+ reopen_state->options = qobject_ref(orig_reopen_opts);
80
+
81
error:
82
qemu_opts_del(opts);
83
+ qobject_unref(orig_reopen_opts);
84
return ret;
85
}
86
87
@@ -XXX,XX +XXX,XX @@ void bdrv_reopen_commit(BDRVReopenState *reopen_state)
88
89
/* set BDS specific flags now */
90
qobject_unref(bs->explicit_options);
91
+ qobject_unref(bs->options);
92
93
bs->explicit_options = reopen_state->explicit_options;
94
+ bs->options = reopen_state->options;
95
bs->open_flags = reopen_state->flags;
96
bs->read_only = !(reopen_state->flags & BDRV_O_RDWR);
97
98
--
28
--
99
2.13.6
29
2.19.1
100
30
101
31
diff view generated by jsdifflib
1
This reinstates commit b0083267444a5e0f28391f6c2831a539f878d424,
1
From: Li Qiang <liq3ea@163.com>
2
which was temporarily reverted for the 3.0 release so that libvirt gets
3
some extra time to update their command lines.
4
2
5
The -drive option serial was deprecated in QEMU 2.10. It's time to
3
Signed-off-by: Li Qiang <liq3ea@163.com>
6
remove it.
4
Reviewed-by: Alberto Garcia <berto@igalia.com>
5
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
6
---
7
include/sysemu/block-backend.h | 6 +++---
8
block/block-backend.c | 8 ++++----
9
2 files changed, 7 insertions(+), 7 deletions(-)
7
10
8
Tests need to be updated to set the serial number with -global instead
11
diff --git a/include/sysemu/block-backend.h b/include/sysemu/block-backend.h
9
of using the -drive option.
10
11
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
12
Reviewed-by: Markus Armbruster <armbru@redhat.com>
13
Reviewed-by: Jeff Cody <jcody@redhat.com>
14
---
15
include/hw/block/block.h | 1 -
16
include/sysemu/blockdev.h | 1 -
17
block/block-backend.c | 1 -
18
blockdev.c | 10 ----------
19
hw/block/block.c | 13 -------------
20
hw/block/nvme.c | 1 -
21
hw/block/virtio-blk.c | 1 -
22
hw/ide/qdev.c | 1 -
23
hw/scsi/scsi-disk.c | 1 -
24
hw/usb/dev-storage.c | 1 -
25
tests/ahci-test.c | 6 +++---
26
tests/ide-test.c | 8 ++++----
27
qemu-deprecated.texi | 5 -----
28
qemu-options.hx | 6 +-----
29
14 files changed, 8 insertions(+), 48 deletions(-)
30
31
diff --git a/include/hw/block/block.h b/include/hw/block/block.h
32
index XXXXXXX..XXXXXXX 100644
12
index XXXXXXX..XXXXXXX 100644
33
--- a/include/hw/block/block.h
13
--- a/include/sysemu/block-backend.h
34
+++ b/include/hw/block/block.h
14
+++ b/include/sysemu/block-backend.h
35
@@ -XXX,XX +XXX,XX @@ static inline unsigned int get_physical_block_exp(BlockConf *conf)
15
@@ -XXX,XX +XXX,XX @@ BlockErrorAction blk_get_error_action(BlockBackend *blk, bool is_read,
36
16
int error);
37
/* Configuration helpers */
17
void blk_error_action(BlockBackend *blk, BlockErrorAction action,
38
18
bool is_read, int error);
39
-void blkconf_serial(BlockConf *conf, char **serial);
19
-int blk_is_read_only(BlockBackend *blk);
40
bool blkconf_geometry(BlockConf *conf, int *trans,
20
-int blk_is_sg(BlockBackend *blk);
41
unsigned cyls_max, unsigned heads_max, unsigned secs_max,
21
-int blk_enable_write_cache(BlockBackend *blk);
42
Error **errp);
22
+bool blk_is_read_only(BlockBackend *blk);
43
diff --git a/include/sysemu/blockdev.h b/include/sysemu/blockdev.h
23
+bool blk_is_sg(BlockBackend *blk);
44
index XXXXXXX..XXXXXXX 100644
24
+bool blk_enable_write_cache(BlockBackend *blk);
45
--- a/include/sysemu/blockdev.h
25
void blk_set_enable_write_cache(BlockBackend *blk, bool wce);
46
+++ b/include/sysemu/blockdev.h
26
void blk_invalidate_cache(BlockBackend *blk, Error **errp);
47
@@ -XXX,XX +XXX,XX @@ struct DriveInfo {
27
bool blk_is_inserted(BlockBackend *blk);
48
bool is_default; /* Added by default_drive() ? */
49
int media_cd;
50
QemuOpts *opts;
51
- char *serial;
52
QTAILQ_ENTRY(DriveInfo) next;
53
};
54
55
diff --git a/block/block-backend.c b/block/block-backend.c
28
diff --git a/block/block-backend.c b/block/block-backend.c
56
index XXXXXXX..XXXXXXX 100644
29
index XXXXXXX..XXXXXXX 100644
57
--- a/block/block-backend.c
30
--- a/block/block-backend.c
58
+++ b/block/block-backend.c
31
+++ b/block/block-backend.c
59
@@ -XXX,XX +XXX,XX @@ static void drive_info_del(DriveInfo *dinfo)
32
@@ -XXX,XX +XXX,XX @@ void blk_error_action(BlockBackend *blk, BlockErrorAction action,
60
return;
61
}
33
}
62
qemu_opts_del(dinfo->opts);
63
- g_free(dinfo->serial);
64
g_free(dinfo);
65
}
34
}
66
35
67
diff --git a/blockdev.c b/blockdev.c
36
-int blk_is_read_only(BlockBackend *blk)
68
index XXXXXXX..XXXXXXX 100644
37
+bool blk_is_read_only(BlockBackend *blk)
69
--- a/blockdev.c
38
{
70
+++ b/blockdev.c
39
BlockDriverState *bs = blk_bs(blk);
71
@@ -XXX,XX +XXX,XX @@ QemuOptsList qemu_legacy_drive_opts = {
40
72
.type = QEMU_OPT_STRING,
41
@@ -XXX,XX +XXX,XX @@ int blk_is_read_only(BlockBackend *blk)
73
.help = "interface (ide, scsi, sd, mtd, floppy, pflash, virtio)",
74
},{
75
- .name = "serial",
76
- .type = QEMU_OPT_STRING,
77
- .help = "disk serial number",
78
- },{
79
.name = "file",
80
.type = QEMU_OPT_STRING,
81
.help = "file name",
82
@@ -XXX,XX +XXX,XX @@ DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfaceType block_default_type)
83
const char *werror, *rerror;
84
bool read_only = false;
85
bool copy_on_read;
86
- const char *serial;
87
const char *filename;
88
Error *local_err = NULL;
89
int i;
90
const char *deprecated[] = {
91
- "serial"
92
};
93
94
/* Change legacy command line options into QMP ones */
95
@@ -XXX,XX +XXX,XX @@ DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfaceType block_default_type)
96
goto fail;
97
}
42
}
98
43
}
99
- /* Serial number */
44
100
- serial = qemu_opt_get(legacy_opts, "serial");
45
-int blk_is_sg(BlockBackend *blk)
101
-
46
+bool blk_is_sg(BlockBackend *blk)
102
/* no id supplied -> create one */
103
if (qemu_opts_id(all_opts) == NULL) {
104
char *new_id;
105
@@ -XXX,XX +XXX,XX @@ DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfaceType block_default_type)
106
dinfo->type = type;
107
dinfo->bus = bus_id;
108
dinfo->unit = unit_id;
109
- dinfo->serial = g_strdup(serial);
110
111
blk_set_legacy_dinfo(blk, dinfo);
112
113
diff --git a/hw/block/block.c b/hw/block/block.c
114
index XXXXXXX..XXXXXXX 100644
115
--- a/hw/block/block.c
116
+++ b/hw/block/block.c
117
@@ -XXX,XX +XXX,XX @@
118
#include "qapi/qapi-types-block.h"
119
#include "qemu/error-report.h"
120
121
-void blkconf_serial(BlockConf *conf, char **serial)
122
-{
123
- DriveInfo *dinfo;
124
-
125
- if (!*serial) {
126
- /* try to fall back to value set with legacy -drive serial=... */
127
- dinfo = blk_legacy_dinfo(conf->blk);
128
- if (dinfo) {
129
- *serial = g_strdup(dinfo->serial);
130
- }
131
- }
132
-}
133
-
134
void blkconf_blocksizes(BlockConf *conf)
135
{
47
{
136
BlockBackend *blk = conf->blk;
48
BlockDriverState *bs = blk_bs(blk);
137
diff --git a/hw/block/nvme.c b/hw/block/nvme.c
49
138
index XXXXXXX..XXXXXXX 100644
50
if (!bs) {
139
--- a/hw/block/nvme.c
51
- return 0;
140
+++ b/hw/block/nvme.c
52
+ return false;
141
@@ -XXX,XX +XXX,XX @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp)
142
return;
143
}
53
}
144
54
145
- blkconf_serial(&n->conf, &n->serial);
55
return bdrv_is_sg(bs);
146
if (!n->serial) {
56
}
147
error_setg(errp, "serial property not set");
57
148
return;
58
-int blk_enable_write_cache(BlockBackend *blk)
149
diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
59
+bool blk_enable_write_cache(BlockBackend *blk)
150
index XXXXXXX..XXXXXXX 100644
151
--- a/hw/block/virtio-blk.c
152
+++ b/hw/block/virtio-blk.c
153
@@ -XXX,XX +XXX,XX @@ static void virtio_blk_device_realize(DeviceState *dev, Error **errp)
154
return;
155
}
156
157
- blkconf_serial(&conf->conf, &conf->serial);
158
if (!blkconf_apply_backend_options(&conf->conf,
159
blk_is_read_only(conf->conf.blk), true,
160
errp)) {
161
diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c
162
index XXXXXXX..XXXXXXX 100644
163
--- a/hw/ide/qdev.c
164
+++ b/hw/ide/qdev.c
165
@@ -XXX,XX +XXX,XX @@ static void ide_dev_initfn(IDEDevice *dev, IDEDriveKind kind, Error **errp)
166
return;
167
}
168
169
- blkconf_serial(&dev->conf, &dev->serial);
170
if (kind != IDE_CD) {
171
if (!blkconf_geometry(&dev->conf, &dev->chs_trans, 65535, 16, 255,
172
errp)) {
173
diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c
174
index XXXXXXX..XXXXXXX 100644
175
--- a/hw/scsi/scsi-disk.c
176
+++ b/hw/scsi/scsi-disk.c
177
@@ -XXX,XX +XXX,XX @@ static void scsi_realize(SCSIDevice *dev, Error **errp)
178
return;
179
}
180
181
- blkconf_serial(&s->qdev.conf, &s->serial);
182
blkconf_blocksizes(&s->qdev.conf);
183
184
if (s->qdev.conf.logical_block_size >
185
diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c
186
index XXXXXXX..XXXXXXX 100644
187
--- a/hw/usb/dev-storage.c
188
+++ b/hw/usb/dev-storage.c
189
@@ -XXX,XX +XXX,XX @@ static void usb_msd_storage_realize(USBDevice *dev, Error **errp)
190
return;
191
}
192
193
- blkconf_serial(&s->conf, &dev->serial);
194
blkconf_blocksizes(&s->conf);
195
if (!blkconf_apply_backend_options(&s->conf, blk_is_read_only(blk), true,
196
errp)) {
197
diff --git a/tests/ahci-test.c b/tests/ahci-test.c
198
index XXXXXXX..XXXXXXX 100644
199
--- a/tests/ahci-test.c
200
+++ b/tests/ahci-test.c
201
@@ -XXX,XX +XXX,XX @@ static AHCIQState *ahci_boot(const char *cli, ...)
202
s = ahci_vboot(cli, ap);
203
va_end(ap);
204
} else {
205
- cli = "-drive if=none,id=drive0,file=%s,cache=writeback,serial=%s"
206
- ",format=%s"
207
+ cli = "-drive if=none,id=drive0,file=%s,cache=writeback,format=%s"
208
" -M q35 "
209
"-device ide-hd,drive=drive0 "
210
+ "-global ide-hd.serial=%s "
211
"-global ide-hd.ver=%s";
212
- s = ahci_boot(cli, tmp_path, "testdisk", imgfmt, "version");
213
+ s = ahci_boot(cli, tmp_path, imgfmt, "testdisk", "version");
214
}
215
216
return s;
217
diff --git a/tests/ide-test.c b/tests/ide-test.c
218
index XXXXXXX..XXXXXXX 100644
219
--- a/tests/ide-test.c
220
+++ b/tests/ide-test.c
221
@@ -XXX,XX +XXX,XX @@ static void test_bmdma_no_busmaster(void)
222
static void test_bmdma_setup(void)
223
{
60
{
224
ide_test_start(
61
return blk->enable_write_cache;
225
- "-drive file=%s,if=ide,serial=%s,cache=writeback,format=raw "
226
- "-global ide-hd.ver=%s",
227
+ "-drive file=%s,if=ide,cache=writeback,format=raw "
228
+ "-global ide-hd.serial=%s -global ide-hd.ver=%s",
229
tmp_path, "testdisk", "version");
230
qtest_irq_intercept_in(global_qtest, "ioapic");
231
}
62
}
232
@@ -XXX,XX +XXX,XX @@ static void test_identify(void)
233
int ret;
234
235
ide_test_start(
236
- "-drive file=%s,if=ide,serial=%s,cache=writeback,format=raw "
237
- "-global ide-hd.ver=%s",
238
+ "-drive file=%s,if=ide,cache=writeback,format=raw "
239
+ "-global ide-hd.serial=%s -global ide-hd.ver=%s",
240
tmp_path, "testdisk", "version");
241
242
dev = get_pci_device(&bmdma_bar, &ide_bar);
243
diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi
244
index XXXXXXX..XXXXXXX 100644
245
--- a/qemu-deprecated.texi
246
+++ b/qemu-deprecated.texi
247
@@ -XXX,XX +XXX,XX @@ with ``-device ...,netdev=x''), or ``-nic user,smb=/some/dir''
248
(for embedded NICs). The new syntax allows different settings to be
249
provided per NIC.
250
251
-@subsection -drive serial=... (since 2.10.0)
252
-
253
-The drive serial argument is replaced by the the serial argument
254
-that can be specified with the ``-device'' parameter.
255
-
256
@subsection -usbdevice (since 2.10.0)
257
258
The ``-usbdevice DEV'' argument is now a synonym for setting
259
diff --git a/qemu-options.hx b/qemu-options.hx
260
index XXXXXXX..XXXXXXX 100644
261
--- a/qemu-options.hx
262
+++ b/qemu-options.hx
263
@@ -XXX,XX +XXX,XX @@ ETEXI
264
DEF("drive", HAS_ARG, QEMU_OPTION_drive,
265
"-drive [file=file][,if=type][,bus=n][,unit=m][,media=d][,index=i]\n"
266
" [,cache=writethrough|writeback|none|directsync|unsafe][,format=f]\n"
267
- " [,snapshot=on|off][,serial=s][,rerror=ignore|stop|report]\n"
268
+ " [,snapshot=on|off][,rerror=ignore|stop|report]\n"
269
" [,werror=ignore|stop|report|enospc][,id=name][,aio=threads|native]\n"
270
" [,readonly=on|off][,copy-on-read=on|off]\n"
271
" [,discard=ignore|unmap][,detect-zeroes=on|off|unmap]\n"
272
@@ -XXX,XX +XXX,XX @@ The default mode is @option{cache=writeback}.
273
Specify which disk @var{format} will be used rather than detecting
274
the format. Can be used to specify format=raw to avoid interpreting
275
an untrusted format header.
276
-@item serial=@var{serial}
277
-This option specifies the serial number to assign to the device. This
278
-parameter is deprecated, use the corresponding parameter of @code{-device}
279
-instead.
280
@item werror=@var{action},rerror=@var{action}
281
Specify which @var{action} to take on write and read errors. Valid actions are:
282
"ignore" (ignore the error and try to continue), "stop" (pause QEMU),
283
--
63
--
284
2.13.6
64
2.19.1
285
65
286
66
diff view generated by jsdifflib
1
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
1
From: Cleber Rosa <crosa@redhat.com>
2
2
3
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
3
While testing the Python 3 changes which touch the 083 test, I noticed
4
that it would fail with qcow2. Expanding the testing, I noticed it
5
had nothing to do with the Python 3 changes, and in fact, it would not
6
pass on anything but raw:
7
8
raw: pass
9
bochs: not generic
10
cloop: not generic
11
parallels: fail
12
qcow: fail
13
qcow2: fail
14
qed: fail
15
vdi: fail
16
vhdx: fail
17
vmdk: fail
18
vpc: fail
19
luks: fail
20
21
The errors are a mixture I/O and "image not in xxx format", such as:
22
23
=== Check disconnect before data ===
24
25
Unexpected end-of-file before all bytes were read
26
-read failed: Input/output error
27
+can't open device nbd+tcp://127.0.0.1:PORT/foo: Could not open 'nbd://127.0.0.1:PORT/foo': Input/output error
28
29
=== Check disconnect after data ===
30
31
-read 512/512 bytes at offset 0
32
-512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
33
+can't open device nbd+tcp://127.0.0.1:PORT/foo: Image not in qcow format
34
35
I'm not aware if there's a quick fix, so, for the time being, it looks
36
like the honest approach is to make the test known to work on raw
37
only.
38
39
Signed-off-by: Cleber Rosa <crosa@redhat.com>
4
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
40
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
5
---
41
---
6
block.c | 4 +++-
42
tests/qemu-iotests/083 | 2 +-
7
block/snapshot.c | 4 +++-
43
1 file changed, 1 insertion(+), 1 deletion(-)
8
2 files changed, 6 insertions(+), 2 deletions(-)
9
44
10
diff --git a/block.c b/block.c
45
diff --git a/tests/qemu-iotests/083 b/tests/qemu-iotests/083
11
index XXXXXXX..XXXXXXX 100644
46
index XXXXXXX..XXXXXXX 100755
12
--- a/block.c
47
--- a/tests/qemu-iotests/083
13
+++ b/block.c
48
+++ b/tests/qemu-iotests/083
14
@@ -XXX,XX +XXX,XX @@ static void bdrv_close(BlockDriverState *bs)
49
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
15
bdrv_drain(bs); /* in case flush left pending I/O */
50
. ./common.rc
16
51
. ./common.filter
17
if (bs->drv) {
52
18
- bs->drv->bdrv_close(bs);
53
-_supported_fmt generic
19
+ if (bs->drv->bdrv_close) {
54
+_supported_fmt raw
20
+ bs->drv->bdrv_close(bs);
55
_supported_proto nbd
21
+ }
56
_supported_os Linux
22
bs->drv = NULL;
23
}
24
25
diff --git a/block/snapshot.c b/block/snapshot.c
26
index XXXXXXX..XXXXXXX 100644
27
--- a/block/snapshot.c
28
+++ b/block/snapshot.c
29
@@ -XXX,XX +XXX,XX @@ int bdrv_snapshot_goto(BlockDriverState *bs,
30
qobject_unref(file_options);
31
qdict_put_str(options, "file", bdrv_get_node_name(file));
32
33
- drv->bdrv_close(bs);
34
+ if (drv->bdrv_close) {
35
+ drv->bdrv_close(bs);
36
+ }
37
bdrv_unref_child(bs, bs->file);
38
bs->file = NULL;
39
57
40
--
58
--
41
2.13.6
59
2.19.1
42
60
43
61
diff view generated by jsdifflib
1
For BlockBackends that are skipped in query-blockstats, we would leak
2
info since commit 567dcb31. Allocate info only later to avoid the memory
3
leak.
4
5
Fixes: CID 1394727
6
Cc: qemu-stable@nongnu.org
7
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
1
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
8
Reviewed-by: Alberto Garcia <berto@igalia.com>
2
Reviewed-by: Alberto Garcia <berto@igalia.com>
9
---
3
---
10
block/qapi.c | 3 ++-
4
block/vpc.c | 2 ++
11
1 file changed, 2 insertions(+), 1 deletion(-)
5
1 file changed, 2 insertions(+)
12
6
13
diff --git a/block/qapi.c b/block/qapi.c
7
diff --git a/block/vpc.c b/block/vpc.c
14
index XXXXXXX..XXXXXXX 100644
8
index XXXXXXX..XXXXXXX 100644
15
--- a/block/qapi.c
9
--- a/block/vpc.c
16
+++ b/block/qapi.c
10
+++ b/block/vpc.c
17
@@ -XXX,XX +XXX,XX @@ BlockStatsList *qmp_query_blockstats(bool has_query_nodes,
11
@@ -XXX,XX +XXX,XX @@ static int vpc_open(BlockDriverState *bs, QDict *options, int flags,
18
}
12
}
19
} else {
13
20
for (blk = blk_all_next(NULL); blk; blk = blk_all_next(blk)) {
14
qemu_co_mutex_init(&s->lock);
21
- BlockStatsList *info = g_malloc0(sizeof(*info));
15
+ qemu_opts_del(opts);
22
+ BlockStatsList *info;
16
23
AioContext *ctx = blk_get_aio_context(blk);
17
return 0;
24
BlockStats *s;
18
25
char *qdev;
19
fail:
26
@@ -XXX,XX +XXX,XX @@ BlockStatsList *qmp_query_blockstats(bool has_query_nodes,
20
+ qemu_opts_del(opts);
27
bdrv_query_blk_stats(s->stats, blk);
21
qemu_vfree(s->pagetable);
28
aio_context_release(ctx);
22
#ifdef CACHE
29
23
g_free(s->pageentry_u8);
30
+ info = g_malloc0(sizeof(*info));
31
info->value = s;
32
*p_next = info;
33
p_next = &info->next;
34
--
24
--
35
2.13.6
25
2.19.1
36
26
37
27
diff view generated by jsdifflib
New patch
1
1
From: Peter Maydell <peter.maydell@linaro.org>
2
3
Taking the address of a field in a packed struct is a bad idea, because
4
it might not be actually aligned enough for that pointer type (and
5
thus cause a crash on dereference on some host architectures). Newer
6
versions of clang warn about this. Avoid the bug by not using the
7
"modify in place" byte swapping functions.
8
9
There are a few places where the in-place swap function is
10
used on something other than a packed struct field; we convert
11
those anyway, for consistency.
12
13
Patch produced with scripts/coccinelle/inplace-byteswaps.cocci.
14
15
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
16
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
17
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
18
---
19
block/vhdx.h | 12 ++---
20
block/vhdx-endian.c | 118 ++++++++++++++++++++++----------------------
21
block/vhdx-log.c | 4 +-
22
block/vhdx.c | 18 +++----
23
4 files changed, 76 insertions(+), 76 deletions(-)
24
25
diff --git a/block/vhdx.h b/block/vhdx.h
26
index XXXXXXX..XXXXXXX 100644
27
--- a/block/vhdx.h
28
+++ b/block/vhdx.h
29
@@ -XXX,XX +XXX,XX @@ int vhdx_log_write_and_flush(BlockDriverState *bs, BDRVVHDXState *s,
30
31
static inline void leguid_to_cpus(MSGUID *guid)
32
{
33
- le32_to_cpus(&guid->data1);
34
- le16_to_cpus(&guid->data2);
35
- le16_to_cpus(&guid->data3);
36
+ guid->data1 = le32_to_cpu(guid->data1);
37
+ guid->data2 = le16_to_cpu(guid->data2);
38
+ guid->data3 = le16_to_cpu(guid->data3);
39
}
40
41
static inline void cpu_to_leguids(MSGUID *guid)
42
{
43
- cpu_to_le32s(&guid->data1);
44
- cpu_to_le16s(&guid->data2);
45
- cpu_to_le16s(&guid->data3);
46
+ guid->data1 = cpu_to_le32(guid->data1);
47
+ guid->data2 = cpu_to_le16(guid->data2);
48
+ guid->data3 = cpu_to_le16(guid->data3);
49
}
50
51
void vhdx_header_le_import(VHDXHeader *h);
52
diff --git a/block/vhdx-endian.c b/block/vhdx-endian.c
53
index XXXXXXX..XXXXXXX 100644
54
--- a/block/vhdx-endian.c
55
+++ b/block/vhdx-endian.c
56
@@ -XXX,XX +XXX,XX @@ void vhdx_header_le_import(VHDXHeader *h)
57
{
58
assert(h != NULL);
59
60
- le32_to_cpus(&h->signature);
61
- le32_to_cpus(&h->checksum);
62
- le64_to_cpus(&h->sequence_number);
63
+ h->signature = le32_to_cpu(h->signature);
64
+ h->checksum = le32_to_cpu(h->checksum);
65
+ h->sequence_number = le64_to_cpu(h->sequence_number);
66
67
leguid_to_cpus(&h->file_write_guid);
68
leguid_to_cpus(&h->data_write_guid);
69
leguid_to_cpus(&h->log_guid);
70
71
- le16_to_cpus(&h->log_version);
72
- le16_to_cpus(&h->version);
73
- le32_to_cpus(&h->log_length);
74
- le64_to_cpus(&h->log_offset);
75
+ h->log_version = le16_to_cpu(h->log_version);
76
+ h->version = le16_to_cpu(h->version);
77
+ h->log_length = le32_to_cpu(h->log_length);
78
+ h->log_offset = le64_to_cpu(h->log_offset);
79
}
80
81
void vhdx_header_le_export(VHDXHeader *orig_h, VHDXHeader *new_h)
82
@@ -XXX,XX +XXX,XX @@ void vhdx_log_desc_le_import(VHDXLogDescriptor *d)
83
{
84
assert(d != NULL);
85
86
- le32_to_cpus(&d->signature);
87
- le64_to_cpus(&d->file_offset);
88
- le64_to_cpus(&d->sequence_number);
89
+ d->signature = le32_to_cpu(d->signature);
90
+ d->file_offset = le64_to_cpu(d->file_offset);
91
+ d->sequence_number = le64_to_cpu(d->sequence_number);
92
}
93
94
void vhdx_log_desc_le_export(VHDXLogDescriptor *d)
95
{
96
assert(d != NULL);
97
98
- cpu_to_le32s(&d->signature);
99
- cpu_to_le32s(&d->trailing_bytes);
100
- cpu_to_le64s(&d->leading_bytes);
101
- cpu_to_le64s(&d->file_offset);
102
- cpu_to_le64s(&d->sequence_number);
103
+ d->signature = cpu_to_le32(d->signature);
104
+ d->trailing_bytes = cpu_to_le32(d->trailing_bytes);
105
+ d->leading_bytes = cpu_to_le64(d->leading_bytes);
106
+ d->file_offset = cpu_to_le64(d->file_offset);
107
+ d->sequence_number = cpu_to_le64(d->sequence_number);
108
}
109
110
void vhdx_log_data_le_import(VHDXLogDataSector *d)
111
{
112
assert(d != NULL);
113
114
- le32_to_cpus(&d->data_signature);
115
- le32_to_cpus(&d->sequence_high);
116
- le32_to_cpus(&d->sequence_low);
117
+ d->data_signature = le32_to_cpu(d->data_signature);
118
+ d->sequence_high = le32_to_cpu(d->sequence_high);
119
+ d->sequence_low = le32_to_cpu(d->sequence_low);
120
}
121
122
void vhdx_log_data_le_export(VHDXLogDataSector *d)
123
{
124
assert(d != NULL);
125
126
- cpu_to_le32s(&d->data_signature);
127
- cpu_to_le32s(&d->sequence_high);
128
- cpu_to_le32s(&d->sequence_low);
129
+ d->data_signature = cpu_to_le32(d->data_signature);
130
+ d->sequence_high = cpu_to_le32(d->sequence_high);
131
+ d->sequence_low = cpu_to_le32(d->sequence_low);
132
}
133
134
void vhdx_log_entry_hdr_le_import(VHDXLogEntryHeader *hdr)
135
{
136
assert(hdr != NULL);
137
138
- le32_to_cpus(&hdr->signature);
139
- le32_to_cpus(&hdr->checksum);
140
- le32_to_cpus(&hdr->entry_length);
141
- le32_to_cpus(&hdr->tail);
142
- le64_to_cpus(&hdr->sequence_number);
143
- le32_to_cpus(&hdr->descriptor_count);
144
+ hdr->signature = le32_to_cpu(hdr->signature);
145
+ hdr->checksum = le32_to_cpu(hdr->checksum);
146
+ hdr->entry_length = le32_to_cpu(hdr->entry_length);
147
+ hdr->tail = le32_to_cpu(hdr->tail);
148
+ hdr->sequence_number = le64_to_cpu(hdr->sequence_number);
149
+ hdr->descriptor_count = le32_to_cpu(hdr->descriptor_count);
150
leguid_to_cpus(&hdr->log_guid);
151
- le64_to_cpus(&hdr->flushed_file_offset);
152
- le64_to_cpus(&hdr->last_file_offset);
153
+ hdr->flushed_file_offset = le64_to_cpu(hdr->flushed_file_offset);
154
+ hdr->last_file_offset = le64_to_cpu(hdr->last_file_offset);
155
}
156
157
void vhdx_log_entry_hdr_le_export(VHDXLogEntryHeader *hdr)
158
{
159
assert(hdr != NULL);
160
161
- cpu_to_le32s(&hdr->signature);
162
- cpu_to_le32s(&hdr->checksum);
163
- cpu_to_le32s(&hdr->entry_length);
164
- cpu_to_le32s(&hdr->tail);
165
- cpu_to_le64s(&hdr->sequence_number);
166
- cpu_to_le32s(&hdr->descriptor_count);
167
+ hdr->signature = cpu_to_le32(hdr->signature);
168
+ hdr->checksum = cpu_to_le32(hdr->checksum);
169
+ hdr->entry_length = cpu_to_le32(hdr->entry_length);
170
+ hdr->tail = cpu_to_le32(hdr->tail);
171
+ hdr->sequence_number = cpu_to_le64(hdr->sequence_number);
172
+ hdr->descriptor_count = cpu_to_le32(hdr->descriptor_count);
173
cpu_to_leguids(&hdr->log_guid);
174
- cpu_to_le64s(&hdr->flushed_file_offset);
175
- cpu_to_le64s(&hdr->last_file_offset);
176
+ hdr->flushed_file_offset = cpu_to_le64(hdr->flushed_file_offset);
177
+ hdr->last_file_offset = cpu_to_le64(hdr->last_file_offset);
178
}
179
180
181
@@ -XXX,XX +XXX,XX @@ void vhdx_region_header_le_import(VHDXRegionTableHeader *hdr)
182
{
183
assert(hdr != NULL);
184
185
- le32_to_cpus(&hdr->signature);
186
- le32_to_cpus(&hdr->checksum);
187
- le32_to_cpus(&hdr->entry_count);
188
+ hdr->signature = le32_to_cpu(hdr->signature);
189
+ hdr->checksum = le32_to_cpu(hdr->checksum);
190
+ hdr->entry_count = le32_to_cpu(hdr->entry_count);
191
}
192
193
void vhdx_region_header_le_export(VHDXRegionTableHeader *hdr)
194
{
195
assert(hdr != NULL);
196
197
- cpu_to_le32s(&hdr->signature);
198
- cpu_to_le32s(&hdr->checksum);
199
- cpu_to_le32s(&hdr->entry_count);
200
+ hdr->signature = cpu_to_le32(hdr->signature);
201
+ hdr->checksum = cpu_to_le32(hdr->checksum);
202
+ hdr->entry_count = cpu_to_le32(hdr->entry_count);
203
}
204
205
void vhdx_region_entry_le_import(VHDXRegionTableEntry *e)
206
@@ -XXX,XX +XXX,XX @@ void vhdx_region_entry_le_import(VHDXRegionTableEntry *e)
207
assert(e != NULL);
208
209
leguid_to_cpus(&e->guid);
210
- le64_to_cpus(&e->file_offset);
211
- le32_to_cpus(&e->length);
212
- le32_to_cpus(&e->data_bits);
213
+ e->file_offset = le64_to_cpu(e->file_offset);
214
+ e->length = le32_to_cpu(e->length);
215
+ e->data_bits = le32_to_cpu(e->data_bits);
216
}
217
218
void vhdx_region_entry_le_export(VHDXRegionTableEntry *e)
219
@@ -XXX,XX +XXX,XX @@ void vhdx_region_entry_le_export(VHDXRegionTableEntry *e)
220
assert(e != NULL);
221
222
cpu_to_leguids(&e->guid);
223
- cpu_to_le64s(&e->file_offset);
224
- cpu_to_le32s(&e->length);
225
- cpu_to_le32s(&e->data_bits);
226
+ e->file_offset = cpu_to_le64(e->file_offset);
227
+ e->length = cpu_to_le32(e->length);
228
+ e->data_bits = cpu_to_le32(e->data_bits);
229
}
230
231
232
@@ -XXX,XX +XXX,XX @@ void vhdx_metadata_header_le_import(VHDXMetadataTableHeader *hdr)
233
{
234
assert(hdr != NULL);
235
236
- le64_to_cpus(&hdr->signature);
237
- le16_to_cpus(&hdr->entry_count);
238
+ hdr->signature = le64_to_cpu(hdr->signature);
239
+ hdr->entry_count = le16_to_cpu(hdr->entry_count);
240
}
241
242
void vhdx_metadata_header_le_export(VHDXMetadataTableHeader *hdr)
243
{
244
assert(hdr != NULL);
245
246
- cpu_to_le64s(&hdr->signature);
247
- cpu_to_le16s(&hdr->entry_count);
248
+ hdr->signature = cpu_to_le64(hdr->signature);
249
+ hdr->entry_count = cpu_to_le16(hdr->entry_count);
250
}
251
252
void vhdx_metadata_entry_le_import(VHDXMetadataTableEntry *e)
253
@@ -XXX,XX +XXX,XX @@ void vhdx_metadata_entry_le_import(VHDXMetadataTableEntry *e)
254
assert(e != NULL);
255
256
leguid_to_cpus(&e->item_id);
257
- le32_to_cpus(&e->offset);
258
- le32_to_cpus(&e->length);
259
- le32_to_cpus(&e->data_bits);
260
+ e->offset = le32_to_cpu(e->offset);
261
+ e->length = le32_to_cpu(e->length);
262
+ e->data_bits = le32_to_cpu(e->data_bits);
263
}
264
void vhdx_metadata_entry_le_export(VHDXMetadataTableEntry *e)
265
{
266
assert(e != NULL);
267
268
cpu_to_leguids(&e->item_id);
269
- cpu_to_le32s(&e->offset);
270
- cpu_to_le32s(&e->length);
271
- cpu_to_le32s(&e->data_bits);
272
+ e->offset = cpu_to_le32(e->offset);
273
+ e->length = cpu_to_le32(e->length);
274
+ e->data_bits = cpu_to_le32(e->data_bits);
275
}
276
diff --git a/block/vhdx-log.c b/block/vhdx-log.c
277
index XXXXXXX..XXXXXXX 100644
278
--- a/block/vhdx-log.c
279
+++ b/block/vhdx-log.c
280
@@ -XXX,XX +XXX,XX @@ static void vhdx_log_raw_to_le_sector(VHDXLogDescriptor *desc,
281
/* 8 + 4084 + 4 = 4096, 1 log sector */
282
memcpy(&desc->leading_bytes, data, 8);
283
data += 8;
284
- cpu_to_le64s(&desc->leading_bytes);
285
+ desc->leading_bytes = cpu_to_le64(desc->leading_bytes);
286
memcpy(sector->data, data, 4084);
287
data += 4084;
288
memcpy(&desc->trailing_bytes, data, 4);
289
- cpu_to_le32s(&desc->trailing_bytes);
290
+ desc->trailing_bytes = cpu_to_le32(desc->trailing_bytes);
291
data += 4;
292
293
sector->sequence_high = (uint32_t) (seq >> 32);
294
diff --git a/block/vhdx.c b/block/vhdx.c
295
index XXXXXXX..XXXXXXX 100644
296
--- a/block/vhdx.c
297
+++ b/block/vhdx.c
298
@@ -XXX,XX +XXX,XX @@ uint32_t vhdx_update_checksum(uint8_t *buf, size_t size, int crc_offset)
299
300
memset(buf + crc_offset, 0, sizeof(crc));
301
crc = crc32c(0xffffffff, buf, size);
302
- cpu_to_le32s(&crc);
303
+ crc = cpu_to_le32(crc);
304
memcpy(buf + crc_offset, &crc, sizeof(crc));
305
306
return crc;
307
@@ -XXX,XX +XXX,XX @@ static int vhdx_parse_metadata(BlockDriverState *bs, BDRVVHDXState *s)
308
goto exit;
309
}
310
311
- le32_to_cpus(&s->params.block_size);
312
- le32_to_cpus(&s->params.data_bits);
313
+ s->params.block_size = le32_to_cpu(s->params.block_size);
314
+ s->params.data_bits = le32_to_cpu(s->params.data_bits);
315
316
317
/* We now have the file parameters, so we can tell if this is a
318
@@ -XXX,XX +XXX,XX @@ static int vhdx_parse_metadata(BlockDriverState *bs, BDRVVHDXState *s)
319
goto exit;
320
}
321
322
- le64_to_cpus(&s->virtual_disk_size);
323
- le32_to_cpus(&s->logical_sector_size);
324
- le32_to_cpus(&s->physical_sector_size);
325
+ s->virtual_disk_size = le64_to_cpu(s->virtual_disk_size);
326
+ s->logical_sector_size = le32_to_cpu(s->logical_sector_size);
327
+ s->physical_sector_size = le32_to_cpu(s->physical_sector_size);
328
329
if (s->params.block_size < VHDX_BLOCK_SIZE_MIN ||
330
s->params.block_size > VHDX_BLOCK_SIZE_MAX) {
331
@@ -XXX,XX +XXX,XX @@ static int vhdx_open(BlockDriverState *bs, QDict *options, int flags,
332
/* endian convert, and verify populated BAT field file offsets against
333
* region table and log entries */
334
for (i = 0; i < s->bat_entries; i++) {
335
- le64_to_cpus(&s->bat[i]);
336
+ s->bat[i] = le64_to_cpu(s->bat[i]);
337
if (payblocks--) {
338
/* payload bat entries */
339
if ((s->bat[i] & VHDX_BAT_STATE_BIT_MASK) ==
340
@@ -XXX,XX +XXX,XX @@ static int vhdx_create_new_metadata(BlockBackend *blk,
341
mt_file_params->block_size = cpu_to_le32(block_size);
342
if (type == VHDX_TYPE_FIXED) {
343
mt_file_params->data_bits |= VHDX_PARAMS_LEAVE_BLOCKS_ALLOCED;
344
- cpu_to_le32s(&mt_file_params->data_bits);
345
+ mt_file_params->data_bits = cpu_to_le32(mt_file_params->data_bits);
346
}
347
348
vhdx_guid_generate(&mt_page83->page_83_data);
349
@@ -XXX,XX +XXX,XX @@ static int vhdx_create_bat(BlockBackend *blk, BDRVVHDXState *s,
350
sinfo.file_offset = ROUND_UP(sinfo.file_offset, MiB);
351
vhdx_update_bat_table_entry(blk_bs(blk), s, &sinfo, &unused, &unused,
352
block_state);
353
- cpu_to_le64s(&s->bat[sinfo.bat_idx]);
354
+ s->bat[sinfo.bat_idx] = cpu_to_le64(s->bat[sinfo.bat_idx]);
355
sector_num += s->sectors_per_block;
356
}
357
ret = blk_pwrite(blk, file_offset, s->bat, length, 0);
358
--
359
2.19.1
360
361
diff view generated by jsdifflib
New patch
1
From: Peter Maydell <peter.maydell@linaro.org>
1
2
3
Taking the address of a field in a packed struct is a bad idea, because
4
it might not be actually aligned enough for that pointer type (and
5
thus cause a crash on dereference on some host architectures). Newer
6
versions of clang warn about this. Avoid the bug by not using the
7
"modify in place" byte swapping functions.
8
9
There are a few places where the in-place swap function is
10
used on something other than a packed struct field; we convert
11
those anyway, for consistency.
12
13
Patch produced with scripts/coccinelle/inplace-byteswaps.cocci.
14
15
There are other places where we take the address of a packed member
16
in this file for other purposes than passing it to a byteswap
17
function (all the calls to qemu_uuid_*()); we leave those for now.
18
19
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
20
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
21
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
22
---
23
block/vdi.c | 64 ++++++++++++++++++++++++++---------------------------
24
1 file changed, 32 insertions(+), 32 deletions(-)
25
26
diff --git a/block/vdi.c b/block/vdi.c
27
index XXXXXXX..XXXXXXX 100644
28
--- a/block/vdi.c
29
+++ b/block/vdi.c
30
@@ -XXX,XX +XXX,XX @@ typedef struct {
31
32
static void vdi_header_to_cpu(VdiHeader *header)
33
{
34
- le32_to_cpus(&header->signature);
35
- le32_to_cpus(&header->version);
36
- le32_to_cpus(&header->header_size);
37
- le32_to_cpus(&header->image_type);
38
- le32_to_cpus(&header->image_flags);
39
- le32_to_cpus(&header->offset_bmap);
40
- le32_to_cpus(&header->offset_data);
41
- le32_to_cpus(&header->cylinders);
42
- le32_to_cpus(&header->heads);
43
- le32_to_cpus(&header->sectors);
44
- le32_to_cpus(&header->sector_size);
45
- le64_to_cpus(&header->disk_size);
46
- le32_to_cpus(&header->block_size);
47
- le32_to_cpus(&header->block_extra);
48
- le32_to_cpus(&header->blocks_in_image);
49
- le32_to_cpus(&header->blocks_allocated);
50
+ header->signature = le32_to_cpu(header->signature);
51
+ header->version = le32_to_cpu(header->version);
52
+ header->header_size = le32_to_cpu(header->header_size);
53
+ header->image_type = le32_to_cpu(header->image_type);
54
+ header->image_flags = le32_to_cpu(header->image_flags);
55
+ header->offset_bmap = le32_to_cpu(header->offset_bmap);
56
+ header->offset_data = le32_to_cpu(header->offset_data);
57
+ header->cylinders = le32_to_cpu(header->cylinders);
58
+ header->heads = le32_to_cpu(header->heads);
59
+ header->sectors = le32_to_cpu(header->sectors);
60
+ header->sector_size = le32_to_cpu(header->sector_size);
61
+ header->disk_size = le64_to_cpu(header->disk_size);
62
+ header->block_size = le32_to_cpu(header->block_size);
63
+ header->block_extra = le32_to_cpu(header->block_extra);
64
+ header->blocks_in_image = le32_to_cpu(header->blocks_in_image);
65
+ header->blocks_allocated = le32_to_cpu(header->blocks_allocated);
66
qemu_uuid_bswap(&header->uuid_image);
67
qemu_uuid_bswap(&header->uuid_last_snap);
68
qemu_uuid_bswap(&header->uuid_link);
69
@@ -XXX,XX +XXX,XX @@ static void vdi_header_to_cpu(VdiHeader *header)
70
71
static void vdi_header_to_le(VdiHeader *header)
72
{
73
- cpu_to_le32s(&header->signature);
74
- cpu_to_le32s(&header->version);
75
- cpu_to_le32s(&header->header_size);
76
- cpu_to_le32s(&header->image_type);
77
- cpu_to_le32s(&header->image_flags);
78
- cpu_to_le32s(&header->offset_bmap);
79
- cpu_to_le32s(&header->offset_data);
80
- cpu_to_le32s(&header->cylinders);
81
- cpu_to_le32s(&header->heads);
82
- cpu_to_le32s(&header->sectors);
83
- cpu_to_le32s(&header->sector_size);
84
- cpu_to_le64s(&header->disk_size);
85
- cpu_to_le32s(&header->block_size);
86
- cpu_to_le32s(&header->block_extra);
87
- cpu_to_le32s(&header->blocks_in_image);
88
- cpu_to_le32s(&header->blocks_allocated);
89
+ header->signature = cpu_to_le32(header->signature);
90
+ header->version = cpu_to_le32(header->version);
91
+ header->header_size = cpu_to_le32(header->header_size);
92
+ header->image_type = cpu_to_le32(header->image_type);
93
+ header->image_flags = cpu_to_le32(header->image_flags);
94
+ header->offset_bmap = cpu_to_le32(header->offset_bmap);
95
+ header->offset_data = cpu_to_le32(header->offset_data);
96
+ header->cylinders = cpu_to_le32(header->cylinders);
97
+ header->heads = cpu_to_le32(header->heads);
98
+ header->sectors = cpu_to_le32(header->sectors);
99
+ header->sector_size = cpu_to_le32(header->sector_size);
100
+ header->disk_size = cpu_to_le64(header->disk_size);
101
+ header->block_size = cpu_to_le32(header->block_size);
102
+ header->block_extra = cpu_to_le32(header->block_extra);
103
+ header->blocks_in_image = cpu_to_le32(header->blocks_in_image);
104
+ header->blocks_allocated = cpu_to_le32(header->blocks_allocated);
105
qemu_uuid_bswap(&header->uuid_image);
106
qemu_uuid_bswap(&header->uuid_last_snap);
107
qemu_uuid_bswap(&header->uuid_link);
108
--
109
2.19.1
110
111
diff view generated by jsdifflib
1
From: Alberto Garcia <berto@igalia.com>
1
From: Alberto Garcia <berto@igalia.com>
2
2
3
This function extracts all options from a QDict starting with a
3
This is a static function with only one caller, so there's no need to
4
certain prefix and puts them in a new QDict.
4
keep it. Inlining the code in quorum_compare() makes it much simpler.
5
6
We'll have a couple of cases where we simply want to discard those
7
options instead of copying them, and that's what this patch does.
8
5
9
Signed-off-by: Alberto Garcia <berto@igalia.com>
6
Signed-off-by: Alberto Garcia <berto@igalia.com>
7
Reported-by: Markus Armbruster <armbru@redhat.com>
10
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
8
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
11
---
9
---
12
qobject/block-qdict.c | 11 ++++++++---
10
block/quorum.c | 24 +++++-------------------
13
1 file changed, 8 insertions(+), 3 deletions(-)
11
1 file changed, 5 insertions(+), 19 deletions(-)
14
12
15
diff --git a/qobject/block-qdict.c b/qobject/block-qdict.c
13
diff --git a/block/quorum.c b/block/quorum.c
16
index XXXXXXX..XXXXXXX 100644
14
index XXXXXXX..XXXXXXX 100644
17
--- a/qobject/block-qdict.c
15
--- a/block/quorum.c
18
+++ b/qobject/block-qdict.c
16
+++ b/block/quorum.c
19
@@ -XXX,XX +XXX,XX @@ void qdict_flatten(QDict *qdict)
17
@@ -XXX,XX +XXX,XX @@ static bool quorum_iovec_compare(QEMUIOVector *a, QEMUIOVector *b)
20
qdict_flatten_qdict(qdict, qdict, NULL);
18
return true;
21
}
19
}
22
20
23
-/* extract all the src QDict entries starting by start into dst */
21
-static void GCC_FMT_ATTR(2, 3) quorum_err(QuorumAIOCB *acb,
24
+/* extract all the src QDict entries starting by start into dst.
22
- const char *fmt, ...)
25
+ * If dst is NULL then the entries are simply removed from src. */
23
-{
26
void qdict_extract_subqdict(QDict *src, QDict **dst, const char *start)
24
- va_list ap;
27
25
-
26
- va_start(ap, fmt);
27
- fprintf(stderr, "quorum: offset=%" PRIu64 " bytes=%" PRIu64 " ",
28
- acb->offset, acb->bytes);
29
- vfprintf(stderr, fmt, ap);
30
- fprintf(stderr, "\n");
31
- va_end(ap);
32
- exit(1);
33
-}
34
-
35
-static bool quorum_compare(QuorumAIOCB *acb,
36
- QEMUIOVector *a,
37
- QEMUIOVector *b)
38
+static bool quorum_compare(QuorumAIOCB *acb, QEMUIOVector *a, QEMUIOVector *b)
28
{
39
{
29
const QDictEntry *entry, *next;
40
BDRVQuorumState *s = acb->bs->opaque;
30
const char *p;
41
ssize_t offset;
31
42
@@ -XXX,XX +XXX,XX @@ static bool quorum_compare(QuorumAIOCB *acb,
32
- *dst = qdict_new();
43
if (s->is_blkverify) {
33
+ if (dst) {
44
offset = qemu_iovec_compare(a, b);
34
+ *dst = qdict_new();
45
if (offset != -1) {
35
+ }
46
- quorum_err(acb, "contents mismatch at offset %" PRIu64,
36
entry = qdict_first(src);
47
- acb->offset + offset);
37
48
+ fprintf(stderr, "quorum: offset=%" PRIu64 " bytes=%" PRIu64
38
while (entry != NULL) {
49
+ " contents mismatch at offset %" PRIu64 "\n",
39
next = qdict_next(src, entry);
50
+ acb->offset, acb->bytes, acb->offset + offset);
40
if (strstart(entry->key, start, &p)) {
51
+ exit(1);
41
- qdict_put_obj(*dst, p, qobject_ref(entry->value));
42
+ if (dst) {
43
+ qdict_put_obj(*dst, p, qobject_ref(entry->value));
44
+ }
45
qdict_del(src, entry->key);
46
}
52
}
47
entry = next;
53
return true;
54
}
48
--
55
--
49
2.13.6
56
2.19.1
50
57
51
58
diff view generated by jsdifflib
1
From: Alberto Garcia <berto@igalia.com>
1
From: Alberto Garcia <berto@igalia.com>
2
2
3
The previous patch fixes a problem in which draining a block device
3
The blkverify mode of Quorum can only be enabled if the number of
4
with more than one throttled request can make it wait first for the
4
children is exactly two and the value of vote-threshold is also two.
5
completion of requests in other members of the same group.
6
5
7
This patch updates test_remove_group_member() in iotest 093 to
6
If the user tries to enable it but the other settings are incorrect
8
reproduce that scenario. This updated test would hang QEMU without the
7
then QEMU simply prints an error message to stderr and carries on
9
fix from the previous patch.
8
disabling the blkverify setting.
9
10
This patch makes quorum_open() fail and return an error in this case.
10
11
11
Signed-off-by: Alberto Garcia <berto@igalia.com>
12
Signed-off-by: Alberto Garcia <berto@igalia.com>
13
Reported-by: Markus Armbruster <armbru@redhat.com>
12
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
14
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
13
---
15
---
14
tests/qemu-iotests/093 | 19 +++++++++++--------
16
block/quorum.c | 13 ++++++-------
15
1 file changed, 11 insertions(+), 8 deletions(-)
17
1 file changed, 6 insertions(+), 7 deletions(-)
16
18
17
diff --git a/tests/qemu-iotests/093 b/tests/qemu-iotests/093
19
diff --git a/block/quorum.c b/block/quorum.c
18
index XXXXXXX..XXXXXXX 100755
20
index XXXXXXX..XXXXXXX 100644
19
--- a/tests/qemu-iotests/093
21
--- a/block/quorum.c
20
+++ b/tests/qemu-iotests/093
22
+++ b/block/quorum.c
21
@@ -XXX,XX +XXX,XX @@ class ThrottleTestCase(iotests.QMPTestCase):
23
@@ -XXX,XX +XXX,XX @@ static int quorum_open(BlockDriverState *bs, QDict *options, int flags,
22
# Read 4KB from drive0. This is performed immediately.
24
s->read_pattern = ret;
23
self.vm.hmp_qemu_io("drive0", "aio_read 0 4096")
25
24
26
if (s->read_pattern == QUORUM_READ_PATTERN_QUORUM) {
25
- # Read 4KB again. The I/O limit has been exceeded so this
27
- /* is the driver in blkverify mode */
26
+ # Read 2KB. The I/O limit has been exceeded so this
28
- if (qemu_opt_get_bool(opts, QUORUM_OPT_BLKVERIFY, false) &&
27
# request is throttled and a timer is set to wake it up.
29
- s->num_children == 2 && s->threshold == 2) {
28
- self.vm.hmp_qemu_io("drive0", "aio_read 0 4096")
30
- s->is_blkverify = true;
29
+ self.vm.hmp_qemu_io("drive0", "aio_read 0 2048")
31
- } else if (qemu_opt_get_bool(opts, QUORUM_OPT_BLKVERIFY, false)) {
30
+
32
- fprintf(stderr, "blkverify mode is set by setting blkverify=on "
31
+ # Read 2KB again. We're still over the I/O limit so this is
33
- "and using two files with vote_threshold=2\n");
32
+ # request is also throttled, but no new timer is set since
34
+ s->is_blkverify = qemu_opt_get_bool(opts, QUORUM_OPT_BLKVERIFY, false);
33
+ # there's already one.
35
+ if (s->is_blkverify && (s->num_children != 2 || s->threshold != 2)) {
34
+ self.vm.hmp_qemu_io("drive0", "aio_read 0 2048")
36
+ error_setg(&local_err, "blkverify=on can only be set if there are "
35
37
+ "exactly two files and vote-threshold is 2");
36
- # Read from drive1. We're still over the I/O limit so this
38
+ ret = -EINVAL;
37
- # request is also throttled. There's no timer set in drive1
39
+ goto exit;
38
- # because there's already one in drive0. Once the timer in
40
}
39
- # drive0 fires and its throttled request is processed then the
41
40
- # next request in the queue will be scheduled: this one.
42
s->rewrite_corrupted = qemu_opt_get_bool(opts, QUORUM_OPT_REWRITE,
41
+ # Read from drive1. This request is also throttled, and no
42
+ # timer is set in drive1 because there's already one in
43
+ # drive0.
44
self.vm.hmp_qemu_io("drive1", "aio_read 0 4096")
45
46
# At this point only the first 4KB have been read from drive0.
47
@@ -XXX,XX +XXX,XX @@ class ThrottleTestCase(iotests.QMPTestCase):
48
result = self.vm.qmp("block_set_io_throttle", conv_keys=False, **params)
49
self.assert_qmp(result, 'return', {})
50
51
- # Removing the I/O limits from drive0 drains its pending request.
52
+ # Removing the I/O limits from drive0 drains its two pending requests.
53
# The read request in drive1 is still throttled.
54
self.assertEqual(self.blockstats('drive0')[0], 8192)
55
self.assertEqual(self.blockstats('drive1')[0], 0)
56
--
43
--
57
2.13.6
44
2.19.1
58
45
59
46
diff view generated by jsdifflib
1
From: Alberto Garcia <berto@igalia.com>
1
From: Alberto Garcia <berto@igalia.com>
2
3
In the throttling code after an I/O request has been completed the
4
next one is selected from a different member using a round-robin
5
algorithm. This ensures that all members get a chance to finish their
6
pending I/O requests.
7
8
However, if a group member has its I/O limits disabled (because it's
9
being drained) then we should always give it priority in order to have
10
all its pending requests finished as soon as possible.
11
12
If we don't do this we could have a member in the process of being
13
drained waiting for the throttled requests of other members, for which
14
the I/O limits still apply.
15
16
This can have additional consequences: if we're running in qtest mode
17
(with QEMU_CLOCK_VIRTUAL) then timers can only fire if we advance the
18
clock manually, so attempting to drain a block device can hang QEMU in
19
the BDRV_POLL_WHILE() loop at the end of bdrv_do_drained_begin().
20
2
21
Signed-off-by: Alberto Garcia <berto@igalia.com>
3
Signed-off-by: Alberto Garcia <berto@igalia.com>
22
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
4
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
23
---
5
---
24
block/throttle-groups.c | 9 +++++++++
6
tests/qemu-iotests/081 | 30 ++++++++++++++++++++++++++++++
25
1 file changed, 9 insertions(+)
7
tests/qemu-iotests/081.out | 16 ++++++++++++++++
8
2 files changed, 46 insertions(+)
26
9
27
diff --git a/block/throttle-groups.c b/block/throttle-groups.c
10
diff --git a/tests/qemu-iotests/081 b/tests/qemu-iotests/081
11
index XXXXXXX..XXXXXXX 100755
12
--- a/tests/qemu-iotests/081
13
+++ b/tests/qemu-iotests/081
14
@@ -XXX,XX +XXX,XX @@ echo "== checking that quorum is broken =="
15
16
$QEMU_IO -c "open -o $quorum" -c "read -P 0x32 0 $size" | _filter_qemu_io
17
18
+echo
19
+echo "== checking the blkverify mode with broken content =="
20
+
21
+quorum="driver=raw,file.driver=quorum,file.vote-threshold=2,file.blkverify=on"
22
+quorum="$quorum,file.children.0.file.filename=$TEST_DIR/1.raw"
23
+quorum="$quorum,file.children.1.file.filename=$TEST_DIR/2.raw"
24
+quorum="$quorum,file.children.0.driver=raw"
25
+quorum="$quorum,file.children.1.driver=raw"
26
+
27
+$QEMU_IO -c "open -o $quorum" -c "read -P 0x32 0 $size" | _filter_qemu_io
28
+
29
+echo
30
+echo "== writing the same data to both files =="
31
+
32
+$QEMU_IO -c "write -P 0x32 0 $size" "$TEST_DIR/1.raw" | _filter_qemu_io
33
+$QEMU_IO -c "write -P 0x32 0 $size" "$TEST_DIR/2.raw" | _filter_qemu_io
34
+
35
+echo
36
+echo "== checking the blkverify mode with valid content =="
37
+
38
+$QEMU_IO -c "open -o $quorum" -c "read -P 0x32 0 $size" | _filter_qemu_io
39
+
40
+echo
41
+echo "== checking the blkverify mode with invalid settings =="
42
+
43
+quorum="$quorum,file.children.2.file.filename=$TEST_DIR/3.raw"
44
+quorum="$quorum,file.children.2.driver=raw"
45
+
46
+$QEMU_IO -c "open -o $quorum" | _filter_qemu_io
47
+
48
# success, all done
49
echo "*** done"
50
rm -f $seq.full
51
diff --git a/tests/qemu-iotests/081.out b/tests/qemu-iotests/081.out
28
index XXXXXXX..XXXXXXX 100644
52
index XXXXXXX..XXXXXXX 100644
29
--- a/block/throttle-groups.c
53
--- a/tests/qemu-iotests/081.out
30
+++ b/block/throttle-groups.c
54
+++ b/tests/qemu-iotests/081.out
31
@@ -XXX,XX +XXX,XX @@ static ThrottleGroupMember *next_throttle_token(ThrottleGroupMember *tgm,
55
@@ -XXX,XX +XXX,XX @@ wrote 10485760/10485760 bytes at offset 0
32
ThrottleGroup *tg = container_of(ts, ThrottleGroup, ts);
56
33
ThrottleGroupMember *token, *start;
57
== checking that quorum is broken ==
34
58
read failed: Input/output error
35
+ /* If this member has its I/O limits disabled then it means that
36
+ * it's being drained. Skip the round-robin search and return tgm
37
+ * immediately if it has pending requests. Otherwise we could be
38
+ * forcing it to wait for other member's throttled requests. */
39
+ if (tgm_has_pending_reqs(tgm, is_write) &&
40
+ atomic_read(&tgm->io_limits_disabled)) {
41
+ return tgm;
42
+ }
43
+
59
+
44
start = token = tg->tokens[is_write];
60
+== checking the blkverify mode with broken content ==
45
61
+quorum: offset=0 bytes=10485760 contents mismatch at offset 0
46
/* get next bs round in round robin style */
62
+
63
+== writing the same data to both files ==
64
+wrote 10485760/10485760 bytes at offset 0
65
+10 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
66
+wrote 10485760/10485760 bytes at offset 0
67
+10 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
68
+
69
+== checking the blkverify mode with valid content ==
70
+read 10485760/10485760 bytes at offset 0
71
+10 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
72
+
73
+== checking the blkverify mode with invalid settings ==
74
+can't open: blkverify=on can only be set if there are exactly two files and vote-threshold is 2
75
*** done
47
--
76
--
48
2.13.6
77
2.19.1
49
78
50
79
diff view generated by jsdifflib
1
From: Alberto Garcia <berto@igalia.com>
1
From: Alberto Garcia <berto@igalia.com>
2
2
3
Commit 6fccbb475bc6effc313ee9481726a1748b6dae57 fixed a bug caused by
3
The blkverify mode of Quorum only works when the number of children is
4
QEMU attempting to remove a throttle group member with no pending
4
exactly two, so any attempt to add a new one must return an error.
5
requests but an active timer set. This was the result of a previous
6
bdrv_drained_begin() call processing the throttled requests but
7
leaving the timer untouched.
8
5
9
Although the commit does solve the problem, the situation shouldn't
6
quorum_del_child() on the other hand doesn't need any additional check
10
happen in the first place. If we try to drain a throttle group member
7
because decreasing the number of children would make it go under the
11
which has a timer set, we should cancel the timer instead of ignoring
8
vote threshold.
12
it.
13
9
14
Signed-off-by: Alberto Garcia <berto@igalia.com>
10
Signed-off-by: Alberto Garcia <berto@igalia.com>
11
Reported-by: Kevin Wolf <kwolf@redhat.com>
15
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
12
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
16
---
13
---
17
block/throttle-groups.c | 32 ++++++++++++++++++++++----------
14
block/quorum.c | 8 ++++++++
18
1 file changed, 22 insertions(+), 10 deletions(-)
15
1 file changed, 8 insertions(+)
19
16
20
diff --git a/block/throttle-groups.c b/block/throttle-groups.c
17
diff --git a/block/quorum.c b/block/quorum.c
21
index XXXXXXX..XXXXXXX 100644
18
index XXXXXXX..XXXXXXX 100644
22
--- a/block/throttle-groups.c
19
--- a/block/quorum.c
23
+++ b/block/throttle-groups.c
20
+++ b/block/quorum.c
24
@@ -XXX,XX +XXX,XX @@
21
@@ -XXX,XX +XXX,XX @@ static void quorum_add_child(BlockDriverState *bs, BlockDriverState *child_bs,
25
22
char indexstr[32];
26
static void throttle_group_obj_init(Object *obj);
23
int ret;
27
static void throttle_group_obj_complete(UserCreatable *obj, Error **errp);
24
28
+static void timer_cb(ThrottleGroupMember *tgm, bool is_write);
25
+ if (s->is_blkverify) {
29
26
+ error_setg(errp, "Cannot add a child to a quorum in blkverify mode");
30
/* The ThrottleGroup structure (with its ThrottleState) is shared
27
+ return;
31
* among different ThrottleGroupMembers and it's independent from
28
+ }
32
@@ -XXX,XX +XXX,XX @@ static void throttle_group_restart_queue(ThrottleGroupMember *tgm, bool is_write
33
rd->tgm = tgm;
34
rd->is_write = is_write;
35
36
+ /* This function is called when a timer is fired or when
37
+ * throttle_group_restart_tgm() is called. Either way, there can
38
+ * be no timer pending on this tgm at this point */
39
+ assert(!timer_pending(tgm->throttle_timers.timers[is_write]));
40
+
29
+
41
co = qemu_coroutine_create(throttle_group_restart_queue_entry, rd);
30
assert(s->num_children <= INT_MAX / sizeof(BdrvChild *));
42
aio_co_enter(tgm->aio_context, co);
31
if (s->num_children == INT_MAX / sizeof(BdrvChild *) ||
43
}
32
s->next_child_index == UINT_MAX) {
44
33
@@ -XXX,XX +XXX,XX @@ static void quorum_del_child(BlockDriverState *bs, BdrvChild *child,
45
void throttle_group_restart_tgm(ThrottleGroupMember *tgm)
46
{
47
+ int i;
48
+
49
if (tgm->throttle_state) {
50
- throttle_group_restart_queue(tgm, 0);
51
- throttle_group_restart_queue(tgm, 1);
52
+ for (i = 0; i < 2; i++) {
53
+ QEMUTimer *t = tgm->throttle_timers.timers[i];
54
+ if (timer_pending(t)) {
55
+ /* If there's a pending timer on this tgm, fire it now */
56
+ timer_del(t);
57
+ timer_cb(tgm, i);
58
+ } else {
59
+ /* Else run the next request from the queue manually */
60
+ throttle_group_restart_queue(tgm, i);
61
+ }
62
+ }
63
}
64
}
65
66
@@ -XXX,XX +XXX,XX @@ void throttle_group_unregister_tgm(ThrottleGroupMember *tgm)
67
return;
34
return;
68
}
35
}
69
36
70
- assert(tgm->pending_reqs[0] == 0 && tgm->pending_reqs[1] == 0);
37
+ /* We know now that num_children > threshold, so blkverify must be false */
71
- assert(qemu_co_queue_empty(&tgm->throttled_reqs[0]));
38
+ assert(!s->is_blkverify);
72
- assert(qemu_co_queue_empty(&tgm->throttled_reqs[1]));
39
+
73
-
40
bdrv_drained_begin(bs);
74
qemu_mutex_lock(&tg->lock);
41
75
for (i = 0; i < 2; i++) {
42
/* We can safely remove this child now */
76
- if (timer_pending(tgm->throttle_timers.timers[i])) {
77
- tg->any_timer_armed[i] = false;
78
- schedule_next_request(tgm, i);
79
- }
80
+ assert(tgm->pending_reqs[i] == 0);
81
+ assert(qemu_co_queue_empty(&tgm->throttled_reqs[i]));
82
+ assert(!timer_pending(tgm->throttle_timers.timers[i]));
83
if (tg->tokens[i] == tgm) {
84
token = throttle_group_next_tgm(tgm);
85
/* Take care of the case where this is the last tgm in the group */
86
--
43
--
87
2.13.6
44
2.19.1
88
45
89
46
diff view generated by jsdifflib
1
From: Alberto Garcia <berto@igalia.com>
1
From: Alberto Garcia <berto@igalia.com>
2
2
3
A throttle group can have several members, and each one of them can
3
This patch tests that you can add and remove drives from a Quorum
4
have several pending requests in the queue.
4
using the x-blockdev-change command.
5
6
The requests are processed in a round-robin fashion, so the algorithm
7
decides the drive that is going to run the next request and sets a
8
timer in it. Once the timer fires and the throttled request is run
9
then the next drive from the group is selected and a new timer is set.
10
11
If the user tried to remove a drive from a group and that drive had a
12
timer set then the code was not taking care of setting up a new timer
13
in one of the remaining members of the group, freezing their I/O.
14
15
This problem was fixed in 6fccbb475bc6effc313ee9481726a1748b6dae57,
16
and this patch adds a new test case that reproduces this exact
17
scenario.
18
5
19
Signed-off-by: Alberto Garcia <berto@igalia.com>
6
Signed-off-by: Alberto Garcia <berto@igalia.com>
20
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
7
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
21
---
8
---
22
tests/qemu-iotests/093 | 52 ++++++++++++++++++++++++++++++++++++++++++++++
9
tests/qemu-iotests/081 | 86 ++++++++++++++++++++++++++++++++++++++
23
tests/qemu-iotests/093.out | 4 ++--
10
tests/qemu-iotests/081.out | 54 ++++++++++++++++++++++++
24
2 files changed, 54 insertions(+), 2 deletions(-)
11
2 files changed, 140 insertions(+)
25
12
26
diff --git a/tests/qemu-iotests/093 b/tests/qemu-iotests/093
13
diff --git a/tests/qemu-iotests/081 b/tests/qemu-iotests/081
27
index XXXXXXX..XXXXXXX 100755
14
index XXXXXXX..XXXXXXX 100755
28
--- a/tests/qemu-iotests/093
15
--- a/tests/qemu-iotests/081
29
+++ b/tests/qemu-iotests/093
16
+++ b/tests/qemu-iotests/081
30
@@ -XXX,XX +XXX,XX @@ class ThrottleTestCase(iotests.QMPTestCase):
17
@@ -XXX,XX +XXX,XX @@ quorum="$quorum,file.children.2.driver=raw"
31
limits[tk] = rate
18
32
self.do_test_throttle(ndrives, 5, limits)
19
$QEMU_IO -c "open -o $quorum" | _filter_qemu_io
33
20
34
+ # Test that removing a drive from a throttle group should not
21
+echo
35
+ # affect the remaining members of the group.
22
+echo "== dynamically adding a child to a quorum =="
36
+ # https://bugzilla.redhat.com/show_bug.cgi?id=1535914
37
+ def test_remove_group_member(self):
38
+ # Create a throttle group with two drives
39
+ # and set a 4 KB/s read limit.
40
+ params = {"bps": 0,
41
+ "bps_rd": 4096,
42
+ "bps_wr": 0,
43
+ "iops": 0,
44
+ "iops_rd": 0,
45
+ "iops_wr": 0 }
46
+ self.configure_throttle(2, params)
47
+
23
+
48
+ # Read 4KB from drive0. This is performed immediately.
24
+for verify in false true; do
49
+ self.vm.hmp_qemu_io("drive0", "aio_read 0 4096")
25
+ run_qemu <<EOF
26
+ { "execute": "qmp_capabilities" }
27
+ { "execute": "blockdev-add",
28
+ "arguments": {
29
+ "driver": "quorum",
30
+ "node-name": "drive0-quorum",
31
+ "vote-threshold": 2,
32
+ "blkverify": ${verify},
33
+ "children": [
34
+ {
35
+ "driver": "$IMGFMT",
36
+ "file": {
37
+ "driver": "file",
38
+ "filename": "$TEST_DIR/1.raw"
39
+ }
40
+ },
41
+ {
42
+ "driver": "$IMGFMT",
43
+ "file": {
44
+ "driver": "file",
45
+ "filename": "$TEST_DIR/2.raw"
46
+ }
47
+ }
48
+ ]
49
+ }
50
+ }
51
+ { "execute": "blockdev-add",
52
+ "arguments": {
53
+ "node-name": "drive3",
54
+ "driver": "$IMGFMT",
55
+ "file": {
56
+ "driver": "file",
57
+ "filename": "$TEST_DIR/2.raw"
58
+ }
59
+ }
60
+ }
61
+ { "execute": "x-blockdev-change",
62
+ "arguments": { "parent": "drive0-quorum",
63
+ "node": "drive3" } }
64
+ { "execute": "quit" }
65
+EOF
66
+done
50
+
67
+
51
+ # Read 4KB again. The I/O limit has been exceeded so this
68
+echo
52
+ # request is throttled and a timer is set to wake it up.
69
+echo "== dynamically removing a child from a quorum =="
53
+ self.vm.hmp_qemu_io("drive0", "aio_read 0 4096")
54
+
70
+
55
+ # Read from drive1. We're still over the I/O limit so this
71
+for verify in false true; do
56
+ # request is also throttled. There's no timer set in drive1
72
+ for vote_threshold in 1 2; do
57
+ # because there's already one in drive0. Once the timer in
73
+ run_qemu <<EOF
58
+ # drive0 fires and its throttled request is processed then the
74
+ { "execute": "qmp_capabilities" }
59
+ # next request in the queue will be scheduled: this one.
75
+ { "execute": "blockdev-add",
60
+ self.vm.hmp_qemu_io("drive1", "aio_read 0 4096")
76
+ "arguments": {
77
+ "driver": "quorum",
78
+ "node-name": "drive0-quorum",
79
+ "vote-threshold": ${vote_threshold},
80
+ "blkverify": ${verify},
81
+ "children": [
82
+ {
83
+ "driver": "$IMGFMT",
84
+ "file": {
85
+ "driver": "file",
86
+ "filename": "$TEST_DIR/1.raw"
87
+ }
88
+ },
89
+ {
90
+ "driver": "$IMGFMT",
91
+ "file": {
92
+ "driver": "file",
93
+ "filename": "$TEST_DIR/2.raw"
94
+ }
95
+ }
96
+ ]
97
+ }
98
+ }
99
+ { "execute": "x-blockdev-change",
100
+ "arguments": { "parent": "drive0-quorum",
101
+ "child": "children.1" } }
102
+ { "execute": "quit" }
103
+EOF
104
+ done
105
+done
61
+
106
+
62
+ # At this point only the first 4KB have been read from drive0.
107
# success, all done
63
+ # The other requests are throttled.
108
echo "*** done"
64
+ self.assertEqual(self.blockstats('drive0')[0], 4096)
109
rm -f $seq.full
65
+ self.assertEqual(self.blockstats('drive1')[0], 0)
110
diff --git a/tests/qemu-iotests/081.out b/tests/qemu-iotests/081.out
111
index XXXXXXX..XXXXXXX 100644
112
--- a/tests/qemu-iotests/081.out
113
+++ b/tests/qemu-iotests/081.out
114
@@ -XXX,XX +XXX,XX @@ read 10485760/10485760 bytes at offset 0
115
116
== checking the blkverify mode with invalid settings ==
117
can't open: blkverify=on can only be set if there are exactly two files and vote-threshold is 2
66
+
118
+
67
+ # Remove drive0 from the throttle group and disable its I/O limits.
119
+== dynamically adding a child to a quorum ==
68
+ # drive1 remains in the group with a throttled request.
120
+Testing:
69
+ params['bps_rd'] = 0
121
+QMP_VERSION
70
+ params['device'] = 'drive0'
122
+{"return": {}}
71
+ result = self.vm.qmp("block_set_io_throttle", conv_keys=False, **params)
123
+{"return": {}}
72
+ self.assert_qmp(result, 'return', {})
124
+{"return": {}}
125
+{"return": {}}
126
+{"return": {}}
127
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
73
+
128
+
74
+ # Removing the I/O limits from drive0 drains its pending request.
129
+Testing:
75
+ # The read request in drive1 is still throttled.
130
+QMP_VERSION
76
+ self.assertEqual(self.blockstats('drive0')[0], 8192)
131
+{"return": {}}
77
+ self.assertEqual(self.blockstats('drive1')[0], 0)
132
+{"return": {}}
133
+{"return": {}}
134
+{"error": {"class": "GenericError", "desc": "Cannot add a child to a quorum in blkverify mode"}}
135
+{"return": {}}
136
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
78
+
137
+
79
+ # Advance the clock 5 seconds. This completes the request in drive1
80
+ self.vm.qtest("clock_step %d" % (5 * nsec_per_sec))
81
+
138
+
82
+ # Now all requests have been processed.
139
+== dynamically removing a child from a quorum ==
83
+ self.assertEqual(self.blockstats('drive0')[0], 8192)
140
+Testing:
84
+ self.assertEqual(self.blockstats('drive1')[0], 4096)
141
+QMP_VERSION
142
+{"return": {}}
143
+{"return": {}}
144
+{"return": {}}
145
+{"return": {}}
146
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
85
+
147
+
86
class ThrottleTestCoroutine(ThrottleTestCase):
148
+Testing:
87
test_img = "null-co://"
149
+QMP_VERSION
88
150
+{"return": {}}
89
diff --git a/tests/qemu-iotests/093.out b/tests/qemu-iotests/093.out
151
+{"return": {}}
90
index XXXXXXX..XXXXXXX 100644
152
+{"error": {"class": "GenericError", "desc": "The number of children cannot be lower than the vote threshold 2"}}
91
--- a/tests/qemu-iotests/093.out
153
+{"return": {}}
92
+++ b/tests/qemu-iotests/093.out
154
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
93
@@ -XXX,XX +XXX,XX @@
155
+
94
-........
156
+Testing:
95
+..........
157
+QMP_VERSION
96
----------------------------------------------------------------------
158
+{"return": {}}
97
-Ran 8 tests
159
+{"error": {"class": "GenericError", "desc": "blkverify=on can only be set if there are exactly two files and vote-threshold is 2"}}
98
+Ran 10 tests
160
+{"error": {"class": "GenericError", "desc": "Cannot find device=drive0-quorum nor node_name=drive0-quorum"}}
99
161
+{"return": {}}
100
OK
162
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
163
+
164
+Testing:
165
+QMP_VERSION
166
+{"return": {}}
167
+{"return": {}}
168
+{"error": {"class": "GenericError", "desc": "The number of children cannot be lower than the vote threshold 2"}}
169
+{"return": {}}
170
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
171
+
172
*** done
101
--
173
--
102
2.13.6
174
2.19.1
103
175
104
176
diff view generated by jsdifflib
1
From: Alberto Garcia <berto@igalia.com>
1
To fully change the read-only state of a node, we must not only change
2
bs->read_only, but also update bs->open_flags.
2
3
3
If a bdrv_reopen_multiple() call fails, then the explicit_options
4
QDict has to be deleted for every entry in the reopen queue. This must
5
happen regardless of whether that entry's bdrv_reopen_prepare() call
6
succeeded or not.
7
8
This patch simplifies the cleanup code a bit.
9
10
Signed-off-by: Alberto Garcia <berto@igalia.com>
11
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
4
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
5
Reviewed-by: Eric Blake <eblake@redhat.com>
6
Reviewed-by: Alberto Garcia <berto@igalia.com>
12
---
7
---
13
block.c | 9 ++++-----
8
block.c | 7 +++++++
14
1 file changed, 4 insertions(+), 5 deletions(-)
9
1 file changed, 7 insertions(+)
15
10
16
diff --git a/block.c b/block.c
11
diff --git a/block.c b/block.c
17
index XXXXXXX..XXXXXXX 100644
12
index XXXXXXX..XXXXXXX 100644
18
--- a/block.c
13
--- a/block.c
19
+++ b/block.c
14
+++ b/block.c
20
@@ -XXX,XX +XXX,XX @@ int bdrv_reopen_multiple(AioContext *ctx, BlockReopenQueue *bs_queue, Error **er
15
@@ -XXX,XX +XXX,XX @@ int bdrv_set_read_only(BlockDriverState *bs, bool read_only, Error **errp)
21
22
cleanup:
23
QSIMPLEQ_FOREACH_SAFE(bs_entry, bs_queue, entry, next) {
24
- if (ret && bs_entry->prepared) {
25
- bdrv_reopen_abort(&bs_entry->state);
26
- } else if (ret) {
27
+ if (ret) {
28
+ if (bs_entry->prepared) {
29
+ bdrv_reopen_abort(&bs_entry->state);
30
+ }
31
qobject_unref(bs_entry->state.explicit_options);
32
}
33
qobject_unref(bs_entry->state.options);
34
@@ -XXX,XX +XXX,XX @@ void bdrv_reopen_abort(BDRVReopenState *reopen_state)
35
drv->bdrv_reopen_abort(reopen_state);
36
}
16
}
37
17
38
- qobject_unref(reopen_state->explicit_options);
18
bs->read_only = read_only;
39
-
19
+
40
bdrv_abort_perm_update(reopen_state->bs);
20
+ if (read_only) {
21
+ bs->open_flags &= ~BDRV_O_RDWR;
22
+ } else {
23
+ bs->open_flags |= BDRV_O_RDWR;
24
+ }
25
+
26
return 0;
41
}
27
}
42
28
43
--
29
--
44
2.13.6
30
2.19.1
45
31
46
32
diff view generated by jsdifflib
1
blockdev-add fails if an invalid node name is given, so we should
1
If a management application builds the block graph node by node, the
2
document what a valid node name even is.
2
protocol layer doesn't inherit its read-only option from the format
3
layer any more, so it must be set explicitly.
3
4
4
Reported-by: Cong Li <coli@redhat.com>
5
Backing files should work on read-only storage, but at the same time, a
6
block job like commit should be able to reopen them read-write if they
7
are on read-write storage. However, without option inheritance, reopen
8
only changes the read-only option for the root node (typically the
9
format layer), but not the protocol layer, so reopening fails (the
10
format layer wants to get write permissions, but the protocol layer is
11
still read-only).
12
13
A simple workaround for the problem in the management tool would be to
14
open the protocol layer always read-write and to make only the format
15
layer read-only for backing files. However, sometimes the file is
16
actually stored on read-only storage and we don't know whether the image
17
can be opened read-write (for example, for NBD it depends on the server
18
we're trying to connect to). This adds an option that makes QEMU try to
19
open the image read-write, but allows it to degrade to a read-only mode
20
without returning an error.
21
22
The documentation for this option is consciously phrased in a way that
23
allows QEMU to switch to a better model eventually: Instead of trying
24
when the image is first opened, making the read-only flag dynamic and
25
changing it automatically whenever the first BLK_PERM_WRITE user is
26
attached or the last one is detached would be much more useful
27
behaviour.
28
29
Unfortunately, this more useful behaviour is also a lot harder to
30
implement, and libvirt needs a solution now before it can switch to
31
-blockdev, so let's start with this easier approach for now.
32
33
Instead of adding a new auto-read-only option, turning the existing
34
read-only into an enum (with a bool alternate for compatibility) was
35
considered, but it complicated the implementation to the point that it
36
didn't seem to be worth it.
37
5
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
38
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
6
Reviewed-by: Eric Blake <eblake@redhat.com>
39
Reviewed-by: Eric Blake <eblake@redhat.com>
7
Reviewed-by: Cong Li <coli@redhat.com>
8
Reviewed-by: Alberto Garcia <berto@igalia.com>
9
---
40
---
10
qapi/block-core.json | 3 +++
41
qapi/block-core.json | 7 +++++++
11
1 file changed, 3 insertions(+)
42
include/block/block.h | 2 ++
43
block.c | 17 +++++++++++++++++
44
block/vvfat.c | 1 +
45
blockdev.c | 2 +-
46
5 files changed, 28 insertions(+), 1 deletion(-)
12
47
13
diff --git a/qapi/block-core.json b/qapi/block-core.json
48
diff --git a/qapi/block-core.json b/qapi/block-core.json
14
index XXXXXXX..XXXXXXX 100644
49
index XXXXXXX..XXXXXXX 100644
15
--- a/qapi/block-core.json
50
--- a/qapi/block-core.json
16
+++ b/qapi/block-core.json
51
+++ b/qapi/block-core.json
17
@@ -XXX,XX +XXX,XX @@
52
@@ -XXX,XX +XXX,XX @@
18
# @driver: block driver name
53
# either generally or in certain configurations. In this case,
19
# @node-name: the node name of the new node (Since 2.0).
54
# the default value does not work and the option must be
20
# This option is required on the top level of blockdev-add.
55
# specified explicitly.
21
+# Valid node names start with an alphabetic character and may
56
+# @auto-read-only: if true and @read-only is false, QEMU may automatically
22
+# contain only alphanumeric characters, '-', '.' and '_'. Their
57
+# decide not to open the image read-write as requested, but
23
+# maximum length is 31 characters.
58
+# fall back to read-only instead (and switch between the modes
24
# @discard: discard-related options (default: ignore)
59
+# later), e.g. depending on whether the image file is writable
25
# @cache: cache-related options
60
+# or whether a writing user is attached to the node
26
# @read-only: whether the block device should be read-only (default: false).
61
+# (default: false, since 3.1)
62
# @detect-zeroes: detect and optimize zero writes (Since 2.1)
63
# (default: off)
64
# @force-share: force share all permission on added nodes.
65
@@ -XXX,XX +XXX,XX @@
66
'*discard': 'BlockdevDiscardOptions',
67
'*cache': 'BlockdevCacheOptions',
68
'*read-only': 'bool',
69
+ '*auto-read-only': 'bool',
70
'*force-share': 'bool',
71
'*detect-zeroes': 'BlockdevDetectZeroesOptions' },
72
'discriminator': 'driver',
73
diff --git a/include/block/block.h b/include/block/block.h
74
index XXXXXXX..XXXXXXX 100644
75
--- a/include/block/block.h
76
+++ b/include/block/block.h
77
@@ -XXX,XX +XXX,XX @@ typedef struct HDGeometry {
78
select an appropriate protocol driver,
79
ignoring the format layer */
80
#define BDRV_O_NO_IO 0x10000 /* don't initialize for I/O */
81
+#define BDRV_O_AUTO_RDONLY 0x20000 /* degrade to read-only if opening read-write fails */
82
83
#define BDRV_O_CACHE_MASK (BDRV_O_NOCACHE | BDRV_O_NO_FLUSH)
84
85
@@ -XXX,XX +XXX,XX @@ typedef struct HDGeometry {
86
#define BDRV_OPT_CACHE_DIRECT "cache.direct"
87
#define BDRV_OPT_CACHE_NO_FLUSH "cache.no-flush"
88
#define BDRV_OPT_READ_ONLY "read-only"
89
+#define BDRV_OPT_AUTO_READ_ONLY "auto-read-only"
90
#define BDRV_OPT_DISCARD "discard"
91
#define BDRV_OPT_FORCE_SHARE "force-share"
92
93
diff --git a/block.c b/block.c
94
index XXXXXXX..XXXXXXX 100644
95
--- a/block.c
96
+++ b/block.c
97
@@ -XXX,XX +XXX,XX @@ static void bdrv_inherited_options(int *child_flags, QDict *child_options,
98
99
/* Inherit the read-only option from the parent if it's not set */
100
qdict_copy_default(child_options, parent_options, BDRV_OPT_READ_ONLY);
101
+ qdict_copy_default(child_options, parent_options, BDRV_OPT_AUTO_READ_ONLY);
102
103
/* Our block drivers take care to send flushes and respect unmap policy,
104
* so we can default to enable both on lower layers regardless of the
105
@@ -XXX,XX +XXX,XX @@ static void bdrv_backing_options(int *child_flags, QDict *child_options,
106
107
/* backing files always opened read-only */
108
qdict_set_default_str(child_options, BDRV_OPT_READ_ONLY, "on");
109
+ qdict_set_default_str(child_options, BDRV_OPT_AUTO_READ_ONLY, "off");
110
flags &= ~BDRV_O_COPY_ON_READ;
111
112
/* snapshot=on is handled on the top layer */
113
@@ -XXX,XX +XXX,XX @@ static void update_flags_from_options(int *flags, QemuOpts *opts)
114
*flags |= BDRV_O_RDWR;
115
}
116
117
+ assert(qemu_opt_find(opts, BDRV_OPT_AUTO_READ_ONLY));
118
+ if (qemu_opt_get_bool_del(opts, BDRV_OPT_AUTO_READ_ONLY, false)) {
119
+ *flags |= BDRV_O_AUTO_RDONLY;
120
+ }
121
}
122
123
static void update_options_from_flags(QDict *options, int flags)
124
@@ -XXX,XX +XXX,XX @@ static void update_options_from_flags(QDict *options, int flags)
125
if (!qdict_haskey(options, BDRV_OPT_READ_ONLY)) {
126
qdict_put_bool(options, BDRV_OPT_READ_ONLY, !(flags & BDRV_O_RDWR));
127
}
128
+ if (!qdict_haskey(options, BDRV_OPT_AUTO_READ_ONLY)) {
129
+ qdict_put_bool(options, BDRV_OPT_AUTO_READ_ONLY,
130
+ flags & BDRV_O_AUTO_RDONLY);
131
+ }
132
}
133
134
static void bdrv_assign_node_name(BlockDriverState *bs,
135
@@ -XXX,XX +XXX,XX @@ QemuOptsList bdrv_runtime_opts = {
136
.type = QEMU_OPT_BOOL,
137
.help = "Node is opened in read-only mode",
138
},
139
+ {
140
+ .name = BDRV_OPT_AUTO_READ_ONLY,
141
+ .type = QEMU_OPT_BOOL,
142
+ .help = "Node can become read-only if opening read-write fails",
143
+ },
144
{
145
.name = "detect-zeroes",
146
.type = QEMU_OPT_STRING,
147
@@ -XXX,XX +XXX,XX @@ BlockDriverState *bdrv_open_blockdev_ref(BlockdevRef *ref, Error **errp)
148
qdict_set_default_str(qdict, BDRV_OPT_CACHE_DIRECT, "off");
149
qdict_set_default_str(qdict, BDRV_OPT_CACHE_NO_FLUSH, "off");
150
qdict_set_default_str(qdict, BDRV_OPT_READ_ONLY, "off");
151
+ qdict_set_default_str(qdict, BDRV_OPT_AUTO_READ_ONLY, "off");
152
+
153
}
154
155
bs = bdrv_open_inherit(NULL, reference, qdict, 0, NULL, NULL, errp);
156
diff --git a/block/vvfat.c b/block/vvfat.c
157
index XXXXXXX..XXXXXXX 100644
158
--- a/block/vvfat.c
159
+++ b/block/vvfat.c
160
@@ -XXX,XX +XXX,XX @@ static void vvfat_qcow_options(int *child_flags, QDict *child_options,
161
int parent_flags, QDict *parent_options)
162
{
163
qdict_set_default_str(child_options, BDRV_OPT_READ_ONLY, "off");
164
+ qdict_set_default_str(child_options, BDRV_OPT_AUTO_READ_ONLY, "off");
165
qdict_set_default_str(child_options, BDRV_OPT_CACHE_NO_FLUSH, "on");
166
}
167
168
diff --git a/blockdev.c b/blockdev.c
169
index XXXXXXX..XXXXXXX 100644
170
--- a/blockdev.c
171
+++ b/blockdev.c
172
@@ -XXX,XX +XXX,XX @@ void qmp_blockdev_change_medium(bool has_device, const char *device,
173
174
bdrv_flags = blk_get_open_flags_from_root_state(blk);
175
bdrv_flags &= ~(BDRV_O_TEMPORARY | BDRV_O_SNAPSHOT | BDRV_O_NO_BACKING |
176
- BDRV_O_PROTOCOL);
177
+ BDRV_O_PROTOCOL | BDRV_O_AUTO_RDONLY);
178
179
if (!has_read_only) {
180
read_only = BLOCKDEV_CHANGE_READ_ONLY_MODE_RETAIN;
27
--
181
--
28
2.13.6
182
2.19.1
29
183
30
184
diff view generated by jsdifflib
New patch
1
Commit e2b8247a322 introduced an error path in qemu_rbd_open() after
2
calling rbd_open(), but neglected to close the image again in this error
3
path. The error path should contain everything that the regular close
4
function qemu_rbd_close() contains.
1
5
6
This adds the missing rbd_close() call.
7
8
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
9
Reviewed-by: Eric Blake <eblake@redhat.com>
10
---
11
block/rbd.c | 1 +
12
1 file changed, 1 insertion(+)
13
14
diff --git a/block/rbd.c b/block/rbd.c
15
index XXXXXXX..XXXXXXX 100644
16
--- a/block/rbd.c
17
+++ b/block/rbd.c
18
@@ -XXX,XX +XXX,XX @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags,
19
"automatically marking the image read-only.");
20
r = bdrv_set_read_only(bs, true, &local_err);
21
if (r < 0) {
22
+ rbd_close(s->image);
23
error_propagate(errp, local_err);
24
goto failed_open;
25
}
26
--
27
2.19.1
28
29
diff view generated by jsdifflib
1
This reinstates commit a7aff6dd10b16b67e8b142d0c94c5d92c3fe88f6,
1
Some block drivers have traditionally changed their node to read-only
2
which was temporarily reverted for the 3.0 release so that libvirt gets
2
mode without asking the user. This behaviour has been marked deprecated
3
some extra time to update their command lines.
3
since 2.11, expecting users to provide an explicit read-only=on option.
4
4
5
The -drive options cyls, heads, secs and trans were deprecated in
5
Now that we have auto-read-only=on, enable these drivers to make use of
6
QEMU 2.10. It's time to remove them.
6
the option.
7
7
8
hd-geo-test tested both the old version with geometry options in -drive
8
This is the only use of bdrv_set_read_only(), so we can make it a bit
9
and the new one with -device. Therefore the code using -drive doesn't
9
more specific and turn it into a bdrv_apply_auto_read_only() that is
10
have to be replaced there, we just need to remove the -drive test cases.
10
more convenient for drivers to use.
11
This in turn allows some simplification of the code.
12
11
13
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
12
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
14
Reviewed-by: Markus Armbruster <armbru@redhat.com>
13
Reviewed-by: Eric Blake <eblake@redhat.com>
15
---
14
---
16
include/sysemu/blockdev.h | 1 -
15
include/block/block.h | 3 ++-
17
blockdev.c | 75 +----------------------------------------------
16
block.c | 42 +++++++++++++++++++++++++++---------------
18
hw/block/block.c | 14 ---------
17
block/bochs.c | 17 ++++++-----------
19
tests/hd-geo-test.c | 37 +++++------------------
18
block/cloop.c | 16 +++++-----------
20
hmp-commands.hx | 1 -
19
block/dmg.c | 16 +++++-----------
21
qemu-deprecated.texi | 5 ----
20
block/rbd.c | 15 ++++-----------
22
qemu-options.hx | 7 +----
21
block/vvfat.c | 10 ++--------
23
7 files changed, 9 insertions(+), 131 deletions(-)
22
7 files changed, 51 insertions(+), 68 deletions(-)
24
23
25
diff --git a/include/sysemu/blockdev.h b/include/sysemu/blockdev.h
24
diff --git a/include/block/block.h b/include/block/block.h
26
index XXXXXXX..XXXXXXX 100644
25
index XXXXXXX..XXXXXXX 100644
27
--- a/include/sysemu/blockdev.h
26
--- a/include/block/block.h
28
+++ b/include/sysemu/blockdev.h
27
+++ b/include/block/block.h
29
@@ -XXX,XX +XXX,XX @@ struct DriveInfo {
28
@@ -XXX,XX +XXX,XX @@ int bdrv_is_allocated_above(BlockDriverState *top, BlockDriverState *base,
30
int auto_del; /* see blockdev_mark_auto_del() */
29
bool bdrv_is_read_only(BlockDriverState *bs);
31
bool is_default; /* Added by default_drive() ? */
30
int bdrv_can_set_read_only(BlockDriverState *bs, bool read_only,
32
int media_cd;
31
bool ignore_allow_rdw, Error **errp);
33
- int cyls, heads, secs, trans;
32
-int bdrv_set_read_only(BlockDriverState *bs, bool read_only, Error **errp);
34
QemuOpts *opts;
33
+int bdrv_apply_auto_read_only(BlockDriverState *bs, const char *errmsg,
35
char *serial;
34
+ Error **errp);
36
QTAILQ_ENTRY(DriveInfo) next;
35
bool bdrv_is_writable(BlockDriverState *bs);
37
diff --git a/blockdev.c b/blockdev.c
36
bool bdrv_is_sg(BlockDriverState *bs);
38
index XXXXXXX..XXXXXXX 100644
37
bool bdrv_is_inserted(BlockDriverState *bs);
39
--- a/blockdev.c
38
diff --git a/block.c b/block.c
40
+++ b/blockdev.c
39
index XXXXXXX..XXXXXXX 100644
41
@@ -XXX,XX +XXX,XX @@ QemuOptsList qemu_legacy_drive_opts = {
40
--- a/block.c
42
.type = QEMU_OPT_STRING,
41
+++ b/block.c
43
.help = "interface (ide, scsi, sd, mtd, floppy, pflash, virtio)",
42
@@ -XXX,XX +XXX,XX @@ int bdrv_can_set_read_only(BlockDriverState *bs, bool read_only,
44
},{
43
return 0;
45
- .name = "cyls",
44
}
46
- .type = QEMU_OPT_NUMBER,
45
47
- .help = "number of cylinders (ide disk geometry)",
46
-/* TODO Remove (deprecated since 2.11)
48
- },{
47
- * Block drivers are not supposed to automatically change bs->read_only.
49
- .name = "heads",
48
- * Instead, they should just check whether they can provide what the user
50
- .type = QEMU_OPT_NUMBER,
49
- * explicitly requested and error out if read-write is requested, but they can
51
- .help = "number of heads (ide disk geometry)",
50
- * only provide read-only access. */
52
- },{
51
-int bdrv_set_read_only(BlockDriverState *bs, bool read_only, Error **errp)
53
- .name = "secs",
52
+/*
54
- .type = QEMU_OPT_NUMBER,
53
+ * Called by a driver that can only provide a read-only image.
55
- .help = "number of sectors (ide disk geometry)",
54
+ *
56
- },{
55
+ * Returns 0 if the node is already read-only or it could switch the node to
57
- .name = "trans",
56
+ * read-only because BDRV_O_AUTO_RDONLY is set.
58
- .type = QEMU_OPT_STRING,
57
+ *
59
- .help = "chs translation (auto, lba, none)",
58
+ * Returns -EACCES if the node is read-write and BDRV_O_AUTO_RDONLY is not set
60
- },{
59
+ * or bdrv_can_set_read_only() forbids making the node read-only. If @errmsg
61
.name = "addr",
60
+ * is not NULL, it is used as the error message for the Error object.
62
.type = QEMU_OPT_STRING,
61
+ */
63
.help = "pci address (virtio only)",
62
+int bdrv_apply_auto_read_only(BlockDriverState *bs, const char *errmsg,
64
@@ -XXX,XX +XXX,XX @@ DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfaceType block_default_type)
63
+ Error **errp)
65
QemuOpts *legacy_opts;
64
{
66
DriveMediaType media = MEDIA_DISK;
65
int ret = 0;
67
BlockInterfaceType type;
66
68
- int cyls, heads, secs, translation;
67
- ret = bdrv_can_set_read_only(bs, read_only, false, errp);
69
int max_devs, bus_id, unit_id, index;
68
- if (ret < 0) {
70
const char *devaddr;
69
- return ret;
71
const char *werror, *rerror;
70
+ if (!(bs->open_flags & BDRV_O_RDWR)) {
72
@@ -XXX,XX +XXX,XX @@ DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfaceType block_default_type)
71
+ return 0;
73
Error *local_err = NULL;
72
+ }
74
int i;
73
+ if (!(bs->open_flags & BDRV_O_AUTO_RDONLY)) {
75
const char *deprecated[] = {
74
+ goto fail;
76
- "serial", "trans", "secs", "heads", "cyls", "addr"
75
}
77
+ "serial", "addr"
76
78
};
77
- bs->read_only = read_only;
79
78
-
80
/* Change legacy command line options into QMP ones */
79
- if (read_only) {
81
@@ -XXX,XX +XXX,XX @@ DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfaceType block_default_type)
80
- bs->open_flags &= ~BDRV_O_RDWR;
82
type = block_default_type;
81
- } else {
83
}
82
- bs->open_flags |= BDRV_O_RDWR;
84
83
+ ret = bdrv_can_set_read_only(bs, true, false, NULL);
85
- /* Geometry */
84
+ if (ret < 0) {
86
- cyls = qemu_opt_get_number(legacy_opts, "cyls", 0);
85
+ goto fail;
87
- heads = qemu_opt_get_number(legacy_opts, "heads", 0);
86
}
88
- secs = qemu_opt_get_number(legacy_opts, "secs", 0);
87
89
-
88
+ bs->read_only = true;
90
- if (cyls || heads || secs) {
89
+ bs->open_flags &= ~BDRV_O_RDWR;
91
- if (cyls < 1) {
90
+
92
- error_report("invalid physical cyls number");
91
return 0;
93
- goto fail;
92
+
94
- }
93
+fail:
95
- if (heads < 1) {
94
+ error_setg(errp, "%s", errmsg ?: "Image is read-only");
96
- error_report("invalid physical heads number");
95
+ return -EACCES;
97
- goto fail;
96
}
98
- }
97
99
- if (secs < 1) {
98
void bdrv_get_full_backing_filename_from_filename(const char *backed,
100
- error_report("invalid physical secs number");
99
diff --git a/block/bochs.c b/block/bochs.c
101
- goto fail;
100
index XXXXXXX..XXXXXXX 100644
101
--- a/block/bochs.c
102
+++ b/block/bochs.c
103
@@ -XXX,XX +XXX,XX @@ static int bochs_open(BlockDriverState *bs, QDict *options, int flags,
104
struct bochs_header bochs;
105
int ret;
106
107
+ /* No write support yet */
108
+ ret = bdrv_apply_auto_read_only(bs, NULL, errp);
109
+ if (ret < 0) {
110
+ return ret;
111
+ }
112
+
113
bs->file = bdrv_open_child(NULL, options, "file", bs, &child_file,
114
false, errp);
115
if (!bs->file) {
116
return -EINVAL;
117
}
118
119
- if (!bdrv_is_read_only(bs)) {
120
- error_report("Opening bochs images without an explicit read-only=on "
121
- "option is deprecated. Future versions will refuse to "
122
- "open the image instead of automatically marking the "
123
- "image read-only.");
124
- ret = bdrv_set_read_only(bs, true, errp); /* no write support yet */
125
- if (ret < 0) {
126
- return ret;
102
- }
127
- }
103
- }
128
- }
104
-
129
-
105
- translation = BIOS_ATA_TRANSLATION_AUTO;
130
ret = bdrv_pread(bs->file, 0, &bochs, sizeof(bochs));
106
- value = qemu_opt_get(legacy_opts, "trans");
131
if (ret < 0) {
107
- if (value != NULL) {
132
return ret;
108
- if (!cyls) {
133
diff --git a/block/cloop.c b/block/cloop.c
109
- error_report("'%s' trans must be used with cyls, heads and secs",
134
index XXXXXXX..XXXXXXX 100644
110
- value);
135
--- a/block/cloop.c
111
- goto fail;
136
+++ b/block/cloop.c
112
- }
137
@@ -XXX,XX +XXX,XX @@ static int cloop_open(BlockDriverState *bs, QDict *options, int flags,
113
- if (!strcmp(value, "none")) {
138
uint32_t offsets_size, max_compressed_block_size = 1, i;
114
- translation = BIOS_ATA_TRANSLATION_NONE;
139
int ret;
115
- } else if (!strcmp(value, "lba")) {
140
116
- translation = BIOS_ATA_TRANSLATION_LBA;
141
+ ret = bdrv_apply_auto_read_only(bs, NULL, errp);
117
- } else if (!strcmp(value, "large")) {
142
+ if (ret < 0) {
118
- translation = BIOS_ATA_TRANSLATION_LARGE;
143
+ return ret;
119
- } else if (!strcmp(value, "rechs")) {
144
+ }
120
- translation = BIOS_ATA_TRANSLATION_RECHS;
145
+
121
- } else if (!strcmp(value, "auto")) {
146
bs->file = bdrv_open_child(NULL, options, "file", bs, &child_file,
122
- translation = BIOS_ATA_TRANSLATION_AUTO;
147
false, errp);
123
- } else {
148
if (!bs->file) {
124
- error_report("'%s' invalid translation type", value);
149
return -EINVAL;
125
- goto fail;
150
}
151
152
- if (!bdrv_is_read_only(bs)) {
153
- error_report("Opening cloop images without an explicit read-only=on "
154
- "option is deprecated. Future versions will refuse to "
155
- "open the image instead of automatically marking the "
156
- "image read-only.");
157
- ret = bdrv_set_read_only(bs, true, errp);
158
- if (ret < 0) {
159
- return ret;
126
- }
160
- }
127
- }
161
- }
128
-
162
-
129
- if (media == MEDIA_CDROM) {
163
/* read header */
130
- if (cyls || secs || heads) {
164
ret = bdrv_pread(bs->file, 128, &s->block_size, 4);
131
- error_report("CHS can't be set with media=cdrom");
165
if (ret < 0) {
132
- goto fail;
166
diff --git a/block/dmg.c b/block/dmg.c
167
index XXXXXXX..XXXXXXX 100644
168
--- a/block/dmg.c
169
+++ b/block/dmg.c
170
@@ -XXX,XX +XXX,XX @@ static int dmg_open(BlockDriverState *bs, QDict *options, int flags,
171
int64_t offset;
172
int ret;
173
174
+ ret = bdrv_apply_auto_read_only(bs, NULL, errp);
175
+ if (ret < 0) {
176
+ return ret;
177
+ }
178
+
179
bs->file = bdrv_open_child(NULL, options, "file", bs, &child_file,
180
false, errp);
181
if (!bs->file) {
182
return -EINVAL;
183
}
184
185
- if (!bdrv_is_read_only(bs)) {
186
- error_report("Opening dmg images without an explicit read-only=on "
187
- "option is deprecated. Future versions will refuse to "
188
- "open the image instead of automatically marking the "
189
- "image read-only.");
190
- ret = bdrv_set_read_only(bs, true, errp);
191
- if (ret < 0) {
192
- return ret;
133
- }
193
- }
134
- }
194
- }
135
-
195
-
136
/* Device address specified by bus/unit or index.
196
block_module_load_one("dmg-bz2");
137
* If none was specified, try to find the first free one. */
197
138
bus_id = qemu_opt_get_number(legacy_opts, "bus", 0);
198
s->n_chunks = 0;
139
@@ -XXX,XX +XXX,XX @@ DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfaceType block_default_type)
199
diff --git a/block/rbd.c b/block/rbd.c
140
dinfo = g_malloc0(sizeof(*dinfo));
200
index XXXXXXX..XXXXXXX 100644
141
dinfo->opts = all_opts;
201
--- a/block/rbd.c
142
202
+++ b/block/rbd.c
143
- dinfo->cyls = cyls;
203
@@ -XXX,XX +XXX,XX @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags,
144
- dinfo->heads = heads;
204
/* If we are using an rbd snapshot, we must be r/o, otherwise
145
- dinfo->secs = secs;
205
* leave as-is */
146
- dinfo->trans = translation;
206
if (s->snap != NULL) {
147
-
207
- if (!bdrv_is_read_only(bs)) {
148
dinfo->type = type;
208
- error_report("Opening rbd snapshots without an explicit "
149
dinfo->bus = bus_id;
209
- "read-only=on option is deprecated. Future versions "
150
dinfo->unit = unit_id;
210
- "will refuse to open the image instead of "
151
diff --git a/hw/block/block.c b/hw/block/block.c
211
- "automatically marking the image read-only.");
152
index XXXXXXX..XXXXXXX 100644
212
- r = bdrv_set_read_only(bs, true, &local_err);
153
--- a/hw/block/block.c
213
- if (r < 0) {
154
+++ b/hw/block/block.c
214
- rbd_close(s->image);
155
@@ -XXX,XX +XXX,XX @@ bool blkconf_geometry(BlockConf *conf, int *ptrans,
215
- error_propagate(errp, local_err);
156
unsigned cyls_max, unsigned heads_max, unsigned secs_max,
216
- goto failed_open;
157
Error **errp)
158
{
159
- DriveInfo *dinfo;
160
-
161
- if (!conf->cyls && !conf->heads && !conf->secs) {
162
- /* try to fall back to value set with legacy -drive cyls=... */
163
- dinfo = blk_legacy_dinfo(conf->blk);
164
- if (dinfo) {
165
- conf->cyls = dinfo->cyls;
166
- conf->heads = dinfo->heads;
167
- conf->secs = dinfo->secs;
168
- if (ptrans) {
169
- *ptrans = dinfo->trans;
170
- }
217
- }
171
- }
218
+ r = bdrv_apply_auto_read_only(bs, "rbd snapshots are read-only", errp);
172
- }
219
+ if (r < 0) {
173
if (!conf->cyls && !conf->heads && !conf->secs) {
220
+ rbd_close(s->image);
174
hd_geometry_guess(conf->blk,
221
+ goto failed_open;
175
&conf->cyls, &conf->heads, &conf->secs,
222
}
176
diff --git a/tests/hd-geo-test.c b/tests/hd-geo-test.c
223
}
177
index XXXXXXX..XXXXXXX 100644
224
178
--- a/tests/hd-geo-test.c
225
diff --git a/block/vvfat.c b/block/vvfat.c
179
+++ b/tests/hd-geo-test.c
226
index XXXXXXX..XXXXXXX 100644
180
@@ -XXX,XX +XXX,XX @@ static void setup_mbr(int img_idx, MBRcontents mbr)
227
--- a/block/vvfat.c
181
228
+++ b/block/vvfat.c
182
static int setup_ide(int argc, char *argv[], int argv_sz,
229
@@ -XXX,XX +XXX,XX @@ static int vvfat_open(BlockDriverState *bs, QDict *options, int flags,
183
int ide_idx, const char *dev, int img_idx,
230
"Unable to set VVFAT to 'rw' when drive is read-only");
184
- MBRcontents mbr, const char *opts)
231
goto fail;
185
+ MBRcontents mbr)
232
}
186
{
233
- } else if (!bdrv_is_read_only(bs)) {
187
char *s1, *s2, *s3;
234
- error_report("Opening non-rw vvfat images without an explicit "
188
235
- "read-only=on option is deprecated. Future versions "
189
@@ -XXX,XX +XXX,XX @@ static int setup_ide(int argc, char *argv[], int argv_sz,
236
- "will refuse to open the image instead of "
190
s3 = g_strdup(",media=cdrom");
237
- "automatically marking the image read-only.");
191
}
238
- /* read only is the default for safety */
192
argc = append_arg(argc, argv, argv_sz,
239
- ret = bdrv_set_read_only(bs, true, &local_err);
193
- g_strdup_printf("%s%s%s%s", s1, s2, s3, opts));
240
+ } else {
194
+ g_strdup_printf("%s%s%s", s1, s2, s3));
241
+ ret = bdrv_apply_auto_read_only(bs, NULL, errp);
195
g_free(s1);
242
if (ret < 0) {
196
g_free(s2);
243
- error_propagate(errp, local_err);
197
g_free(s3);
244
goto fail;
198
@@ -XXX,XX +XXX,XX @@ static void test_ide_mbr(bool use_device, MBRcontents mbr)
245
}
199
for (i = 0; i < backend_last; i++) {
246
}
200
cur_ide[i] = &hd_chst[i][mbr];
201
dev = use_device ? (is_hd(cur_ide[i]) ? "ide-hd" : "ide-cd") : NULL;
202
- argc = setup_ide(argc, argv, ARGV_SIZE, i, dev, i, mbr, "");
203
+ argc = setup_ide(argc, argv, ARGV_SIZE, i, dev, i, mbr);
204
}
205
args = g_strjoinv(" ", argv);
206
qtest_start(args);
207
@@ -XXX,XX +XXX,XX @@ static void test_ide_drive_user(const char *dev, bool trans)
208
const CHST expected_chst = { secs / (4 * 32) , 4, 32, trans };
209
210
argc = setup_common(argv, ARGV_SIZE);
211
- opts = g_strdup_printf("%s,%s%scyls=%d,heads=%d,secs=%d",
212
- dev ?: "",
213
- trans && dev ? "bios-chs-" : "",
214
- trans ? "trans=lba," : "",
215
+ opts = g_strdup_printf("%s,%scyls=%d,heads=%d,secs=%d",
216
+ dev, trans ? "bios-chs-trans=lba," : "",
217
expected_chst.cyls, expected_chst.heads,
218
expected_chst.secs);
219
cur_ide[0] = &expected_chst;
220
- argc = setup_ide(argc, argv, ARGV_SIZE,
221
- 0, dev ? opts : NULL, backend_small, mbr_chs,
222
- dev ? "" : opts);
223
+ argc = setup_ide(argc, argv, ARGV_SIZE, 0, opts, backend_small, mbr_chs);
224
g_free(opts);
225
args = g_strjoinv(" ", argv);
226
qtest_start(args);
227
@@ -XXX,XX +XXX,XX @@ static void test_ide_drive_user(const char *dev, bool trans)
228
}
229
230
/*
231
- * Test case: IDE device (if=ide) with explicit CHS
232
- */
233
-static void test_ide_drive_user_chs(void)
234
-{
235
- test_ide_drive_user(NULL, false);
236
-}
237
-
238
-/*
239
- * Test case: IDE device (if=ide) with explicit CHS and translation
240
- */
241
-static void test_ide_drive_user_chst(void)
242
-{
243
- test_ide_drive_user(NULL, true);
244
-}
245
-
246
-/*
247
* Test case: IDE device (if=none) with explicit CHS
248
*/
249
static void test_ide_device_user_chs(void)
250
@@ -XXX,XX +XXX,XX @@ static void test_ide_drive_cd_0(void)
251
for (i = 0; i <= backend_empty; i++) {
252
ide_idx = backend_empty - i;
253
cur_ide[ide_idx] = &hd_chst[i][mbr_blank];
254
- argc = setup_ide(argc, argv, ARGV_SIZE,
255
- ide_idx, NULL, i, mbr_blank, "");
256
+ argc = setup_ide(argc, argv, ARGV_SIZE, ide_idx, NULL, i, mbr_blank);
257
}
258
args = g_strjoinv(" ", argv);
259
qtest_start(args);
260
@@ -XXX,XX +XXX,XX @@ int main(int argc, char **argv)
261
qtest_add_func("hd-geo/ide/drive/mbr/blank", test_ide_drive_mbr_blank);
262
qtest_add_func("hd-geo/ide/drive/mbr/lba", test_ide_drive_mbr_lba);
263
qtest_add_func("hd-geo/ide/drive/mbr/chs", test_ide_drive_mbr_chs);
264
- qtest_add_func("hd-geo/ide/drive/user/chs", test_ide_drive_user_chs);
265
- qtest_add_func("hd-geo/ide/drive/user/chst", test_ide_drive_user_chst);
266
qtest_add_func("hd-geo/ide/drive/cd_0", test_ide_drive_cd_0);
267
qtest_add_func("hd-geo/ide/device/mbr/blank", test_ide_device_mbr_blank);
268
qtest_add_func("hd-geo/ide/device/mbr/lba", test_ide_device_mbr_lba);
269
diff --git a/hmp-commands.hx b/hmp-commands.hx
270
index XXXXXXX..XXXXXXX 100644
271
--- a/hmp-commands.hx
272
+++ b/hmp-commands.hx
273
@@ -XXX,XX +XXX,XX @@ ETEXI
274
.params = "[-n] [[<domain>:]<bus>:]<slot>\n"
275
"[file=file][,if=type][,bus=n]\n"
276
"[,unit=m][,media=d][,index=i]\n"
277
- "[,cyls=c,heads=h,secs=s[,trans=t]]\n"
278
"[,snapshot=on|off][,cache=on|off]\n"
279
"[,readonly=on|off][,copy-on-read=on|off]",
280
.help = "add drive to PCI storage controller",
281
diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi
282
index XXXXXXX..XXXXXXX 100644
283
--- a/qemu-deprecated.texi
284
+++ b/qemu-deprecated.texi
285
@@ -XXX,XX +XXX,XX @@ with ``-device ...,netdev=x''), or ``-nic user,smb=/some/dir''
286
(for embedded NICs). The new syntax allows different settings to be
287
provided per NIC.
288
289
-@subsection -drive cyls=...,heads=...,secs=...,trans=... (since 2.10.0)
290
-
291
-The drive geometry arguments are replaced by the the geometry arguments
292
-that can be specified with the ``-device'' parameter.
293
-
294
@subsection -drive serial=... (since 2.10.0)
295
296
The drive serial argument is replaced by the the serial argument
297
diff --git a/qemu-options.hx b/qemu-options.hx
298
index XXXXXXX..XXXXXXX 100644
299
--- a/qemu-options.hx
300
+++ b/qemu-options.hx
301
@@ -XXX,XX +XXX,XX @@ ETEXI
302
303
DEF("drive", HAS_ARG, QEMU_OPTION_drive,
304
"-drive [file=file][,if=type][,bus=n][,unit=m][,media=d][,index=i]\n"
305
- " [,cyls=c,heads=h,secs=s[,trans=t]][,snapshot=on|off]\n"
306
" [,cache=writethrough|writeback|none|directsync|unsafe][,format=f]\n"
307
- " [,serial=s][,addr=A][,rerror=ignore|stop|report]\n"
308
+ " [,snapshot=on|off][,serial=s][,addr=A][,rerror=ignore|stop|report]\n"
309
" [,werror=ignore|stop|report|enospc][,id=name][,aio=threads|native]\n"
310
" [,readonly=on|off][,copy-on-read=on|off]\n"
311
" [,discard=ignore|unmap][,detect-zeroes=on|off|unmap]\n"
312
@@ -XXX,XX +XXX,XX @@ This option defines where is connected the drive by using an index in the list
313
of available connectors of a given interface type.
314
@item media=@var{media}
315
This option defines the type of the media: disk or cdrom.
316
-@item cyls=@var{c},heads=@var{h},secs=@var{s}[,trans=@var{t}]
317
-Force disk physical geometry and the optional BIOS translation (trans=none or
318
-lba). These parameters are deprecated, use the corresponding parameters
319
-of @code{-device} instead.
320
@item snapshot=@var{snapshot}
321
@var{snapshot} is "on" or "off" and controls snapshot mode for the given drive
322
(see @option{-snapshot}).
323
--
247
--
324
2.13.6
248
2.19.1
325
249
326
250
diff view generated by jsdifflib
New patch
1
If read-only=off, but auto-read-only=on is given, open a read-write NBD
2
connection if the server provides a read-write export, but instead of
3
erroring out for read-only exports, just degrade to read-only.
1
4
5
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
6
Reviewed-by: Eric Blake <eblake@redhat.com>
7
---
8
block/nbd-client.c | 10 +++++-----
9
1 file changed, 5 insertions(+), 5 deletions(-)
10
11
diff --git a/block/nbd-client.c b/block/nbd-client.c
12
index XXXXXXX..XXXXXXX 100644
13
--- a/block/nbd-client.c
14
+++ b/block/nbd-client.c
15
@@ -XXX,XX +XXX,XX @@ int nbd_client_init(BlockDriverState *bs,
16
logout("Failed to negotiate with the NBD server\n");
17
return ret;
18
}
19
- if (client->info.flags & NBD_FLAG_READ_ONLY &&
20
- !bdrv_is_read_only(bs)) {
21
- error_setg(errp,
22
- "request for write access conflicts with read-only export");
23
- return -EACCES;
24
+ if (client->info.flags & NBD_FLAG_READ_ONLY) {
25
+ ret = bdrv_apply_auto_read_only(bs, "NBD export is read-only", errp);
26
+ if (ret < 0) {
27
+ return ret;
28
+ }
29
}
30
if (client->info.flags & NBD_FLAG_SEND_FUA) {
31
bs->supported_write_flags = BDRV_REQ_FUA;
32
--
33
2.19.1
34
35
diff view generated by jsdifflib
New patch
1
If read-only=off, but auto-read-only=on is given, open the file
2
read-write if we have the permissions, but instead of erroring out for
3
read-only files, just degrade to read-only.
1
4
5
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
6
Reviewed-by: Eric Blake <eblake@redhat.com>
7
---
8
block/file-posix.c | 19 ++++++++++++++++---
9
1 file changed, 16 insertions(+), 3 deletions(-)
10
11
diff --git a/block/file-posix.c b/block/file-posix.c
12
index XXXXXXX..XXXXXXX 100644
13
--- a/block/file-posix.c
14
+++ b/block/file-posix.c
15
@@ -XXX,XX +XXX,XX @@ static int raw_open_common(BlockDriverState *bs, QDict *options,
16
17
s->fd = -1;
18
fd = qemu_open(filename, s->open_flags, 0644);
19
- if (fd < 0) {
20
- ret = -errno;
21
- error_setg_errno(errp, errno, "Could not open '%s'", filename);
22
+ ret = fd < 0 ? -errno : 0;
23
+
24
+ if (ret == -EACCES || ret == -EROFS) {
25
+ /* Try to degrade to read-only, but if it doesn't work, still use the
26
+ * normal error message. */
27
+ if (bdrv_apply_auto_read_only(bs, NULL, NULL) == 0) {
28
+ bdrv_flags &= ~BDRV_O_RDWR;
29
+ raw_parse_flags(bdrv_flags, &s->open_flags);
30
+ assert(!(s->open_flags & O_CREAT));
31
+ fd = qemu_open(filename, s->open_flags);
32
+ ret = fd < 0 ? -errno : 0;
33
+ }
34
+ }
35
+
36
+ if (ret < 0) {
37
+ error_setg_errno(errp, -ret, "Could not open '%s'", filename);
38
if (ret == -EROFS) {
39
ret = -EACCES;
40
}
41
--
42
2.19.1
43
44
diff view generated by jsdifflib
1
This reinstates commit eae3bd1eb7c6b105d30ec06008b3bc3dfc5f45bb,
1
If read-only=off, but auto-read-only=on is given, just degrade to
2
which was temporarily reverted for the 3.0 release so that libvirt gets
2
read-only.
3
some extra time to update their command lines.
4
5
The -drive option addr was deprecated in QEMU 2.10. It's time to remove
6
it.
7
3
8
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
4
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
9
Reviewed-by: Markus Armbruster <armbru@redhat.com>
5
Reviewed-by: Eric Blake <eblake@redhat.com>
10
Reviewed-by: Jeff Cody <jcody@redhat.com>
11
---
6
---
12
include/sysemu/blockdev.h | 1 -
7
block/curl.c | 8 ++++----
13
blockdev.c | 17 +----------------
8
1 file changed, 4 insertions(+), 4 deletions(-)
14
device-hotplug.c | 4 ----
15
qemu-deprecated.texi | 5 -----
16
qemu-options.hx | 5 +----
17
5 files changed, 2 insertions(+), 30 deletions(-)
18
9
19
diff --git a/include/sysemu/blockdev.h b/include/sysemu/blockdev.h
10
diff --git a/block/curl.c b/block/curl.c
20
index XXXXXXX..XXXXXXX 100644
11
index XXXXXXX..XXXXXXX 100644
21
--- a/include/sysemu/blockdev.h
12
--- a/block/curl.c
22
+++ b/include/sysemu/blockdev.h
13
+++ b/block/curl.c
23
@@ -XXX,XX +XXX,XX @@ typedef enum {
14
@@ -XXX,XX +XXX,XX @@ static int curl_open(BlockDriverState *bs, QDict *options, int flags,
24
} BlockInterfaceType;
15
const char *protocol_delimiter;
25
16
int ret;
26
struct DriveInfo {
17
27
- const char *devaddr;
18
-
28
BlockInterfaceType type;
19
- if (flags & BDRV_O_RDWR) {
29
int bus;
20
- error_setg(errp, "curl block device does not support writes");
30
int unit;
21
- return -EROFS;
31
diff --git a/blockdev.c b/blockdev.c
22
+ ret = bdrv_apply_auto_read_only(bs, "curl driver does not support writes",
32
index XXXXXXX..XXXXXXX 100644
23
+ errp);
33
--- a/blockdev.c
24
+ if (ret < 0) {
34
+++ b/blockdev.c
25
+ return ret;
35
@@ -XXX,XX +XXX,XX @@ QemuOptsList qemu_legacy_drive_opts = {
36
.type = QEMU_OPT_STRING,
37
.help = "interface (ide, scsi, sd, mtd, floppy, pflash, virtio)",
38
},{
39
- .name = "addr",
40
- .type = QEMU_OPT_STRING,
41
- .help = "pci address (virtio only)",
42
- },{
43
.name = "serial",
44
.type = QEMU_OPT_STRING,
45
.help = "disk serial number",
46
@@ -XXX,XX +XXX,XX @@ DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfaceType block_default_type)
47
DriveMediaType media = MEDIA_DISK;
48
BlockInterfaceType type;
49
int max_devs, bus_id, unit_id, index;
50
- const char *devaddr;
51
const char *werror, *rerror;
52
bool read_only = false;
53
bool copy_on_read;
54
@@ -XXX,XX +XXX,XX @@ DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfaceType block_default_type)
55
Error *local_err = NULL;
56
int i;
57
const char *deprecated[] = {
58
- "serial", "addr"
59
+ "serial"
60
};
61
62
/* Change legacy command line options into QMP ones */
63
@@ -XXX,XX +XXX,XX @@ DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfaceType block_default_type)
64
}
26
}
65
27
66
/* Add virtio block device */
28
if (!libcurl_initialized) {
67
- devaddr = qemu_opt_get(legacy_opts, "addr");
68
- if (devaddr && type != IF_VIRTIO) {
69
- error_report("addr is not supported by this bus type");
70
- goto fail;
71
- }
72
-
73
if (type == IF_VIRTIO) {
74
QemuOpts *devopts;
75
devopts = qemu_opts_create(qemu_find_opts("device"), NULL, 0,
76
@@ -XXX,XX +XXX,XX @@ DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfaceType block_default_type)
77
}
78
qemu_opt_set(devopts, "drive", qdict_get_str(bs_opts, "id"),
79
&error_abort);
80
- if (devaddr) {
81
- qemu_opt_set(devopts, "addr", devaddr, &error_abort);
82
- }
83
}
84
85
filename = qemu_opt_get(legacy_opts, "file");
86
@@ -XXX,XX +XXX,XX @@ DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfaceType block_default_type)
87
dinfo->type = type;
88
dinfo->bus = bus_id;
89
dinfo->unit = unit_id;
90
- dinfo->devaddr = devaddr;
91
dinfo->serial = g_strdup(serial);
92
93
blk_set_legacy_dinfo(blk, dinfo);
94
diff --git a/device-hotplug.c b/device-hotplug.c
95
index XXXXXXX..XXXXXXX 100644
96
--- a/device-hotplug.c
97
+++ b/device-hotplug.c
98
@@ -XXX,XX +XXX,XX @@ void hmp_drive_add(Monitor *mon, const QDict *qdict)
99
if (!dinfo) {
100
goto err;
101
}
102
- if (dinfo->devaddr) {
103
- monitor_printf(mon, "Parameter addr not supported\n");
104
- goto err;
105
- }
106
107
switch (dinfo->type) {
108
case IF_NONE:
109
diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi
110
index XXXXXXX..XXXXXXX 100644
111
--- a/qemu-deprecated.texi
112
+++ b/qemu-deprecated.texi
113
@@ -XXX,XX +XXX,XX @@ provided per NIC.
114
The drive serial argument is replaced by the the serial argument
115
that can be specified with the ``-device'' parameter.
116
117
-@subsection -drive addr=... (since 2.10.0)
118
-
119
-The drive addr argument is replaced by the the addr argument
120
-that can be specified with the ``-device'' parameter.
121
-
122
@subsection -usbdevice (since 2.10.0)
123
124
The ``-usbdevice DEV'' argument is now a synonym for setting
125
diff --git a/qemu-options.hx b/qemu-options.hx
126
index XXXXXXX..XXXXXXX 100644
127
--- a/qemu-options.hx
128
+++ b/qemu-options.hx
129
@@ -XXX,XX +XXX,XX @@ ETEXI
130
DEF("drive", HAS_ARG, QEMU_OPTION_drive,
131
"-drive [file=file][,if=type][,bus=n][,unit=m][,media=d][,index=i]\n"
132
" [,cache=writethrough|writeback|none|directsync|unsafe][,format=f]\n"
133
- " [,snapshot=on|off][,serial=s][,addr=A][,rerror=ignore|stop|report]\n"
134
+ " [,snapshot=on|off][,serial=s][,rerror=ignore|stop|report]\n"
135
" [,werror=ignore|stop|report|enospc][,id=name][,aio=threads|native]\n"
136
" [,readonly=on|off][,copy-on-read=on|off]\n"
137
" [,discard=ignore|unmap][,detect-zeroes=on|off|unmap]\n"
138
@@ -XXX,XX +XXX,XX @@ an untrusted format header.
139
This option specifies the serial number to assign to the device. This
140
parameter is deprecated, use the corresponding parameter of @code{-device}
141
instead.
142
-@item addr=@var{addr}
143
-Specify the controller's PCI address (if=virtio only). This parameter is
144
-deprecated, use the corresponding parameter of @code{-device} instead.
145
@item werror=@var{action},rerror=@var{action}
146
Specify which @var{action} to take on write and read errors. Valid actions are:
147
"ignore" (ignore the error and try to continue), "stop" (pause QEMU),
148
--
29
--
149
2.13.6
30
2.19.1
150
31
151
32
diff view generated by jsdifflib
New patch
1
If read-only=off, but auto-read-only=on is given, open the file
2
read-write if we have the permissions, but instead of erroring out for
3
read-only files, just degrade to read-only.
1
4
5
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
6
Reviewed-by: Niels de Vos <ndevos@redhat.com>
7
---
8
block/gluster.c | 12 ++++++++++--
9
1 file changed, 10 insertions(+), 2 deletions(-)
10
11
diff --git a/block/gluster.c b/block/gluster.c
12
index XXXXXXX..XXXXXXX 100644
13
--- a/block/gluster.c
14
+++ b/block/gluster.c
15
@@ -XXX,XX +XXX,XX @@ static int qemu_gluster_open(BlockDriverState *bs, QDict *options,
16
qemu_gluster_parse_flags(bdrv_flags, &open_flags);
17
18
s->fd = glfs_open(s->glfs, gconf->path, open_flags);
19
- if (!s->fd) {
20
- ret = -errno;
21
+ ret = s->fd ? 0 : -errno;
22
+
23
+ if (ret == -EACCES || ret == -EROFS) {
24
+ /* Try to degrade to read-only, but if it doesn't work, still use the
25
+ * normal error message. */
26
+ if (bdrv_apply_auto_read_only(bs, NULL, NULL) == 0) {
27
+ open_flags = (open_flags & ~O_RDWR) | O_RDONLY;
28
+ s->fd = glfs_open(s->glfs, gconf->path, open_flags);
29
+ ret = s->fd ? 0 : -errno;
30
+ }
31
}
32
33
s->supports_seek_data = qemu_gluster_test_seek(s->fd);
34
--
35
2.19.1
36
37
diff view generated by jsdifflib
1
blockdev-mirror with the same node for source and target segfaults
1
If read-only=off, but auto-read-only=on is given, open the volume
2
today: A node is in its own backing chain, so mirror_start_job() decides
2
read-write if we have the permissions, but instead of erroring out for
3
that this is an active commit. When adding the intermediate nodes with
3
read-only volumes, just degrade to read-only.
4
block_job_add_bdrv(), it starts the iteration through the subchain with
5
the backing file of source, though, so it never reaches target and
6
instead runs into NULL at the base.
7
4
8
While we could fix that by starting with source itself, there is no
9
point in allowing mirroring a node into itself and I wouldn't be
10
surprised if this caused more problems later.
11
12
So just check for this scenario and error out.
13
14
Cc: qemu-stable@nongnu.org
15
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
5
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
16
Reviewed-by: Eric Blake <eblake@redhat.com>
6
Reviewed-by: Eric Blake <eblake@redhat.com>
17
---
7
---
18
block/mirror.c | 5 +++++
8
block/iscsi.c | 8 +++++---
19
tests/qemu-iotests/041 | 6 ++++++
9
1 file changed, 5 insertions(+), 3 deletions(-)
20
tests/qemu-iotests/041.out | 4 ++--
21
3 files changed, 13 insertions(+), 2 deletions(-)
22
10
23
diff --git a/block/mirror.c b/block/mirror.c
11
diff --git a/block/iscsi.c b/block/iscsi.c
24
index XXXXXXX..XXXXXXX 100644
12
index XXXXXXX..XXXXXXX 100644
25
--- a/block/mirror.c
13
--- a/block/iscsi.c
26
+++ b/block/mirror.c
14
+++ b/block/iscsi.c
27
@@ -XXX,XX +XXX,XX @@ static void mirror_start_job(const char *job_id, BlockDriverState *bs,
15
@@ -XXX,XX +XXX,XX @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags,
28
buf_size = DEFAULT_MIRROR_BUF_SIZE;
16
/* Check the write protect flag of the LUN if we want to write */
17
if (iscsilun->type == TYPE_DISK && (flags & BDRV_O_RDWR) &&
18
iscsilun->write_protected) {
19
- error_setg(errp, "Cannot open a write protected LUN as read-write");
20
- ret = -EACCES;
21
- goto out;
22
+ ret = bdrv_apply_auto_read_only(bs, "LUN is write protected", errp);
23
+ if (ret < 0) {
24
+ goto out;
25
+ }
26
+ flags &= ~BDRV_O_RDWR;
29
}
27
}
30
28
31
+ if (bs == target) {
29
iscsi_readcapacity_sync(iscsilun, &local_err);
32
+ error_setg(errp, "Can't mirror node into itself");
33
+ return;
34
+ }
35
+
36
/* In the case of active commit, add dummy driver to provide consistent
37
* reads on the top, while disabling it in the intermediate nodes, and make
38
* the backing chain writable. */
39
diff --git a/tests/qemu-iotests/041 b/tests/qemu-iotests/041
40
index XXXXXXX..XXXXXXX 100755
41
--- a/tests/qemu-iotests/041
42
+++ b/tests/qemu-iotests/041
43
@@ -XXX,XX +XXX,XX @@ class TestSingleBlockdev(TestSingleDrive):
44
result = self.vm.qmp("blockdev-add", **args)
45
self.assert_qmp(result, 'return', {})
46
47
+ def test_mirror_to_self(self):
48
+ result = self.vm.qmp(self.qmp_cmd, job_id='job0',
49
+ device=self.qmp_target, sync='full',
50
+ target=self.qmp_target)
51
+ self.assert_qmp(result, 'error/class', 'GenericError')
52
+
53
test_large_cluster = None
54
test_image_not_found = None
55
test_small_buffer2 = None
56
diff --git a/tests/qemu-iotests/041.out b/tests/qemu-iotests/041.out
57
index XXXXXXX..XXXXXXX 100644
58
--- a/tests/qemu-iotests/041.out
59
+++ b/tests/qemu-iotests/041.out
60
@@ -XXX,XX +XXX,XX @@
61
-.....................................................................................
62
+........................................................................................
63
----------------------------------------------------------------------
64
-Ran 85 tests
65
+Ran 88 tests
66
67
OK
68
--
30
--
69
2.13.6
31
2.19.1
70
32
71
33
diff view generated by jsdifflib
1
This reinstates commit 6266e900b8083945cb766b45c124fb3c42932cb3,
1
While we want machine interfaces like -blockdev and QMP blockdev-add to
2
which was temporarily reverted for the 3.0 release so that libvirt gets
2
add as little auto-detection as possible so that management tools are
3
some extra time to update their command lines.
3
explicit about their needs, -drive is a convenience option for human
4
4
users. Enabling auto-read-only=on by default there enables users to use
5
We removed all options from the 'deprecated' array, so the code is dead
5
read-only images for read-only guest devices without having to specify
6
and can be removed as well.
6
read-only=on explicitly. If they try to attach the image to a read-write
7
device, they will still get an error message.
7
8
8
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
9
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
9
Reviewed-by: Markus Armbruster <armbru@redhat.com>
10
Reviewed-by: Eric Blake <eblake@redhat.com>
10
---
11
---
11
blockdev.c | 12 ------------
12
blockdev.c | 1 +
12
1 file changed, 12 deletions(-)
13
1 file changed, 1 insertion(+)
13
14
14
diff --git a/blockdev.c b/blockdev.c
15
diff --git a/blockdev.c b/blockdev.c
15
index XXXXXXX..XXXXXXX 100644
16
index XXXXXXX..XXXXXXX 100644
16
--- a/blockdev.c
17
--- a/blockdev.c
17
+++ b/blockdev.c
18
+++ b/blockdev.c
18
@@ -XXX,XX +XXX,XX @@ DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfaceType block_default_type)
19
@@ -XXX,XX +XXX,XX @@ static BlockBackend *blockdev_init(const char *file, QDict *bs_opts,
19
const char *filename;
20
qdict_set_default_str(bs_opts, BDRV_OPT_CACHE_NO_FLUSH, "off");
20
Error *local_err = NULL;
21
qdict_set_default_str(bs_opts, BDRV_OPT_READ_ONLY,
21
int i;
22
read_only ? "on" : "off");
22
- const char *deprecated[] = {
23
+ qdict_set_default_str(bs_opts, BDRV_OPT_AUTO_READ_ONLY, "on");
23
- };
24
assert((bdrv_flags & BDRV_O_CACHE_MASK) == 0);
24
25
25
/* Change legacy command line options into QMP ones */
26
if (runstate_check(RUN_STATE_INMIGRATE)) {
26
static const struct {
27
@@ -XXX,XX +XXX,XX @@ DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfaceType block_default_type)
28
goto fail;
29
}
30
31
- /* Other deprecated options */
32
- if (!qtest_enabled()) {
33
- for (i = 0; i < ARRAY_SIZE(deprecated); i++) {
34
- if (qemu_opt_get(legacy_opts, deprecated[i]) != NULL) {
35
- error_report("'%s' is deprecated, please use the corresponding "
36
- "option of '-device' instead", deprecated[i]);
37
- }
38
- }
39
- }
40
-
41
/* Media type */
42
value = qemu_opt_get(legacy_opts, "media");
43
if (value) {
44
--
27
--
45
2.13.6
28
2.19.1
46
29
47
30
diff view generated by jsdifflib
New patch
1
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
2
Reviewed-by: Eric Blake <eblake@redhat.com>
3
---
4
tests/qemu-iotests/232 | 147 +++++++++++++++++++++++++++++++++++++
5
tests/qemu-iotests/232.out | 59 +++++++++++++++
6
tests/qemu-iotests/group | 1 +
7
3 files changed, 207 insertions(+)
8
create mode 100755 tests/qemu-iotests/232
9
create mode 100644 tests/qemu-iotests/232.out
1
10
11
diff --git a/tests/qemu-iotests/232 b/tests/qemu-iotests/232
12
new file mode 100755
13
index XXXXXXX..XXXXXXX
14
--- /dev/null
15
+++ b/tests/qemu-iotests/232
16
@@ -XXX,XX +XXX,XX @@
17
+#!/bin/bash
18
+#
19
+# Test for auto-read-only
20
+#
21
+# Copyright (C) 2018 Red Hat, Inc.
22
+#
23
+# This program is free software; you can redistribute it and/or modify
24
+# it under the terms of the GNU General Public License as published by
25
+# the Free Software Foundation; either version 2 of the License, or
26
+# (at your option) any later version.
27
+#
28
+# This program is distributed in the hope that it will be useful,
29
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
30
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
31
+# GNU General Public License for more details.
32
+#
33
+# You should have received a copy of the GNU General Public License
34
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
35
+#
36
+
37
+# creator
38
+owner=kwolf@redhat.com
39
+
40
+seq=`basename $0`
41
+echo "QA output created by $seq"
42
+
43
+here=`pwd`
44
+status=1    # failure is the default!
45
+
46
+_cleanup()
47
+{
48
+ _cleanup_test_img
49
+ rm -f $TEST_IMG.snap
50
+}
51
+trap "_cleanup; exit \$status" 0 1 2 3 15
52
+
53
+# get standard environment, filters and checks
54
+. ./common.rc
55
+. ./common.filter
56
+
57
+_supported_fmt generic
58
+_supported_proto file
59
+_supported_os Linux
60
+
61
+function do_run_qemu()
62
+{
63
+ echo Testing: "$@"
64
+ (
65
+ if ! test -t 0; then
66
+ while read cmd; do
67
+ echo $cmd
68
+ done
69
+ fi
70
+ echo quit
71
+ ) | $QEMU -nographic -monitor stdio -nodefaults "$@"
72
+ echo
73
+}
74
+
75
+function run_qemu()
76
+{
77
+ do_run_qemu "$@" 2>&1 | _filter_testdir | _filter_qemu | _filter_hmp |
78
+ _filter_generated_node_ids | _filter_imgfmt
79
+}
80
+
81
+function run_qemu_info_block()
82
+{
83
+ echo "info block -n" | run_qemu "$@" | grep -e "(file" -e "QEMU_PROG"
84
+}
85
+
86
+size=128M
87
+
88
+_make_test_img $size
89
+
90
+echo
91
+echo "=== -drive with read-write image: read-only/auto-read-only combinations ==="
92
+echo
93
+
94
+run_qemu_info_block -drive driver=file,file="$TEST_IMG",if=none,read-only=on,auto-read-only=off
95
+run_qemu_info_block -drive driver=file,file="$TEST_IMG",if=none,read-only=on,auto-read-only=on
96
+run_qemu_info_block -drive driver=file,file="$TEST_IMG",if=none,read-only=on
97
+echo
98
+run_qemu_info_block -drive driver=file,file="$TEST_IMG",if=none,read-only=off,auto-read-only=off
99
+run_qemu_info_block -drive driver=file,file="$TEST_IMG",if=none,read-only=off,auto-read-only=on
100
+run_qemu_info_block -drive driver=file,file="$TEST_IMG",if=none,read-only=off
101
+echo
102
+run_qemu_info_block -drive driver=file,file="$TEST_IMG",if=none,auto-read-only=off
103
+run_qemu_info_block -drive driver=file,file="$TEST_IMG",if=none,auto-read-only=on
104
+run_qemu_info_block -drive driver=file,file="$TEST_IMG",if=none
105
+
106
+echo
107
+echo "=== -drive with read-only image: read-only/auto-read-only combinations ==="
108
+echo
109
+
110
+chmod a-w $TEST_IMG
111
+
112
+run_qemu_info_block -drive driver=file,file="$TEST_IMG",if=none,read-only=on,auto-read-only=off
113
+run_qemu_info_block -drive driver=file,file="$TEST_IMG",if=none,read-only=on,auto-read-only=on
114
+run_qemu_info_block -drive driver=file,file="$TEST_IMG",if=none,read-only=on
115
+echo
116
+run_qemu_info_block -drive driver=file,file="$TEST_IMG",if=none,read-only=off,auto-read-only=off
117
+run_qemu_info_block -drive driver=file,file="$TEST_IMG",if=none,read-only=off,auto-read-only=on
118
+run_qemu_info_block -drive driver=file,file="$TEST_IMG",if=none,read-only=off
119
+echo
120
+run_qemu_info_block -drive driver=file,file="$TEST_IMG",if=none,auto-read-only=off
121
+run_qemu_info_block -drive driver=file,file="$TEST_IMG",if=none,auto-read-only=on
122
+run_qemu_info_block -drive driver=file,file="$TEST_IMG",if=none
123
+
124
+echo
125
+echo "=== -blockdev with read-write image: read-only/auto-read-only combinations ==="
126
+echo
127
+
128
+chmod a+w $TEST_IMG
129
+
130
+run_qemu_info_block -blockdev driver=file,filename="$TEST_IMG",node-name=node0,read-only=on,auto-read-only=off
131
+run_qemu_info_block -blockdev driver=file,filename="$TEST_IMG",node-name=node0,read-only=on,auto-read-only=on
132
+run_qemu_info_block -blockdev driver=file,filename="$TEST_IMG",node-name=node0,read-only=on
133
+echo
134
+run_qemu_info_block -blockdev driver=file,filename="$TEST_IMG",node-name=node0,read-only=off,auto-read-only=off
135
+run_qemu_info_block -blockdev driver=file,filename="$TEST_IMG",node-name=node0,read-only=off,auto-read-only=on
136
+run_qemu_info_block -blockdev driver=file,filename="$TEST_IMG",node-name=node0,read-only=off
137
+echo
138
+run_qemu_info_block -blockdev driver=file,filename="$TEST_IMG",node-name=node0,auto-read-only=off
139
+run_qemu_info_block -blockdev driver=file,filename="$TEST_IMG",node-name=node0,auto-read-only=on
140
+run_qemu_info_block -blockdev driver=file,filename="$TEST_IMG",node-name=node0
141
+
142
+echo
143
+echo "=== -blockdev with read-only image: read-only/auto-read-only combinations ==="
144
+echo
145
+
146
+chmod a-w $TEST_IMG
147
+
148
+run_qemu_info_block -blockdev driver=file,filename="$TEST_IMG",node-name=node0,read-only=on,auto-read-only=off
149
+run_qemu_info_block -blockdev driver=file,filename="$TEST_IMG",node-name=node0,read-only=on,auto-read-only=on
150
+run_qemu_info_block -blockdev driver=file,filename="$TEST_IMG",node-name=node0,read-only=on
151
+echo
152
+run_qemu_info_block -blockdev driver=file,filename="$TEST_IMG",node-name=node0,read-only=off,auto-read-only=off
153
+run_qemu_info_block -blockdev driver=file,filename="$TEST_IMG",node-name=node0,read-only=off,auto-read-only=on
154
+run_qemu_info_block -blockdev driver=file,filename="$TEST_IMG",node-name=node0,read-only=off
155
+echo
156
+run_qemu_info_block -blockdev driver=file,filename="$TEST_IMG",node-name=node0,auto-read-only=off
157
+run_qemu_info_block -blockdev driver=file,filename="$TEST_IMG",node-name=node0,auto-read-only=on
158
+run_qemu_info_block -blockdev driver=file,filename="$TEST_IMG",node-name=node0
159
+
160
+# success, all done
161
+echo "*** done"
162
+rm -f $seq.full
163
+status=0
164
diff --git a/tests/qemu-iotests/232.out b/tests/qemu-iotests/232.out
165
new file mode 100644
166
index XXXXXXX..XXXXXXX
167
--- /dev/null
168
+++ b/tests/qemu-iotests/232.out
169
@@ -XXX,XX +XXX,XX @@
170
+QA output created by 232
171
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
172
+
173
+=== -drive with read-write image: read-only/auto-read-only combinations ===
174
+
175
+NODE_NAME: TEST_DIR/t.IMGFMT (file, read-only)
176
+NODE_NAME: TEST_DIR/t.IMGFMT (file, read-only)
177
+NODE_NAME: TEST_DIR/t.IMGFMT (file, read-only)
178
+
179
+NODE_NAME: TEST_DIR/t.IMGFMT (file)
180
+NODE_NAME: TEST_DIR/t.IMGFMT (file)
181
+NODE_NAME: TEST_DIR/t.IMGFMT (file)
182
+
183
+NODE_NAME: TEST_DIR/t.IMGFMT (file)
184
+NODE_NAME: TEST_DIR/t.IMGFMT (file)
185
+NODE_NAME: TEST_DIR/t.IMGFMT (file)
186
+
187
+=== -drive with read-only image: read-only/auto-read-only combinations ===
188
+
189
+NODE_NAME: TEST_DIR/t.IMGFMT (file, read-only)
190
+NODE_NAME: TEST_DIR/t.IMGFMT (file, read-only)
191
+NODE_NAME: TEST_DIR/t.IMGFMT (file, read-only)
192
+
193
+QEMU_PROG: -drive driver=file,file=TEST_DIR/t.IMGFMT,if=none,read-only=off,auto-read-only=off: Could not open 'TEST_DIR/t.IMGFMT': Permission denied
194
+NODE_NAME: TEST_DIR/t.IMGFMT (file, read-only)
195
+NODE_NAME: TEST_DIR/t.IMGFMT (file, read-only)
196
+
197
+QEMU_PROG: -drive driver=file,file=TEST_DIR/t.IMGFMT,if=none,auto-read-only=off: Could not open 'TEST_DIR/t.IMGFMT': Permission denied
198
+NODE_NAME: TEST_DIR/t.IMGFMT (file, read-only)
199
+NODE_NAME: TEST_DIR/t.IMGFMT (file, read-only)
200
+
201
+=== -blockdev with read-write image: read-only/auto-read-only combinations ===
202
+
203
+node0: TEST_DIR/t.IMGFMT (file, read-only)
204
+node0: TEST_DIR/t.IMGFMT (file, read-only)
205
+node0: TEST_DIR/t.IMGFMT (file, read-only)
206
+
207
+node0: TEST_DIR/t.IMGFMT (file)
208
+node0: TEST_DIR/t.IMGFMT (file)
209
+node0: TEST_DIR/t.IMGFMT (file)
210
+
211
+node0: TEST_DIR/t.IMGFMT (file)
212
+node0: TEST_DIR/t.IMGFMT (file)
213
+node0: TEST_DIR/t.IMGFMT (file)
214
+
215
+=== -blockdev with read-only image: read-only/auto-read-only combinations ===
216
+
217
+node0: TEST_DIR/t.IMGFMT (file, read-only)
218
+node0: TEST_DIR/t.IMGFMT (file, read-only)
219
+node0: TEST_DIR/t.IMGFMT (file, read-only)
220
+
221
+QEMU_PROG: -blockdev driver=file,filename=TEST_DIR/t.IMGFMT,node-name=node0,read-only=off,auto-read-only=off: Could not open 'TEST_DIR/t.IMGFMT': Permission denied
222
+node0: TEST_DIR/t.IMGFMT (file, read-only)
223
+QEMU_PROG: -blockdev driver=file,filename=TEST_DIR/t.IMGFMT,node-name=node0,read-only=off: Could not open 'TEST_DIR/t.IMGFMT': Permission denied
224
+
225
+QEMU_PROG: -blockdev driver=file,filename=TEST_DIR/t.IMGFMT,node-name=node0,auto-read-only=off: Could not open 'TEST_DIR/t.IMGFMT': Permission denied
226
+node0: TEST_DIR/t.IMGFMT (file, read-only)
227
+QEMU_PROG: -blockdev driver=file,filename=TEST_DIR/t.IMGFMT,node-name=node0: Could not open 'TEST_DIR/t.IMGFMT': Permission denied
228
+*** done
229
diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
230
index XXXXXXX..XXXXXXX 100644
231
--- a/tests/qemu-iotests/group
232
+++ b/tests/qemu-iotests/group
233
@@ -XXX,XX +XXX,XX @@
234
227 auto quick
235
229 auto quick
236
231 auto quick
237
+232 auto quick
238
--
239
2.19.1
240
241
diff view generated by jsdifflib
1
From: Daniel P. Berrangé <berrange@redhat.com>
1
From: Max Reitz <mreitz@redhat.com>
2
2
3
When the convert command is creating an output file that needs
3
This adds some whitespace into the option help (including indentation)
4
secrets, we need to ensure those secrets are passed to both the
4
and puts angle brackets around the type names. Furthermore, the list
5
blk_new_open and bdrv_create API calls.
5
name is no longer printed as part of every line, but only once in
6
advance, and only if the caller did not print a caption already.
6
7
7
This is done by qemu-img extracting all opts matching the name
8
This patch also restores the description alignment we had before commit
8
suffix "key-secret". Unfortunately the code doing this was run after the
9
9cbef9d68ee1d8d0, just at 24 instead of 16 characters like we used to.
9
call to bdrv_create(), which meant the QemuOpts it was extracting
10
This increase is because now we have the type and two spaces of
10
secrets from was now empty.
11
indentation before the description, and with a usual type name length of
12
three chracters, this sums up to eight additional characters -- which
13
means that we now need 24 characters to get the same amount of padding
14
for most options. Also, 24 is a third of 80, which makes it kind of a
15
round number in terminal terms.
11
16
12
Previously this worked by luks as a bug meant the "key-secret"
17
Finally, this patch amends the reference output of iotest 082 to match
13
parameters were not purged from the QemuOpts. This bug was fixed in
18
the changes (and thus makes it pass again).
14
19
15
commit b76b4f604521e59f857d6177bc55f6f2e41fd392
20
Signed-off-by: Max Reitz <mreitz@redhat.com>
16
Author: Kevin Wolf <kwolf@redhat.com>
21
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
17
Date: Thu Jan 11 16:18:08 2018 +0100
18
19
qcow2: Use visitor for options in qcow2_create()
20
21
Exposing the latent bug in qemu-img. This fix simply moves the copying
22
of secrets to before the bdrv_create() call.
23
24
Cc: qemu-stable@nongnu.org
25
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
26
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
22
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
27
---
23
---
28
qemu-img.c | 32 +++++++++++++++-----------------
24
include/qemu/option.h | 2 +-
29
1 file changed, 15 insertions(+), 17 deletions(-)
25
qemu-img.c | 4 +-
26
util/qemu-option.c | 32 +-
27
tests/qemu-iotests/082.out | 956 ++++++++++++++++++-------------------
28
4 files changed, 507 insertions(+), 487 deletions(-)
30
29
30
diff --git a/include/qemu/option.h b/include/qemu/option.h
31
index XXXXXXX..XXXXXXX 100644
32
--- a/include/qemu/option.h
33
+++ b/include/qemu/option.h
34
@@ -XXX,XX +XXX,XX @@ typedef int (*qemu_opts_loopfunc)(void *opaque, QemuOpts *opts, Error **errp);
35
int qemu_opts_foreach(QemuOptsList *list, qemu_opts_loopfunc func,
36
void *opaque, Error **errp);
37
void qemu_opts_print(QemuOpts *opts, const char *sep);
38
-void qemu_opts_print_help(QemuOptsList *list);
39
+void qemu_opts_print_help(QemuOptsList *list, bool print_caption);
40
void qemu_opts_free(QemuOptsList *list);
41
QemuOptsList *qemu_opts_append(QemuOptsList *dst, QemuOptsList *list);
42
31
diff --git a/qemu-img.c b/qemu-img.c
43
diff --git a/qemu-img.c b/qemu-img.c
32
index XXXXXXX..XXXXXXX 100644
44
index XXXXXXX..XXXXXXX 100644
33
--- a/qemu-img.c
45
--- a/qemu-img.c
34
+++ b/qemu-img.c
46
+++ b/qemu-img.c
35
@@ -XXX,XX +XXX,XX @@ static int img_add_key_secrets(void *opaque,
47
@@ -XXX,XX +XXX,XX @@ static int print_block_option_help(const char *filename, const char *fmt)
48
}
49
50
printf("Supported options:\n");
51
- qemu_opts_print_help(create_opts);
52
+ qemu_opts_print_help(create_opts, false);
53
qemu_opts_free(create_opts);
36
return 0;
54
return 0;
37
}
55
}
38
56
@@ -XXX,XX +XXX,XX @@ static int print_amend_option_help(const char *format)
39
-static BlockBackend *img_open_new_file(const char *filename,
57
assert(drv->create_opts);
40
- QemuOpts *create_opts,
58
41
- const char *fmt, int flags,
59
printf("Creation options for '%s':\n", format);
42
- bool writethrough, bool quiet,
60
- qemu_opts_print_help(drv->create_opts);
43
- bool force_share)
61
+ qemu_opts_print_help(drv->create_opts, false);
44
-{
62
printf("\nNote that not all of these options may be amendable.\n");
45
- QDict *options = NULL;
63
return 0;
46
-
64
}
47
- options = qdict_new();
65
diff --git a/util/qemu-option.c b/util/qemu-option.c
48
- qemu_opt_foreach(create_opts, img_add_key_secrets, options, &error_abort);
66
index XXXXXXX..XXXXXXX 100644
49
-
67
--- a/util/qemu-option.c
50
- return img_open_file(filename, options, fmt, flags, writethrough, quiet,
68
+++ b/util/qemu-option.c
51
- force_share);
69
@@ -XXX,XX +XXX,XX @@ static const char *opt_type_to_string(enum QemuOptType type)
52
-}
70
g_assert_not_reached();
53
-
71
}
54
72
55
static BlockBackend *img_open(bool image_opts,
73
-void qemu_opts_print_help(QemuOptsList *list)
56
const char *filename,
74
+/**
57
@@ -XXX,XX +XXX,XX @@ static int img_convert(int argc, char **argv)
75
+ * Print the list of options available in the given list. If
58
BlockDriverState *out_bs;
76
+ * @print_caption is true, a caption (including the list name, if it
59
QemuOpts *opts = NULL, *sn_opts = NULL;
77
+ * exists) is printed. The options itself will be indented, so
60
QemuOptsList *create_opts = NULL;
78
+ * @print_caption should only be set to false if the caller prints its
61
+ QDict *open_opts = NULL;
79
+ * own custom caption (so that the indentation makes sense).
62
char *options = NULL;
80
+ */
63
Error *local_err = NULL;
81
+void qemu_opts_print_help(QemuOptsList *list, bool print_caption)
64
bool writethrough, src_writethrough, quiet = false, image_opts = false,
82
{
65
@@ -XXX,XX +XXX,XX @@ static int img_convert(int argc, char **argv)
83
QemuOptDesc *desc;
84
int i;
85
@@ -XXX,XX +XXX,XX @@ void qemu_opts_print_help(QemuOptsList *list)
86
desc = list->desc;
87
while (desc && desc->name) {
88
GString *str = g_string_new(NULL);
89
- if (list->name) {
90
- g_string_append_printf(str, "%s.", list->name);
91
- }
92
- g_string_append_printf(str, "%s=%s", desc->name,
93
+ g_string_append_printf(str, " %s=<%s>", desc->name,
94
opt_type_to_string(desc->type));
95
if (desc->help) {
96
+ if (str->len < 24) {
97
+ g_string_append_printf(str, "%*s", 24 - (int)str->len, "");
98
+ }
99
g_string_append_printf(str, " - %s", desc->help);
66
}
100
}
101
g_ptr_array_add(array, g_string_free(str, false));
102
@@ -XXX,XX +XXX,XX @@ void qemu_opts_print_help(QemuOptsList *list)
67
}
103
}
68
104
69
+ /*
105
g_ptr_array_sort(array, (GCompareFunc)qemu_pstrcmp0);
70
+ * The later open call will need any decryption secrets, and
106
+ if (print_caption && array->len > 0) {
71
+ * bdrv_create() will purge "opts", so extract them now before
107
+ if (list->name) {
72
+ * they are lost.
108
+ printf("%s options:\n", list->name);
73
+ */
109
+ } else {
74
+ if (!skip_create) {
110
+ printf("Options:\n");
75
+ open_opts = qdict_new();
111
+ }
76
+ qemu_opt_foreach(opts, img_add_key_secrets, open_opts, &error_abort);
112
+ } else if (array->len == 0) {
113
+ if (list->name) {
114
+ printf("There are no options for %s.\n", list->name);
115
+ } else {
116
+ printf("No options available.\n");
117
+ }
77
+ }
118
+ }
78
+
119
for (i = 0; i < array->len; i++) {
79
if (!skip_create) {
120
printf("%s\n", (char *)array->pdata[i]);
80
/* Create the new image */
81
ret = bdrv_create(drv, out_filename, opts, &local_err);
82
@@ -XXX,XX +XXX,XX @@ static int img_convert(int argc, char **argv)
83
* That has to wait for bdrv_create to be improved
84
* to allow filenames in option syntax
85
*/
86
- s.target = img_open_new_file(out_filename, opts, out_fmt,
87
- flags, writethrough, quiet, false);
88
+ s.target = img_open_file(out_filename, open_opts, out_fmt,
89
+ flags, writethrough, quiet, false);
90
+ open_opts = NULL; /* blk_new_open will have freed it */
91
}
121
}
92
if (!s.target) {
122
@@ -XXX,XX +XXX,XX @@ QemuOpts *qemu_opts_parse_noisily(QemuOptsList *list, const char *params,
93
ret = -1;
123
opts = opts_parse(list, params, permit_abbrev, false, &invalidp, &err);
94
@@ -XXX,XX +XXX,XX @@ out:
124
if (err) {
95
qemu_opts_del(opts);
125
if (invalidp && has_help_option(params)) {
96
qemu_opts_free(create_opts);
126
- qemu_opts_print_help(list);
97
qemu_opts_del(sn_opts);
127
+ qemu_opts_print_help(list, true);
98
+ qobject_unref(open_opts);
128
error_free(err);
99
blk_unref(s.target);
129
} else {
100
if (s.src) {
130
error_report_err(err);
101
for (bs_i = 0; bs_i < s.src_num; bs_i++) {
131
diff --git a/tests/qemu-iotests/082.out b/tests/qemu-iotests/082.out
132
index XXXXXXX..XXXXXXX 100644
133
--- a/tests/qemu-iotests/082.out
134
+++ b/tests/qemu-iotests/082.out
135
@@ -XXX,XX +XXX,XX @@ cluster_size: 8192
136
137
Testing: create -f qcow2 -o help TEST_DIR/t.qcow2 128M
138
Supported options:
139
-size Virtual disk size
140
-compat Compatibility level (0.10 or 1.1)
141
-backing_file File name of a base image
142
-backing_fmt Image format of the base image
143
-encryption Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
144
-encrypt.format Encrypt the image, format choices: 'aes', 'luks'
145
-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
146
-encrypt.cipher-alg Name of encryption cipher algorithm
147
-encrypt.cipher-mode Name of encryption cipher mode
148
-encrypt.ivgen-alg Name of IV generator algorithm
149
-encrypt.ivgen-hash-alg Name of IV generator hash algorithm
150
-encrypt.hash-alg Name of encryption hash algorithm
151
-encrypt.iter-time Time to spend in PBKDF in milliseconds
152
-cluster_size qcow2 cluster size
153
-preallocation Preallocation mode (allowed values: off, metadata, falloc, full)
154
-lazy_refcounts Postpone refcount updates
155
-refcount_bits Width of a reference count entry in bits
156
-nocow Turn off copy-on-write (valid only on btrfs)
157
+ backing_file=<str> - File name of a base image
158
+ backing_fmt=<str> - Image format of the base image
159
+ cluster_size=<size> - qcow2 cluster size
160
+ compat=<str> - Compatibility level (0.10 or 1.1)
161
+ encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
162
+ encrypt.cipher-mode=<str> - Name of encryption cipher mode
163
+ encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'
164
+ encrypt.hash-alg=<str> - Name of encryption hash algorithm
165
+ encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
166
+ encrypt.ivgen-alg=<str> - Name of IV generator algorithm
167
+ encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
168
+ encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
169
+ encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
170
+ lazy_refcounts=<bool (on/off)> - Postpone refcount updates
171
+ nocow=<bool (on/off)> - Turn off copy-on-write (valid only on btrfs)
172
+ preallocation=<str> - Preallocation mode (allowed values: off, metadata, falloc, full)
173
+ refcount_bits=<num> - Width of a reference count entry in bits
174
+ size=<size> - Virtual disk size
175
176
Testing: create -f qcow2 -o ? TEST_DIR/t.qcow2 128M
177
Supported options:
178
-size Virtual disk size
179
-compat Compatibility level (0.10 or 1.1)
180
-backing_file File name of a base image
181
-backing_fmt Image format of the base image
182
-encryption Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
183
-encrypt.format Encrypt the image, format choices: 'aes', 'luks'
184
-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
185
-encrypt.cipher-alg Name of encryption cipher algorithm
186
-encrypt.cipher-mode Name of encryption cipher mode
187
-encrypt.ivgen-alg Name of IV generator algorithm
188
-encrypt.ivgen-hash-alg Name of IV generator hash algorithm
189
-encrypt.hash-alg Name of encryption hash algorithm
190
-encrypt.iter-time Time to spend in PBKDF in milliseconds
191
-cluster_size qcow2 cluster size
192
-preallocation Preallocation mode (allowed values: off, metadata, falloc, full)
193
-lazy_refcounts Postpone refcount updates
194
-refcount_bits Width of a reference count entry in bits
195
-nocow Turn off copy-on-write (valid only on btrfs)
196
+ backing_file=<str> - File name of a base image
197
+ backing_fmt=<str> - Image format of the base image
198
+ cluster_size=<size> - qcow2 cluster size
199
+ compat=<str> - Compatibility level (0.10 or 1.1)
200
+ encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
201
+ encrypt.cipher-mode=<str> - Name of encryption cipher mode
202
+ encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'
203
+ encrypt.hash-alg=<str> - Name of encryption hash algorithm
204
+ encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
205
+ encrypt.ivgen-alg=<str> - Name of IV generator algorithm
206
+ encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
207
+ encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
208
+ encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
209
+ lazy_refcounts=<bool (on/off)> - Postpone refcount updates
210
+ nocow=<bool (on/off)> - Turn off copy-on-write (valid only on btrfs)
211
+ preallocation=<str> - Preallocation mode (allowed values: off, metadata, falloc, full)
212
+ refcount_bits=<num> - Width of a reference count entry in bits
213
+ size=<size> - Virtual disk size
214
215
Testing: create -f qcow2 -o cluster_size=4k,help TEST_DIR/t.qcow2 128M
216
Supported options:
217
-size Virtual disk size
218
-compat Compatibility level (0.10 or 1.1)
219
-backing_file File name of a base image
220
-backing_fmt Image format of the base image
221
-encryption Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
222
-encrypt.format Encrypt the image, format choices: 'aes', 'luks'
223
-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
224
-encrypt.cipher-alg Name of encryption cipher algorithm
225
-encrypt.cipher-mode Name of encryption cipher mode
226
-encrypt.ivgen-alg Name of IV generator algorithm
227
-encrypt.ivgen-hash-alg Name of IV generator hash algorithm
228
-encrypt.hash-alg Name of encryption hash algorithm
229
-encrypt.iter-time Time to spend in PBKDF in milliseconds
230
-cluster_size qcow2 cluster size
231
-preallocation Preallocation mode (allowed values: off, metadata, falloc, full)
232
-lazy_refcounts Postpone refcount updates
233
-refcount_bits Width of a reference count entry in bits
234
-nocow Turn off copy-on-write (valid only on btrfs)
235
+ backing_file=<str> - File name of a base image
236
+ backing_fmt=<str> - Image format of the base image
237
+ cluster_size=<size> - qcow2 cluster size
238
+ compat=<str> - Compatibility level (0.10 or 1.1)
239
+ encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
240
+ encrypt.cipher-mode=<str> - Name of encryption cipher mode
241
+ encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'
242
+ encrypt.hash-alg=<str> - Name of encryption hash algorithm
243
+ encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
244
+ encrypt.ivgen-alg=<str> - Name of IV generator algorithm
245
+ encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
246
+ encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
247
+ encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
248
+ lazy_refcounts=<bool (on/off)> - Postpone refcount updates
249
+ nocow=<bool (on/off)> - Turn off copy-on-write (valid only on btrfs)
250
+ preallocation=<str> - Preallocation mode (allowed values: off, metadata, falloc, full)
251
+ refcount_bits=<num> - Width of a reference count entry in bits
252
+ size=<size> - Virtual disk size
253
254
Testing: create -f qcow2 -o cluster_size=4k,? TEST_DIR/t.qcow2 128M
255
Supported options:
256
-size Virtual disk size
257
-compat Compatibility level (0.10 or 1.1)
258
-backing_file File name of a base image
259
-backing_fmt Image format of the base image
260
-encryption Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
261
-encrypt.format Encrypt the image, format choices: 'aes', 'luks'
262
-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
263
-encrypt.cipher-alg Name of encryption cipher algorithm
264
-encrypt.cipher-mode Name of encryption cipher mode
265
-encrypt.ivgen-alg Name of IV generator algorithm
266
-encrypt.ivgen-hash-alg Name of IV generator hash algorithm
267
-encrypt.hash-alg Name of encryption hash algorithm
268
-encrypt.iter-time Time to spend in PBKDF in milliseconds
269
-cluster_size qcow2 cluster size
270
-preallocation Preallocation mode (allowed values: off, metadata, falloc, full)
271
-lazy_refcounts Postpone refcount updates
272
-refcount_bits Width of a reference count entry in bits
273
-nocow Turn off copy-on-write (valid only on btrfs)
274
+ backing_file=<str> - File name of a base image
275
+ backing_fmt=<str> - Image format of the base image
276
+ cluster_size=<size> - qcow2 cluster size
277
+ compat=<str> - Compatibility level (0.10 or 1.1)
278
+ encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
279
+ encrypt.cipher-mode=<str> - Name of encryption cipher mode
280
+ encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'
281
+ encrypt.hash-alg=<str> - Name of encryption hash algorithm
282
+ encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
283
+ encrypt.ivgen-alg=<str> - Name of IV generator algorithm
284
+ encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
285
+ encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
286
+ encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
287
+ lazy_refcounts=<bool (on/off)> - Postpone refcount updates
288
+ nocow=<bool (on/off)> - Turn off copy-on-write (valid only on btrfs)
289
+ preallocation=<str> - Preallocation mode (allowed values: off, metadata, falloc, full)
290
+ refcount_bits=<num> - Width of a reference count entry in bits
291
+ size=<size> - Virtual disk size
292
293
Testing: create -f qcow2 -o help,cluster_size=4k TEST_DIR/t.qcow2 128M
294
Supported options:
295
-size Virtual disk size
296
-compat Compatibility level (0.10 or 1.1)
297
-backing_file File name of a base image
298
-backing_fmt Image format of the base image
299
-encryption Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
300
-encrypt.format Encrypt the image, format choices: 'aes', 'luks'
301
-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
302
-encrypt.cipher-alg Name of encryption cipher algorithm
303
-encrypt.cipher-mode Name of encryption cipher mode
304
-encrypt.ivgen-alg Name of IV generator algorithm
305
-encrypt.ivgen-hash-alg Name of IV generator hash algorithm
306
-encrypt.hash-alg Name of encryption hash algorithm
307
-encrypt.iter-time Time to spend in PBKDF in milliseconds
308
-cluster_size qcow2 cluster size
309
-preallocation Preallocation mode (allowed values: off, metadata, falloc, full)
310
-lazy_refcounts Postpone refcount updates
311
-refcount_bits Width of a reference count entry in bits
312
-nocow Turn off copy-on-write (valid only on btrfs)
313
+ backing_file=<str> - File name of a base image
314
+ backing_fmt=<str> - Image format of the base image
315
+ cluster_size=<size> - qcow2 cluster size
316
+ compat=<str> - Compatibility level (0.10 or 1.1)
317
+ encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
318
+ encrypt.cipher-mode=<str> - Name of encryption cipher mode
319
+ encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'
320
+ encrypt.hash-alg=<str> - Name of encryption hash algorithm
321
+ encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
322
+ encrypt.ivgen-alg=<str> - Name of IV generator algorithm
323
+ encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
324
+ encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
325
+ encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
326
+ lazy_refcounts=<bool (on/off)> - Postpone refcount updates
327
+ nocow=<bool (on/off)> - Turn off copy-on-write (valid only on btrfs)
328
+ preallocation=<str> - Preallocation mode (allowed values: off, metadata, falloc, full)
329
+ refcount_bits=<num> - Width of a reference count entry in bits
330
+ size=<size> - Virtual disk size
331
332
Testing: create -f qcow2 -o ?,cluster_size=4k TEST_DIR/t.qcow2 128M
333
Supported options:
334
-size Virtual disk size
335
-compat Compatibility level (0.10 or 1.1)
336
-backing_file File name of a base image
337
-backing_fmt Image format of the base image
338
-encryption Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
339
-encrypt.format Encrypt the image, format choices: 'aes', 'luks'
340
-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
341
-encrypt.cipher-alg Name of encryption cipher algorithm
342
-encrypt.cipher-mode Name of encryption cipher mode
343
-encrypt.ivgen-alg Name of IV generator algorithm
344
-encrypt.ivgen-hash-alg Name of IV generator hash algorithm
345
-encrypt.hash-alg Name of encryption hash algorithm
346
-encrypt.iter-time Time to spend in PBKDF in milliseconds
347
-cluster_size qcow2 cluster size
348
-preallocation Preallocation mode (allowed values: off, metadata, falloc, full)
349
-lazy_refcounts Postpone refcount updates
350
-refcount_bits Width of a reference count entry in bits
351
-nocow Turn off copy-on-write (valid only on btrfs)
352
+ backing_file=<str> - File name of a base image
353
+ backing_fmt=<str> - Image format of the base image
354
+ cluster_size=<size> - qcow2 cluster size
355
+ compat=<str> - Compatibility level (0.10 or 1.1)
356
+ encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
357
+ encrypt.cipher-mode=<str> - Name of encryption cipher mode
358
+ encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'
359
+ encrypt.hash-alg=<str> - Name of encryption hash algorithm
360
+ encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
361
+ encrypt.ivgen-alg=<str> - Name of IV generator algorithm
362
+ encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
363
+ encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
364
+ encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
365
+ lazy_refcounts=<bool (on/off)> - Postpone refcount updates
366
+ nocow=<bool (on/off)> - Turn off copy-on-write (valid only on btrfs)
367
+ preallocation=<str> - Preallocation mode (allowed values: off, metadata, falloc, full)
368
+ refcount_bits=<num> - Width of a reference count entry in bits
369
+ size=<size> - Virtual disk size
370
371
Testing: create -f qcow2 -o cluster_size=4k -o help TEST_DIR/t.qcow2 128M
372
Supported options:
373
-size Virtual disk size
374
-compat Compatibility level (0.10 or 1.1)
375
-backing_file File name of a base image
376
-backing_fmt Image format of the base image
377
-encryption Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
378
-encrypt.format Encrypt the image, format choices: 'aes', 'luks'
379
-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
380
-encrypt.cipher-alg Name of encryption cipher algorithm
381
-encrypt.cipher-mode Name of encryption cipher mode
382
-encrypt.ivgen-alg Name of IV generator algorithm
383
-encrypt.ivgen-hash-alg Name of IV generator hash algorithm
384
-encrypt.hash-alg Name of encryption hash algorithm
385
-encrypt.iter-time Time to spend in PBKDF in milliseconds
386
-cluster_size qcow2 cluster size
387
-preallocation Preallocation mode (allowed values: off, metadata, falloc, full)
388
-lazy_refcounts Postpone refcount updates
389
-refcount_bits Width of a reference count entry in bits
390
-nocow Turn off copy-on-write (valid only on btrfs)
391
+ backing_file=<str> - File name of a base image
392
+ backing_fmt=<str> - Image format of the base image
393
+ cluster_size=<size> - qcow2 cluster size
394
+ compat=<str> - Compatibility level (0.10 or 1.1)
395
+ encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
396
+ encrypt.cipher-mode=<str> - Name of encryption cipher mode
397
+ encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'
398
+ encrypt.hash-alg=<str> - Name of encryption hash algorithm
399
+ encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
400
+ encrypt.ivgen-alg=<str> - Name of IV generator algorithm
401
+ encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
402
+ encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
403
+ encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
404
+ lazy_refcounts=<bool (on/off)> - Postpone refcount updates
405
+ nocow=<bool (on/off)> - Turn off copy-on-write (valid only on btrfs)
406
+ preallocation=<str> - Preallocation mode (allowed values: off, metadata, falloc, full)
407
+ refcount_bits=<num> - Width of a reference count entry in bits
408
+ size=<size> - Virtual disk size
409
410
Testing: create -f qcow2 -o cluster_size=4k -o ? TEST_DIR/t.qcow2 128M
411
Supported options:
412
-size Virtual disk size
413
-compat Compatibility level (0.10 or 1.1)
414
-backing_file File name of a base image
415
-backing_fmt Image format of the base image
416
-encryption Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
417
-encrypt.format Encrypt the image, format choices: 'aes', 'luks'
418
-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
419
-encrypt.cipher-alg Name of encryption cipher algorithm
420
-encrypt.cipher-mode Name of encryption cipher mode
421
-encrypt.ivgen-alg Name of IV generator algorithm
422
-encrypt.ivgen-hash-alg Name of IV generator hash algorithm
423
-encrypt.hash-alg Name of encryption hash algorithm
424
-encrypt.iter-time Time to spend in PBKDF in milliseconds
425
-cluster_size qcow2 cluster size
426
-preallocation Preallocation mode (allowed values: off, metadata, falloc, full)
427
-lazy_refcounts Postpone refcount updates
428
-refcount_bits Width of a reference count entry in bits
429
-nocow Turn off copy-on-write (valid only on btrfs)
430
+ backing_file=<str> - File name of a base image
431
+ backing_fmt=<str> - Image format of the base image
432
+ cluster_size=<size> - qcow2 cluster size
433
+ compat=<str> - Compatibility level (0.10 or 1.1)
434
+ encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
435
+ encrypt.cipher-mode=<str> - Name of encryption cipher mode
436
+ encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'
437
+ encrypt.hash-alg=<str> - Name of encryption hash algorithm
438
+ encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
439
+ encrypt.ivgen-alg=<str> - Name of IV generator algorithm
440
+ encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
441
+ encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
442
+ encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
443
+ lazy_refcounts=<bool (on/off)> - Postpone refcount updates
444
+ nocow=<bool (on/off)> - Turn off copy-on-write (valid only on btrfs)
445
+ preallocation=<str> - Preallocation mode (allowed values: off, metadata, falloc, full)
446
+ refcount_bits=<num> - Width of a reference count entry in bits
447
+ size=<size> - Virtual disk size
448
449
Testing: create -f qcow2 -u -o backing_file=TEST_DIR/t.qcow2,,help TEST_DIR/t.qcow2 128M
450
Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=134217728 backing_file=TEST_DIR/t.qcow2,,help cluster_size=65536 lazy_refcounts=off refcount_bits=16
451
@@ -XXX,XX +XXX,XX @@ qemu-img: Invalid option list: ,,
452
453
Testing: create -f qcow2 -o help
454
Supported options:
455
-size Virtual disk size
456
-compat Compatibility level (0.10 or 1.1)
457
-backing_file File name of a base image
458
-backing_fmt Image format of the base image
459
-encryption Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
460
-encrypt.format Encrypt the image, format choices: 'aes', 'luks'
461
-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
462
-encrypt.cipher-alg Name of encryption cipher algorithm
463
-encrypt.cipher-mode Name of encryption cipher mode
464
-encrypt.ivgen-alg Name of IV generator algorithm
465
-encrypt.ivgen-hash-alg Name of IV generator hash algorithm
466
-encrypt.hash-alg Name of encryption hash algorithm
467
-encrypt.iter-time Time to spend in PBKDF in milliseconds
468
-cluster_size qcow2 cluster size
469
-preallocation Preallocation mode (allowed values: off, metadata, falloc, full)
470
-lazy_refcounts Postpone refcount updates
471
-refcount_bits Width of a reference count entry in bits
472
+ backing_file=<str> - File name of a base image
473
+ backing_fmt=<str> - Image format of the base image
474
+ cluster_size=<size> - qcow2 cluster size
475
+ compat=<str> - Compatibility level (0.10 or 1.1)
476
+ encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
477
+ encrypt.cipher-mode=<str> - Name of encryption cipher mode
478
+ encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'
479
+ encrypt.hash-alg=<str> - Name of encryption hash algorithm
480
+ encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
481
+ encrypt.ivgen-alg=<str> - Name of IV generator algorithm
482
+ encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
483
+ encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
484
+ encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
485
+ lazy_refcounts=<bool (on/off)> - Postpone refcount updates
486
+ preallocation=<str> - Preallocation mode (allowed values: off, metadata, falloc, full)
487
+ refcount_bits=<num> - Width of a reference count entry in bits
488
+ size=<size> - Virtual disk size
489
490
Testing: create -o help
491
Supported options:
492
-size Virtual disk size
493
+ size=<size> - Virtual disk size
494
495
Testing: create -f bochs -o help
496
qemu-img: Format driver 'bochs' does not support image creation
497
@@ -XXX,XX +XXX,XX @@ cluster_size: 8192
498
499
Testing: convert -O qcow2 -o help TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base
500
Supported options:
501
-size Virtual disk size
502
-compat Compatibility level (0.10 or 1.1)
503
-backing_file File name of a base image
504
-backing_fmt Image format of the base image
505
-encryption Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
506
-encrypt.format Encrypt the image, format choices: 'aes', 'luks'
507
-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
508
-encrypt.cipher-alg Name of encryption cipher algorithm
509
-encrypt.cipher-mode Name of encryption cipher mode
510
-encrypt.ivgen-alg Name of IV generator algorithm
511
-encrypt.ivgen-hash-alg Name of IV generator hash algorithm
512
-encrypt.hash-alg Name of encryption hash algorithm
513
-encrypt.iter-time Time to spend in PBKDF in milliseconds
514
-cluster_size qcow2 cluster size
515
-preallocation Preallocation mode (allowed values: off, metadata, falloc, full)
516
-lazy_refcounts Postpone refcount updates
517
-refcount_bits Width of a reference count entry in bits
518
-nocow Turn off copy-on-write (valid only on btrfs)
519
+ backing_file=<str> - File name of a base image
520
+ backing_fmt=<str> - Image format of the base image
521
+ cluster_size=<size> - qcow2 cluster size
522
+ compat=<str> - Compatibility level (0.10 or 1.1)
523
+ encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
524
+ encrypt.cipher-mode=<str> - Name of encryption cipher mode
525
+ encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'
526
+ encrypt.hash-alg=<str> - Name of encryption hash algorithm
527
+ encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
528
+ encrypt.ivgen-alg=<str> - Name of IV generator algorithm
529
+ encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
530
+ encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
531
+ encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
532
+ lazy_refcounts=<bool (on/off)> - Postpone refcount updates
533
+ nocow=<bool (on/off)> - Turn off copy-on-write (valid only on btrfs)
534
+ preallocation=<str> - Preallocation mode (allowed values: off, metadata, falloc, full)
535
+ refcount_bits=<num> - Width of a reference count entry in bits
536
+ size=<size> - Virtual disk size
537
538
Testing: convert -O qcow2 -o ? TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base
539
Supported options:
540
-size Virtual disk size
541
-compat Compatibility level (0.10 or 1.1)
542
-backing_file File name of a base image
543
-backing_fmt Image format of the base image
544
-encryption Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
545
-encrypt.format Encrypt the image, format choices: 'aes', 'luks'
546
-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
547
-encrypt.cipher-alg Name of encryption cipher algorithm
548
-encrypt.cipher-mode Name of encryption cipher mode
549
-encrypt.ivgen-alg Name of IV generator algorithm
550
-encrypt.ivgen-hash-alg Name of IV generator hash algorithm
551
-encrypt.hash-alg Name of encryption hash algorithm
552
-encrypt.iter-time Time to spend in PBKDF in milliseconds
553
-cluster_size qcow2 cluster size
554
-preallocation Preallocation mode (allowed values: off, metadata, falloc, full)
555
-lazy_refcounts Postpone refcount updates
556
-refcount_bits Width of a reference count entry in bits
557
-nocow Turn off copy-on-write (valid only on btrfs)
558
+ backing_file=<str> - File name of a base image
559
+ backing_fmt=<str> - Image format of the base image
560
+ cluster_size=<size> - qcow2 cluster size
561
+ compat=<str> - Compatibility level (0.10 or 1.1)
562
+ encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
563
+ encrypt.cipher-mode=<str> - Name of encryption cipher mode
564
+ encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'
565
+ encrypt.hash-alg=<str> - Name of encryption hash algorithm
566
+ encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
567
+ encrypt.ivgen-alg=<str> - Name of IV generator algorithm
568
+ encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
569
+ encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
570
+ encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
571
+ lazy_refcounts=<bool (on/off)> - Postpone refcount updates
572
+ nocow=<bool (on/off)> - Turn off copy-on-write (valid only on btrfs)
573
+ preallocation=<str> - Preallocation mode (allowed values: off, metadata, falloc, full)
574
+ refcount_bits=<num> - Width of a reference count entry in bits
575
+ size=<size> - Virtual disk size
576
577
Testing: convert -O qcow2 -o cluster_size=4k,help TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base
578
Supported options:
579
-size Virtual disk size
580
-compat Compatibility level (0.10 or 1.1)
581
-backing_file File name of a base image
582
-backing_fmt Image format of the base image
583
-encryption Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
584
-encrypt.format Encrypt the image, format choices: 'aes', 'luks'
585
-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
586
-encrypt.cipher-alg Name of encryption cipher algorithm
587
-encrypt.cipher-mode Name of encryption cipher mode
588
-encrypt.ivgen-alg Name of IV generator algorithm
589
-encrypt.ivgen-hash-alg Name of IV generator hash algorithm
590
-encrypt.hash-alg Name of encryption hash algorithm
591
-encrypt.iter-time Time to spend in PBKDF in milliseconds
592
-cluster_size qcow2 cluster size
593
-preallocation Preallocation mode (allowed values: off, metadata, falloc, full)
594
-lazy_refcounts Postpone refcount updates
595
-refcount_bits Width of a reference count entry in bits
596
-nocow Turn off copy-on-write (valid only on btrfs)
597
+ backing_file=<str> - File name of a base image
598
+ backing_fmt=<str> - Image format of the base image
599
+ cluster_size=<size> - qcow2 cluster size
600
+ compat=<str> - Compatibility level (0.10 or 1.1)
601
+ encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
602
+ encrypt.cipher-mode=<str> - Name of encryption cipher mode
603
+ encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'
604
+ encrypt.hash-alg=<str> - Name of encryption hash algorithm
605
+ encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
606
+ encrypt.ivgen-alg=<str> - Name of IV generator algorithm
607
+ encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
608
+ encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
609
+ encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
610
+ lazy_refcounts=<bool (on/off)> - Postpone refcount updates
611
+ nocow=<bool (on/off)> - Turn off copy-on-write (valid only on btrfs)
612
+ preallocation=<str> - Preallocation mode (allowed values: off, metadata, falloc, full)
613
+ refcount_bits=<num> - Width of a reference count entry in bits
614
+ size=<size> - Virtual disk size
615
616
Testing: convert -O qcow2 -o cluster_size=4k,? TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base
617
Supported options:
618
-size Virtual disk size
619
-compat Compatibility level (0.10 or 1.1)
620
-backing_file File name of a base image
621
-backing_fmt Image format of the base image
622
-encryption Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
623
-encrypt.format Encrypt the image, format choices: 'aes', 'luks'
624
-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
625
-encrypt.cipher-alg Name of encryption cipher algorithm
626
-encrypt.cipher-mode Name of encryption cipher mode
627
-encrypt.ivgen-alg Name of IV generator algorithm
628
-encrypt.ivgen-hash-alg Name of IV generator hash algorithm
629
-encrypt.hash-alg Name of encryption hash algorithm
630
-encrypt.iter-time Time to spend in PBKDF in milliseconds
631
-cluster_size qcow2 cluster size
632
-preallocation Preallocation mode (allowed values: off, metadata, falloc, full)
633
-lazy_refcounts Postpone refcount updates
634
-refcount_bits Width of a reference count entry in bits
635
-nocow Turn off copy-on-write (valid only on btrfs)
636
+ backing_file=<str> - File name of a base image
637
+ backing_fmt=<str> - Image format of the base image
638
+ cluster_size=<size> - qcow2 cluster size
639
+ compat=<str> - Compatibility level (0.10 or 1.1)
640
+ encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
641
+ encrypt.cipher-mode=<str> - Name of encryption cipher mode
642
+ encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'
643
+ encrypt.hash-alg=<str> - Name of encryption hash algorithm
644
+ encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
645
+ encrypt.ivgen-alg=<str> - Name of IV generator algorithm
646
+ encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
647
+ encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
648
+ encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
649
+ lazy_refcounts=<bool (on/off)> - Postpone refcount updates
650
+ nocow=<bool (on/off)> - Turn off copy-on-write (valid only on btrfs)
651
+ preallocation=<str> - Preallocation mode (allowed values: off, metadata, falloc, full)
652
+ refcount_bits=<num> - Width of a reference count entry in bits
653
+ size=<size> - Virtual disk size
654
655
Testing: convert -O qcow2 -o help,cluster_size=4k TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base
656
Supported options:
657
-size Virtual disk size
658
-compat Compatibility level (0.10 or 1.1)
659
-backing_file File name of a base image
660
-backing_fmt Image format of the base image
661
-encryption Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
662
-encrypt.format Encrypt the image, format choices: 'aes', 'luks'
663
-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
664
-encrypt.cipher-alg Name of encryption cipher algorithm
665
-encrypt.cipher-mode Name of encryption cipher mode
666
-encrypt.ivgen-alg Name of IV generator algorithm
667
-encrypt.ivgen-hash-alg Name of IV generator hash algorithm
668
-encrypt.hash-alg Name of encryption hash algorithm
669
-encrypt.iter-time Time to spend in PBKDF in milliseconds
670
-cluster_size qcow2 cluster size
671
-preallocation Preallocation mode (allowed values: off, metadata, falloc, full)
672
-lazy_refcounts Postpone refcount updates
673
-refcount_bits Width of a reference count entry in bits
674
-nocow Turn off copy-on-write (valid only on btrfs)
675
+ backing_file=<str> - File name of a base image
676
+ backing_fmt=<str> - Image format of the base image
677
+ cluster_size=<size> - qcow2 cluster size
678
+ compat=<str> - Compatibility level (0.10 or 1.1)
679
+ encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
680
+ encrypt.cipher-mode=<str> - Name of encryption cipher mode
681
+ encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'
682
+ encrypt.hash-alg=<str> - Name of encryption hash algorithm
683
+ encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
684
+ encrypt.ivgen-alg=<str> - Name of IV generator algorithm
685
+ encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
686
+ encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
687
+ encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
688
+ lazy_refcounts=<bool (on/off)> - Postpone refcount updates
689
+ nocow=<bool (on/off)> - Turn off copy-on-write (valid only on btrfs)
690
+ preallocation=<str> - Preallocation mode (allowed values: off, metadata, falloc, full)
691
+ refcount_bits=<num> - Width of a reference count entry in bits
692
+ size=<size> - Virtual disk size
693
694
Testing: convert -O qcow2 -o ?,cluster_size=4k TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base
695
Supported options:
696
-size Virtual disk size
697
-compat Compatibility level (0.10 or 1.1)
698
-backing_file File name of a base image
699
-backing_fmt Image format of the base image
700
-encryption Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
701
-encrypt.format Encrypt the image, format choices: 'aes', 'luks'
702
-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
703
-encrypt.cipher-alg Name of encryption cipher algorithm
704
-encrypt.cipher-mode Name of encryption cipher mode
705
-encrypt.ivgen-alg Name of IV generator algorithm
706
-encrypt.ivgen-hash-alg Name of IV generator hash algorithm
707
-encrypt.hash-alg Name of encryption hash algorithm
708
-encrypt.iter-time Time to spend in PBKDF in milliseconds
709
-cluster_size qcow2 cluster size
710
-preallocation Preallocation mode (allowed values: off, metadata, falloc, full)
711
-lazy_refcounts Postpone refcount updates
712
-refcount_bits Width of a reference count entry in bits
713
-nocow Turn off copy-on-write (valid only on btrfs)
714
+ backing_file=<str> - File name of a base image
715
+ backing_fmt=<str> - Image format of the base image
716
+ cluster_size=<size> - qcow2 cluster size
717
+ compat=<str> - Compatibility level (0.10 or 1.1)
718
+ encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
719
+ encrypt.cipher-mode=<str> - Name of encryption cipher mode
720
+ encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'
721
+ encrypt.hash-alg=<str> - Name of encryption hash algorithm
722
+ encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
723
+ encrypt.ivgen-alg=<str> - Name of IV generator algorithm
724
+ encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
725
+ encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
726
+ encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
727
+ lazy_refcounts=<bool (on/off)> - Postpone refcount updates
728
+ nocow=<bool (on/off)> - Turn off copy-on-write (valid only on btrfs)
729
+ preallocation=<str> - Preallocation mode (allowed values: off, metadata, falloc, full)
730
+ refcount_bits=<num> - Width of a reference count entry in bits
731
+ size=<size> - Virtual disk size
732
733
Testing: convert -O qcow2 -o cluster_size=4k -o help TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base
734
Supported options:
735
-size Virtual disk size
736
-compat Compatibility level (0.10 or 1.1)
737
-backing_file File name of a base image
738
-backing_fmt Image format of the base image
739
-encryption Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
740
-encrypt.format Encrypt the image, format choices: 'aes', 'luks'
741
-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
742
-encrypt.cipher-alg Name of encryption cipher algorithm
743
-encrypt.cipher-mode Name of encryption cipher mode
744
-encrypt.ivgen-alg Name of IV generator algorithm
745
-encrypt.ivgen-hash-alg Name of IV generator hash algorithm
746
-encrypt.hash-alg Name of encryption hash algorithm
747
-encrypt.iter-time Time to spend in PBKDF in milliseconds
748
-cluster_size qcow2 cluster size
749
-preallocation Preallocation mode (allowed values: off, metadata, falloc, full)
750
-lazy_refcounts Postpone refcount updates
751
-refcount_bits Width of a reference count entry in bits
752
-nocow Turn off copy-on-write (valid only on btrfs)
753
+ backing_file=<str> - File name of a base image
754
+ backing_fmt=<str> - Image format of the base image
755
+ cluster_size=<size> - qcow2 cluster size
756
+ compat=<str> - Compatibility level (0.10 or 1.1)
757
+ encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
758
+ encrypt.cipher-mode=<str> - Name of encryption cipher mode
759
+ encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'
760
+ encrypt.hash-alg=<str> - Name of encryption hash algorithm
761
+ encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
762
+ encrypt.ivgen-alg=<str> - Name of IV generator algorithm
763
+ encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
764
+ encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
765
+ encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
766
+ lazy_refcounts=<bool (on/off)> - Postpone refcount updates
767
+ nocow=<bool (on/off)> - Turn off copy-on-write (valid only on btrfs)
768
+ preallocation=<str> - Preallocation mode (allowed values: off, metadata, falloc, full)
769
+ refcount_bits=<num> - Width of a reference count entry in bits
770
+ size=<size> - Virtual disk size
771
772
Testing: convert -O qcow2 -o cluster_size=4k -o ? TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base
773
Supported options:
774
-size Virtual disk size
775
-compat Compatibility level (0.10 or 1.1)
776
-backing_file File name of a base image
777
-backing_fmt Image format of the base image
778
-encryption Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
779
-encrypt.format Encrypt the image, format choices: 'aes', 'luks'
780
-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
781
-encrypt.cipher-alg Name of encryption cipher algorithm
782
-encrypt.cipher-mode Name of encryption cipher mode
783
-encrypt.ivgen-alg Name of IV generator algorithm
784
-encrypt.ivgen-hash-alg Name of IV generator hash algorithm
785
-encrypt.hash-alg Name of encryption hash algorithm
786
-encrypt.iter-time Time to spend in PBKDF in milliseconds
787
-cluster_size qcow2 cluster size
788
-preallocation Preallocation mode (allowed values: off, metadata, falloc, full)
789
-lazy_refcounts Postpone refcount updates
790
-refcount_bits Width of a reference count entry in bits
791
-nocow Turn off copy-on-write (valid only on btrfs)
792
+ backing_file=<str> - File name of a base image
793
+ backing_fmt=<str> - Image format of the base image
794
+ cluster_size=<size> - qcow2 cluster size
795
+ compat=<str> - Compatibility level (0.10 or 1.1)
796
+ encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
797
+ encrypt.cipher-mode=<str> - Name of encryption cipher mode
798
+ encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'
799
+ encrypt.hash-alg=<str> - Name of encryption hash algorithm
800
+ encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
801
+ encrypt.ivgen-alg=<str> - Name of IV generator algorithm
802
+ encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
803
+ encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
804
+ encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
805
+ lazy_refcounts=<bool (on/off)> - Postpone refcount updates
806
+ nocow=<bool (on/off)> - Turn off copy-on-write (valid only on btrfs)
807
+ preallocation=<str> - Preallocation mode (allowed values: off, metadata, falloc, full)
808
+ refcount_bits=<num> - Width of a reference count entry in bits
809
+ size=<size> - Virtual disk size
810
811
Testing: convert -O qcow2 -o backing_file=TEST_DIR/t.qcow2,,help TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base
812
qemu-img: Could not open 'TEST_DIR/t.qcow2.base': Could not open backing file: Could not open 'TEST_DIR/t.qcow2,help': No such file or directory
813
@@ -XXX,XX +XXX,XX @@ qemu-img: Invalid option list: ,,
814
815
Testing: convert -O qcow2 -o help
816
Supported options:
817
-size Virtual disk size
818
-compat Compatibility level (0.10 or 1.1)
819
-backing_file File name of a base image
820
-backing_fmt Image format of the base image
821
-encryption Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
822
-encrypt.format Encrypt the image, format choices: 'aes', 'luks'
823
-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
824
-encrypt.cipher-alg Name of encryption cipher algorithm
825
-encrypt.cipher-mode Name of encryption cipher mode
826
-encrypt.ivgen-alg Name of IV generator algorithm
827
-encrypt.ivgen-hash-alg Name of IV generator hash algorithm
828
-encrypt.hash-alg Name of encryption hash algorithm
829
-encrypt.iter-time Time to spend in PBKDF in milliseconds
830
-cluster_size qcow2 cluster size
831
-preallocation Preallocation mode (allowed values: off, metadata, falloc, full)
832
-lazy_refcounts Postpone refcount updates
833
-refcount_bits Width of a reference count entry in bits
834
+ backing_file=<str> - File name of a base image
835
+ backing_fmt=<str> - Image format of the base image
836
+ cluster_size=<size> - qcow2 cluster size
837
+ compat=<str> - Compatibility level (0.10 or 1.1)
838
+ encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
839
+ encrypt.cipher-mode=<str> - Name of encryption cipher mode
840
+ encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'
841
+ encrypt.hash-alg=<str> - Name of encryption hash algorithm
842
+ encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
843
+ encrypt.ivgen-alg=<str> - Name of IV generator algorithm
844
+ encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
845
+ encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
846
+ encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
847
+ lazy_refcounts=<bool (on/off)> - Postpone refcount updates
848
+ preallocation=<str> - Preallocation mode (allowed values: off, metadata, falloc, full)
849
+ refcount_bits=<num> - Width of a reference count entry in bits
850
+ size=<size> - Virtual disk size
851
852
Testing: convert -o help
853
Supported options:
854
-size Virtual disk size
855
+ size=<size> - Virtual disk size
856
857
Testing: convert -O bochs -o help
858
qemu-img: Format driver 'bochs' does not support image creation
859
@@ -XXX,XX +XXX,XX @@ cluster_size: 65536
860
861
Testing: amend -f qcow2 -o help TEST_DIR/t.qcow2
862
Creation options for 'qcow2':
863
-size Virtual disk size
864
-compat Compatibility level (0.10 or 1.1)
865
-backing_file File name of a base image
866
-backing_fmt Image format of the base image
867
-encryption Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
868
-encrypt.format Encrypt the image, format choices: 'aes', 'luks'
869
-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
870
-encrypt.cipher-alg Name of encryption cipher algorithm
871
-encrypt.cipher-mode Name of encryption cipher mode
872
-encrypt.ivgen-alg Name of IV generator algorithm
873
-encrypt.ivgen-hash-alg Name of IV generator hash algorithm
874
-encrypt.hash-alg Name of encryption hash algorithm
875
-encrypt.iter-time Time to spend in PBKDF in milliseconds
876
-cluster_size qcow2 cluster size
877
-preallocation Preallocation mode (allowed values: off, metadata, falloc, full)
878
-lazy_refcounts Postpone refcount updates
879
-refcount_bits Width of a reference count entry in bits
880
+ backing_file=<str> - File name of a base image
881
+ backing_fmt=<str> - Image format of the base image
882
+ cluster_size=<size> - qcow2 cluster size
883
+ compat=<str> - Compatibility level (0.10 or 1.1)
884
+ encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
885
+ encrypt.cipher-mode=<str> - Name of encryption cipher mode
886
+ encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'
887
+ encrypt.hash-alg=<str> - Name of encryption hash algorithm
888
+ encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
889
+ encrypt.ivgen-alg=<str> - Name of IV generator algorithm
890
+ encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
891
+ encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
892
+ encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
893
+ lazy_refcounts=<bool (on/off)> - Postpone refcount updates
894
+ preallocation=<str> - Preallocation mode (allowed values: off, metadata, falloc, full)
895
+ refcount_bits=<num> - Width of a reference count entry in bits
896
+ size=<size> - Virtual disk size
897
898
Note that not all of these options may be amendable.
899
900
Testing: amend -f qcow2 -o ? TEST_DIR/t.qcow2
901
Creation options for 'qcow2':
902
-size Virtual disk size
903
-compat Compatibility level (0.10 or 1.1)
904
-backing_file File name of a base image
905
-backing_fmt Image format of the base image
906
-encryption Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
907
-encrypt.format Encrypt the image, format choices: 'aes', 'luks'
908
-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
909
-encrypt.cipher-alg Name of encryption cipher algorithm
910
-encrypt.cipher-mode Name of encryption cipher mode
911
-encrypt.ivgen-alg Name of IV generator algorithm
912
-encrypt.ivgen-hash-alg Name of IV generator hash algorithm
913
-encrypt.hash-alg Name of encryption hash algorithm
914
-encrypt.iter-time Time to spend in PBKDF in milliseconds
915
-cluster_size qcow2 cluster size
916
-preallocation Preallocation mode (allowed values: off, metadata, falloc, full)
917
-lazy_refcounts Postpone refcount updates
918
-refcount_bits Width of a reference count entry in bits
919
+ backing_file=<str> - File name of a base image
920
+ backing_fmt=<str> - Image format of the base image
921
+ cluster_size=<size> - qcow2 cluster size
922
+ compat=<str> - Compatibility level (0.10 or 1.1)
923
+ encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
924
+ encrypt.cipher-mode=<str> - Name of encryption cipher mode
925
+ encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'
926
+ encrypt.hash-alg=<str> - Name of encryption hash algorithm
927
+ encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
928
+ encrypt.ivgen-alg=<str> - Name of IV generator algorithm
929
+ encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
930
+ encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
931
+ encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
932
+ lazy_refcounts=<bool (on/off)> - Postpone refcount updates
933
+ preallocation=<str> - Preallocation mode (allowed values: off, metadata, falloc, full)
934
+ refcount_bits=<num> - Width of a reference count entry in bits
935
+ size=<size> - Virtual disk size
936
937
Note that not all of these options may be amendable.
938
939
Testing: amend -f qcow2 -o cluster_size=4k,help TEST_DIR/t.qcow2
940
Creation options for 'qcow2':
941
-size Virtual disk size
942
-compat Compatibility level (0.10 or 1.1)
943
-backing_file File name of a base image
944
-backing_fmt Image format of the base image
945
-encryption Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
946
-encrypt.format Encrypt the image, format choices: 'aes', 'luks'
947
-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
948
-encrypt.cipher-alg Name of encryption cipher algorithm
949
-encrypt.cipher-mode Name of encryption cipher mode
950
-encrypt.ivgen-alg Name of IV generator algorithm
951
-encrypt.ivgen-hash-alg Name of IV generator hash algorithm
952
-encrypt.hash-alg Name of encryption hash algorithm
953
-encrypt.iter-time Time to spend in PBKDF in milliseconds
954
-cluster_size qcow2 cluster size
955
-preallocation Preallocation mode (allowed values: off, metadata, falloc, full)
956
-lazy_refcounts Postpone refcount updates
957
-refcount_bits Width of a reference count entry in bits
958
+ backing_file=<str> - File name of a base image
959
+ backing_fmt=<str> - Image format of the base image
960
+ cluster_size=<size> - qcow2 cluster size
961
+ compat=<str> - Compatibility level (0.10 or 1.1)
962
+ encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
963
+ encrypt.cipher-mode=<str> - Name of encryption cipher mode
964
+ encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'
965
+ encrypt.hash-alg=<str> - Name of encryption hash algorithm
966
+ encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
967
+ encrypt.ivgen-alg=<str> - Name of IV generator algorithm
968
+ encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
969
+ encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
970
+ encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
971
+ lazy_refcounts=<bool (on/off)> - Postpone refcount updates
972
+ preallocation=<str> - Preallocation mode (allowed values: off, metadata, falloc, full)
973
+ refcount_bits=<num> - Width of a reference count entry in bits
974
+ size=<size> - Virtual disk size
975
976
Note that not all of these options may be amendable.
977
978
Testing: amend -f qcow2 -o cluster_size=4k,? TEST_DIR/t.qcow2
979
Creation options for 'qcow2':
980
-size Virtual disk size
981
-compat Compatibility level (0.10 or 1.1)
982
-backing_file File name of a base image
983
-backing_fmt Image format of the base image
984
-encryption Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
985
-encrypt.format Encrypt the image, format choices: 'aes', 'luks'
986
-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
987
-encrypt.cipher-alg Name of encryption cipher algorithm
988
-encrypt.cipher-mode Name of encryption cipher mode
989
-encrypt.ivgen-alg Name of IV generator algorithm
990
-encrypt.ivgen-hash-alg Name of IV generator hash algorithm
991
-encrypt.hash-alg Name of encryption hash algorithm
992
-encrypt.iter-time Time to spend in PBKDF in milliseconds
993
-cluster_size qcow2 cluster size
994
-preallocation Preallocation mode (allowed values: off, metadata, falloc, full)
995
-lazy_refcounts Postpone refcount updates
996
-refcount_bits Width of a reference count entry in bits
997
+ backing_file=<str> - File name of a base image
998
+ backing_fmt=<str> - Image format of the base image
999
+ cluster_size=<size> - qcow2 cluster size
1000
+ compat=<str> - Compatibility level (0.10 or 1.1)
1001
+ encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
1002
+ encrypt.cipher-mode=<str> - Name of encryption cipher mode
1003
+ encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'
1004
+ encrypt.hash-alg=<str> - Name of encryption hash algorithm
1005
+ encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
1006
+ encrypt.ivgen-alg=<str> - Name of IV generator algorithm
1007
+ encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
1008
+ encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
1009
+ encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
1010
+ lazy_refcounts=<bool (on/off)> - Postpone refcount updates
1011
+ preallocation=<str> - Preallocation mode (allowed values: off, metadata, falloc, full)
1012
+ refcount_bits=<num> - Width of a reference count entry in bits
1013
+ size=<size> - Virtual disk size
1014
1015
Note that not all of these options may be amendable.
1016
1017
Testing: amend -f qcow2 -o help,cluster_size=4k TEST_DIR/t.qcow2
1018
Creation options for 'qcow2':
1019
-size Virtual disk size
1020
-compat Compatibility level (0.10 or 1.1)
1021
-backing_file File name of a base image
1022
-backing_fmt Image format of the base image
1023
-encryption Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
1024
-encrypt.format Encrypt the image, format choices: 'aes', 'luks'
1025
-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
1026
-encrypt.cipher-alg Name of encryption cipher algorithm
1027
-encrypt.cipher-mode Name of encryption cipher mode
1028
-encrypt.ivgen-alg Name of IV generator algorithm
1029
-encrypt.ivgen-hash-alg Name of IV generator hash algorithm
1030
-encrypt.hash-alg Name of encryption hash algorithm
1031
-encrypt.iter-time Time to spend in PBKDF in milliseconds
1032
-cluster_size qcow2 cluster size
1033
-preallocation Preallocation mode (allowed values: off, metadata, falloc, full)
1034
-lazy_refcounts Postpone refcount updates
1035
-refcount_bits Width of a reference count entry in bits
1036
+ backing_file=<str> - File name of a base image
1037
+ backing_fmt=<str> - Image format of the base image
1038
+ cluster_size=<size> - qcow2 cluster size
1039
+ compat=<str> - Compatibility level (0.10 or 1.1)
1040
+ encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
1041
+ encrypt.cipher-mode=<str> - Name of encryption cipher mode
1042
+ encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'
1043
+ encrypt.hash-alg=<str> - Name of encryption hash algorithm
1044
+ encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
1045
+ encrypt.ivgen-alg=<str> - Name of IV generator algorithm
1046
+ encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
1047
+ encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
1048
+ encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
1049
+ lazy_refcounts=<bool (on/off)> - Postpone refcount updates
1050
+ preallocation=<str> - Preallocation mode (allowed values: off, metadata, falloc, full)
1051
+ refcount_bits=<num> - Width of a reference count entry in bits
1052
+ size=<size> - Virtual disk size
1053
1054
Note that not all of these options may be amendable.
1055
1056
Testing: amend -f qcow2 -o ?,cluster_size=4k TEST_DIR/t.qcow2
1057
Creation options for 'qcow2':
1058
-size Virtual disk size
1059
-compat Compatibility level (0.10 or 1.1)
1060
-backing_file File name of a base image
1061
-backing_fmt Image format of the base image
1062
-encryption Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
1063
-encrypt.format Encrypt the image, format choices: 'aes', 'luks'
1064
-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
1065
-encrypt.cipher-alg Name of encryption cipher algorithm
1066
-encrypt.cipher-mode Name of encryption cipher mode
1067
-encrypt.ivgen-alg Name of IV generator algorithm
1068
-encrypt.ivgen-hash-alg Name of IV generator hash algorithm
1069
-encrypt.hash-alg Name of encryption hash algorithm
1070
-encrypt.iter-time Time to spend in PBKDF in milliseconds
1071
-cluster_size qcow2 cluster size
1072
-preallocation Preallocation mode (allowed values: off, metadata, falloc, full)
1073
-lazy_refcounts Postpone refcount updates
1074
-refcount_bits Width of a reference count entry in bits
1075
+ backing_file=<str> - File name of a base image
1076
+ backing_fmt=<str> - Image format of the base image
1077
+ cluster_size=<size> - qcow2 cluster size
1078
+ compat=<str> - Compatibility level (0.10 or 1.1)
1079
+ encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
1080
+ encrypt.cipher-mode=<str> - Name of encryption cipher mode
1081
+ encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'
1082
+ encrypt.hash-alg=<str> - Name of encryption hash algorithm
1083
+ encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
1084
+ encrypt.ivgen-alg=<str> - Name of IV generator algorithm
1085
+ encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
1086
+ encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
1087
+ encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
1088
+ lazy_refcounts=<bool (on/off)> - Postpone refcount updates
1089
+ preallocation=<str> - Preallocation mode (allowed values: off, metadata, falloc, full)
1090
+ refcount_bits=<num> - Width of a reference count entry in bits
1091
+ size=<size> - Virtual disk size
1092
1093
Note that not all of these options may be amendable.
1094
1095
Testing: amend -f qcow2 -o cluster_size=4k -o help TEST_DIR/t.qcow2
1096
Creation options for 'qcow2':
1097
-size Virtual disk size
1098
-compat Compatibility level (0.10 or 1.1)
1099
-backing_file File name of a base image
1100
-backing_fmt Image format of the base image
1101
-encryption Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
1102
-encrypt.format Encrypt the image, format choices: 'aes', 'luks'
1103
-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
1104
-encrypt.cipher-alg Name of encryption cipher algorithm
1105
-encrypt.cipher-mode Name of encryption cipher mode
1106
-encrypt.ivgen-alg Name of IV generator algorithm
1107
-encrypt.ivgen-hash-alg Name of IV generator hash algorithm
1108
-encrypt.hash-alg Name of encryption hash algorithm
1109
-encrypt.iter-time Time to spend in PBKDF in milliseconds
1110
-cluster_size qcow2 cluster size
1111
-preallocation Preallocation mode (allowed values: off, metadata, falloc, full)
1112
-lazy_refcounts Postpone refcount updates
1113
-refcount_bits Width of a reference count entry in bits
1114
+ backing_file=<str> - File name of a base image
1115
+ backing_fmt=<str> - Image format of the base image
1116
+ cluster_size=<size> - qcow2 cluster size
1117
+ compat=<str> - Compatibility level (0.10 or 1.1)
1118
+ encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
1119
+ encrypt.cipher-mode=<str> - Name of encryption cipher mode
1120
+ encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'
1121
+ encrypt.hash-alg=<str> - Name of encryption hash algorithm
1122
+ encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
1123
+ encrypt.ivgen-alg=<str> - Name of IV generator algorithm
1124
+ encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
1125
+ encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
1126
+ encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
1127
+ lazy_refcounts=<bool (on/off)> - Postpone refcount updates
1128
+ preallocation=<str> - Preallocation mode (allowed values: off, metadata, falloc, full)
1129
+ refcount_bits=<num> - Width of a reference count entry in bits
1130
+ size=<size> - Virtual disk size
1131
1132
Note that not all of these options may be amendable.
1133
1134
Testing: amend -f qcow2 -o cluster_size=4k -o ? TEST_DIR/t.qcow2
1135
Creation options for 'qcow2':
1136
-size Virtual disk size
1137
-compat Compatibility level (0.10 or 1.1)
1138
-backing_file File name of a base image
1139
-backing_fmt Image format of the base image
1140
-encryption Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
1141
-encrypt.format Encrypt the image, format choices: 'aes', 'luks'
1142
-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
1143
-encrypt.cipher-alg Name of encryption cipher algorithm
1144
-encrypt.cipher-mode Name of encryption cipher mode
1145
-encrypt.ivgen-alg Name of IV generator algorithm
1146
-encrypt.ivgen-hash-alg Name of IV generator hash algorithm
1147
-encrypt.hash-alg Name of encryption hash algorithm
1148
-encrypt.iter-time Time to spend in PBKDF in milliseconds
1149
-cluster_size qcow2 cluster size
1150
-preallocation Preallocation mode (allowed values: off, metadata, falloc, full)
1151
-lazy_refcounts Postpone refcount updates
1152
-refcount_bits Width of a reference count entry in bits
1153
+ backing_file=<str> - File name of a base image
1154
+ backing_fmt=<str> - Image format of the base image
1155
+ cluster_size=<size> - qcow2 cluster size
1156
+ compat=<str> - Compatibility level (0.10 or 1.1)
1157
+ encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
1158
+ encrypt.cipher-mode=<str> - Name of encryption cipher mode
1159
+ encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'
1160
+ encrypt.hash-alg=<str> - Name of encryption hash algorithm
1161
+ encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
1162
+ encrypt.ivgen-alg=<str> - Name of IV generator algorithm
1163
+ encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
1164
+ encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
1165
+ encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
1166
+ lazy_refcounts=<bool (on/off)> - Postpone refcount updates
1167
+ preallocation=<str> - Preallocation mode (allowed values: off, metadata, falloc, full)
1168
+ refcount_bits=<num> - Width of a reference count entry in bits
1169
+ size=<size> - Virtual disk size
1170
1171
Note that not all of these options may be amendable.
1172
1173
@@ -XXX,XX +XXX,XX @@ qemu-img: Invalid option list: ,,
1174
1175
Testing: amend -f qcow2 -o help
1176
Creation options for 'qcow2':
1177
-size Virtual disk size
1178
-compat Compatibility level (0.10 or 1.1)
1179
-backing_file File name of a base image
1180
-backing_fmt Image format of the base image
1181
-encryption Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
1182
-encrypt.format Encrypt the image, format choices: 'aes', 'luks'
1183
-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase
1184
-encrypt.cipher-alg Name of encryption cipher algorithm
1185
-encrypt.cipher-mode Name of encryption cipher mode
1186
-encrypt.ivgen-alg Name of IV generator algorithm
1187
-encrypt.ivgen-hash-alg Name of IV generator hash algorithm
1188
-encrypt.hash-alg Name of encryption hash algorithm
1189
-encrypt.iter-time Time to spend in PBKDF in milliseconds
1190
-cluster_size qcow2 cluster size
1191
-preallocation Preallocation mode (allowed values: off, metadata, falloc, full)
1192
-lazy_refcounts Postpone refcount updates
1193
-refcount_bits Width of a reference count entry in bits
1194
+ backing_file=<str> - File name of a base image
1195
+ backing_fmt=<str> - Image format of the base image
1196
+ cluster_size=<size> - qcow2 cluster size
1197
+ compat=<str> - Compatibility level (0.10 or 1.1)
1198
+ encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
1199
+ encrypt.cipher-mode=<str> - Name of encryption cipher mode
1200
+ encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'
1201
+ encrypt.hash-alg=<str> - Name of encryption hash algorithm
1202
+ encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds
1203
+ encrypt.ivgen-alg=<str> - Name of IV generator algorithm
1204
+ encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm
1205
+ encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase
1206
+ encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
1207
+ lazy_refcounts=<bool (on/off)> - Postpone refcount updates
1208
+ preallocation=<str> - Preallocation mode (allowed values: off, metadata, falloc, full)
1209
+ refcount_bits=<num> - Width of a reference count entry in bits
1210
+ size=<size> - Virtual disk size
1211
1212
Note that not all of these options may be amendable.
1213
1214
Testing: convert -o help
1215
Supported options:
1216
-size Virtual disk size
1217
+ size=<size> - Virtual disk size
1218
1219
Testing: amend -f bochs -o help
1220
qemu-img: Format driver 'bochs' does not support option amendment
102
--
1221
--
103
2.13.6
1222
2.19.1
104
1223
105
1224
diff view generated by jsdifflib
New patch
1
From: Max Reitz <mreitz@redhat.com>
1
2
3
Following the example of qemu_opts_print_help(), indent all entries in
4
the list of character devices.
5
6
Signed-off-by: Max Reitz <mreitz@redhat.com>
7
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
8
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
9
---
10
chardev/char.c | 2 +-
11
1 file changed, 1 insertion(+), 1 deletion(-)
12
13
diff --git a/chardev/char.c b/chardev/char.c
14
index XXXXXXX..XXXXXXX 100644
15
--- a/chardev/char.c
16
+++ b/chardev/char.c
17
@@ -XXX,XX +XXX,XX @@ help_string_append(const char *name, void *opaque)
18
{
19
GString *str = opaque;
20
21
- g_string_append_printf(str, "\n%s", name);
22
+ g_string_append_printf(str, "\n %s", name);
23
}
24
25
static const char *chardev_alias_translate(const char *name)
26
--
27
2.19.1
28
29
diff view generated by jsdifflib
New patch
1
From: Max Reitz <mreitz@redhat.com>
1
2
3
Just like in qemu_opts_print_help(), print the device name as a caption
4
instead of on every single line, indent all options, add angle brackets
5
around types, and align the descriptions after 24 characters. Also,
6
separate the descriptions with " - " instead of putting them in
7
parentheses, because that is what we do everywhere else. This does look
8
a bit funny here because basically all bits have the description
9
"on/off", but funny does not mean it is less readable.
10
11
Signed-off-by: Max Reitz <mreitz@redhat.com>
12
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
13
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
14
---
15
qdev-monitor.c | 13 +++++++++++--
16
1 file changed, 11 insertions(+), 2 deletions(-)
17
18
diff --git a/qdev-monitor.c b/qdev-monitor.c
19
index XXXXXXX..XXXXXXX 100644
20
--- a/qdev-monitor.c
21
+++ b/qdev-monitor.c
22
@@ -XXX,XX +XXX,XX @@ int qdev_device_help(QemuOpts *opts)
23
goto error;
24
}
25
26
+ if (prop_list) {
27
+ out_printf("%s options:\n", driver);
28
+ } else {
29
+ out_printf("There are no options for %s.\n", driver);
30
+ }
31
for (prop = prop_list; prop; prop = prop->next) {
32
- out_printf("%s.%s=%s", driver, prop->value->name, prop->value->type);
33
+ int len;
34
+ out_printf(" %s=<%s>%n", prop->value->name, prop->value->type, &len);
35
if (prop->value->has_description) {
36
- out_printf(" (%s)\n", prop->value->description);
37
+ if (len < 24) {
38
+ out_printf("%*s", 24 - len, "");
39
+ }
40
+ out_printf(" - %s\n", prop->value->description);
41
} else {
42
out_printf("\n");
43
}
44
--
45
2.19.1
46
47
diff view generated by jsdifflib
1
From: Alberto Garcia <berto@igalia.com>
1
From: Max Reitz <mreitz@redhat.com>
2
2
3
This function returns a BDS's driver-specific options, excluding also
3
Just like in qemu_opts_print_help(), print the object name as a caption
4
those from its children. Since we have just removed all children
4
instead of on every single line, indent all options, add angle brackets
5
options from bs->options there's no need to do this last step.
5
around types, and align the descriptions after 24 characters.
6
6
7
We allow references to children, though ("backing": "node0"), so those
7
Also, indent every object name in the list of available objects.
8
we still have to remove.
9
8
10
Signed-off-by: Alberto Garcia <berto@igalia.com>
9
Signed-off-by: Max Reitz <mreitz@redhat.com>
10
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
11
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
11
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
12
---
12
---
13
block.c | 7 ++-----
13
vl.c | 13 ++++++++++---
14
1 file changed, 2 insertions(+), 5 deletions(-)
14
1 file changed, 10 insertions(+), 3 deletions(-)
15
15
16
diff --git a/block.c b/block.c
16
diff --git a/vl.c b/vl.c
17
index XXXXXXX..XXXXXXX 100644
17
index XXXXXXX..XXXXXXX 100644
18
--- a/block.c
18
--- a/vl.c
19
+++ b/block.c
19
+++ b/vl.c
20
@@ -XXX,XX +XXX,XX @@ static bool append_open_options(QDict *d, BlockDriverState *bs)
20
@@ -XXX,XX +XXX,XX @@ static bool object_create_initial(const char *type, QemuOpts *opts)
21
QemuOptDesc *desc;
21
list = object_class_get_list_sorted(TYPE_USER_CREATABLE, false);
22
BdrvChild *child;
22
for (l = list; l != NULL; l = l->next) {
23
bool found_any = false;
23
ObjectClass *oc = OBJECT_CLASS(l->data);
24
- const char *p;
24
- printf("%s\n", object_class_get_name(oc));
25
25
+ printf(" %s\n", object_class_get_name(oc));
26
for (entry = qdict_first(bs->options); entry;
26
}
27
entry = qdict_next(bs->options, entry))
27
g_slist_free(list);
28
{
28
exit(0);
29
- /* Exclude options for children */
29
@@ -XXX,XX +XXX,XX @@ static bool object_create_initial(const char *type, QemuOpts *opts)
30
+ /* Exclude node-name references to children */
31
QLIST_FOREACH(child, &bs->children, next) {
32
- if (strstart(qdict_entry_key(entry), child->name, &p)
33
- && (!*p || *p == '.'))
34
- {
35
+ if (!strcmp(entry->key, child->name)) {
36
break;
37
}
30
}
31
32
str = g_string_new(NULL);
33
- g_string_append_printf(str, "%s.%s=%s", type,
34
- prop->name, prop->type);
35
+ g_string_append_printf(str, " %s=<%s>", prop->name, prop->type);
36
if (prop->description) {
37
+ if (str->len < 24) {
38
+ g_string_append_printf(str, "%*s", 24 - (int)str->len, "");
39
+ }
40
g_string_append_printf(str, " - %s", prop->description);
41
}
42
g_ptr_array_add(array, g_string_free(str, false));
43
}
44
g_ptr_array_sort(array, (GCompareFunc)qemu_pstrcmp0);
45
+ if (array->len > 0) {
46
+ printf("%s options:\n", type);
47
+ } else {
48
+ printf("There are no options for %s.\n", type);
49
+ }
50
for (i = 0; i < array->len; i++) {
51
printf("%s\n", (char *)array->pdata[i]);
38
}
52
}
39
--
53
--
40
2.13.6
54
2.19.1
41
55
42
56
diff view generated by jsdifflib
New patch
1
From: Max Reitz <mreitz@redhat.com>
1
2
3
There is no good reason why there should be a newline in this
4
description, so remove it.
5
6
Signed-off-by: Max Reitz <mreitz@redhat.com>
7
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
8
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
9
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
10
---
11
vl.c | 2 +-
12
1 file changed, 1 insertion(+), 1 deletion(-)
13
14
diff --git a/vl.c b/vl.c
15
index XXXXXXX..XXXXXXX 100644
16
--- a/vl.c
17
+++ b/vl.c
18
@@ -XXX,XX +XXX,XX @@ static QemuOptsList qemu_fw_cfg_opts = {
19
}, {
20
.name = "file",
21
.type = QEMU_OPT_STRING,
22
- .help = "Sets the name of the file from which\n"
23
+ .help = "Sets the name of the file from which "
24
"the fw_cfg blob will be loaded",
25
}, {
26
.name = "string",
27
--
28
2.19.1
29
30
diff view generated by jsdifflib
1
From: Peter Krempa <pkrempa@redhat.com>
1
From: Leonid Bloch <lbloch@janustech.com>
2
2
3
Most of the various error classes were removed prior to the 1.2 release.
3
If an expression is used to define DEFAULT_CLUSTER_SIZE, when compiled,
4
Remove mentions of the error classes which did not make it.
4
it will be embedded as a literal expression in the binary (as the
5
default value) because it is stringified to mark the size of the default
6
value. Now this is fixed by using a defined number to define this value.
5
7
6
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
8
Signed-off-by: Leonid Bloch <lbloch@janustech.com>
9
Reviewed-by: Stefan Weil <sw@weilnetz.de>
7
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
10
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
8
---
11
---
9
qapi/block-core.json | 5 +----
12
block/vdi.c | 4 ++--
10
1 file changed, 1 insertion(+), 4 deletions(-)
13
1 file changed, 2 insertions(+), 2 deletions(-)
11
14
12
diff --git a/qapi/block-core.json b/qapi/block-core.json
15
diff --git a/block/vdi.c b/block/vdi.c
13
index XXXXXXX..XXXXXXX 100644
16
index XXXXXXX..XXXXXXX 100644
14
--- a/qapi/block-core.json
17
--- a/block/vdi.c
15
+++ b/qapi/block-core.json
18
+++ b/block/vdi.c
16
@@ -XXX,XX +XXX,XX @@
19
@@ -XXX,XX +XXX,XX @@
17
# autogenerated. (Since: 2.9)
20
#define BLOCK_OPT_STATIC "static"
18
#
21
19
# Returns: Nothing on success
22
#define SECTOR_SIZE 512
20
-# If commit or stream is already active on this device, DeviceInUse
23
-#define DEFAULT_CLUSTER_SIZE (1 * MiB)
21
# If @device does not exist, DeviceNotFound
24
+#define DEFAULT_CLUSTER_SIZE S_1MiB
22
-# If image commit is not supported by this device, NotSupported
25
23
-# If @base or @top is invalid, a generic error is returned
26
#if defined(CONFIG_VDI_DEBUG)
24
-# If @speed is invalid, InvalidParameter
27
#define VDI_DEBUG 1
25
+# Any other error returns a GenericError.
28
@@ -XXX,XX +XXX,XX @@ static int vdi_open(BlockDriverState *bs, QDict *options, int flags,
26
#
29
goto fail;
27
# Since: 1.3
30
} else if (header.block_size != DEFAULT_CLUSTER_SIZE) {
28
#
31
error_setg(errp, "unsupported VDI image (block size %" PRIu32
32
- " is not %" PRIu64 ")",
33
+ " is not %" PRIu32 ")",
34
header.block_size, DEFAULT_CLUSTER_SIZE);
35
ret = -ENOTSUP;
36
goto fail;
29
--
37
--
30
2.13.6
38
2.19.1
31
39
32
40
diff view generated by jsdifflib
1
From: Fam Zheng <famz@redhat.com>
1
From: Leonid Bloch <lbloch@janustech.com>
2
2
3
Format drivers such as qcow2 don't allow sharing the same image between
3
The lookup table for power-of-two sizes was added in commit 540b8492618eb
4
two QEMU instances in order to prevent image corruptions, because of
4
for the purpose of having convenient shortcuts for these sizes in cases
5
metadata cache. LUKS driver don't modify metadata except for when
5
when the literal number has to be present at compile time, and
6
creating image, so it is safe to relax the permission. This makes
6
expressions as '(1 * KiB)' can not be used. One such case is the
7
share-rw=on property work on virtual devices.
7
stringification of sizes. Beyond that, it is convenient to use these
8
shortcuts for all power-of-two sizes, even if they don't have to be
9
literal numbers.
8
10
9
Suggested-by: Daniel P. Berrangé <berrange@redhat.com>
11
Despite its convenience, this table introduced 55 lines of "dumb" code,
10
Signed-off-by: Fam Zheng <famz@redhat.com>
12
the purpose and origin of which are obscure without reading the message
11
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
13
of the commit which introduced it. This patch fixes that by adding a
14
comment to the code itself with a brief explanation for the reasoning
15
behind this table. This comment includes the short AWK script that
16
generated the table, so that anyone who's interested could make sure
17
that the values in it are correct (otherwise these values look as if
18
they were typed manually).
19
20
Signed-off-by: Leonid Bloch <lbloch@janustech.com>
12
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
21
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
13
---
22
---
14
block/crypto.c | 4 +++-
23
include/qemu/units.h | 18 ++++++++++++++++++
15
1 file changed, 3 insertions(+), 1 deletion(-)
24
1 file changed, 18 insertions(+)
16
25
17
diff --git a/block/crypto.c b/block/crypto.c
26
diff --git a/include/qemu/units.h b/include/qemu/units.h
18
index XXXXXXX..XXXXXXX 100644
27
index XXXXXXX..XXXXXXX 100644
19
--- a/block/crypto.c
28
--- a/include/qemu/units.h
20
+++ b/block/crypto.c
29
+++ b/include/qemu/units.h
21
@@ -XXX,XX +XXX,XX @@ BlockDriver bdrv_crypto_luks = {
30
@@ -XXX,XX +XXX,XX @@
22
.bdrv_probe = block_crypto_probe_luks,
31
#define PiB (INT64_C(1) << 50)
23
.bdrv_open = block_crypto_open_luks,
32
#define EiB (INT64_C(1) << 60)
24
.bdrv_close = block_crypto_close,
33
25
- .bdrv_child_perm = bdrv_format_default_perms,
34
+/*
26
+ /* This driver doesn't modify LUKS metadata except when creating image.
35
+ * The following lookup table is intended to be used when a literal string of
27
+ * Allow share-rw=on as a special case. */
36
+ * the number of bytes is required (for example if it needs to be stringified).
28
+ .bdrv_child_perm = bdrv_filter_default_perms,
37
+ * It can also be used for generic shortcuts of power-of-two sizes.
29
.bdrv_co_create = block_crypto_co_create_luks,
38
+ * This table is generated using the AWK script below:
30
.bdrv_co_create_opts = block_crypto_co_create_opts_luks,
39
+ *
31
.bdrv_co_truncate = block_crypto_co_truncate,
40
+ * BEGIN {
41
+ * suffix="KMGTPE";
42
+ * for(i=10; i<64; i++) {
43
+ * val=2**i;
44
+ * s=substr(suffix, int(i/10), 1);
45
+ * n=2**(i%10);
46
+ * pad=21-int(log(n)/log(10));
47
+ * printf("#define S_%d%siB %*d\n", n, s, pad, val);
48
+ * }
49
+ * }
50
+ */
51
+
52
#define S_1KiB 1024
53
#define S_2KiB 2048
54
#define S_4KiB 4096
32
--
55
--
33
2.13.6
56
2.19.1
34
57
35
58
diff view generated by jsdifflib