diff options
| author | Markus Armbruster | 2022-09-30 19:19:08 +0200 |
|---|---|---|
| committer | Kevin Wolf | 2022-10-07 12:11:40 +0200 |
| commit | 34f58df51daf49863077d2b809f08510a20b4d9a (patch) | |
| tree | 60f3ae0e2e157f425212ecc9d1d131a663971d93 | |
| parent | Merge tag 'pull-testing-gdbstub-plugins-gitdm-061022-3' of https://github.com... (diff) | |
| download | qemu-34f58df51daf49863077d2b809f08510a20b4d9a.tar.gz qemu-34f58df51daf49863077d2b809f08510a20b4d9a.tar.xz qemu-34f58df51daf49863077d2b809f08510a20b4d9a.zip | |
Revert "qapi: fix examples of blockdev-add with qcow2"
This reverts commit b6522938327141235b97ab38e40c6c4512587373.
Kevin Wolf NAKed this patch, because:
'file' is a required member (defined in BlockdevOptionsGenericFormat),
removing it makes the example invalid. 'data-file' is only an additional
optional member to be used for external data files (i.e. when the guest
data is kept separate from the metadata in the .qcow2 file).
However, it had already been merged then. Revert.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20220930171908.846769-1-armbru@redhat.com>
Reviewed-by: Victor Toso <victortoso@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
| -rw-r--r-- | qapi/block-core.json | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/qapi/block-core.json b/qapi/block-core.json index f21fa235f2..882b266532 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -1541,8 +1541,8 @@ # -> { "execute": "blockdev-add", # "arguments": { "driver": "qcow2", # "node-name": "node1534", -# "data-file": { "driver": "file", -# "filename": "hd1.qcow2" }, +# "file": { "driver": "file", +# "filename": "hd1.qcow2" }, # "backing": null } } # # <- { "return": {} } @@ -4378,7 +4378,7 @@ # "arguments": { # "driver": "qcow2", # "node-name": "test1", -# "data-file": { +# "file": { # "driver": "file", # "filename": "test.qcow2" # } @@ -4395,7 +4395,7 @@ # "cache": { # "direct": true # }, -# "data-file": { +# "file": { # "driver": "file", # "filename": "/tmp/test.qcow2" # }, @@ -4477,7 +4477,7 @@ # "arguments": { # "driver": "qcow2", # "node-name": "node0", -# "data-file": { +# "file": { # "driver": "file", # "filename": "test.qcow2" # } |