[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 21/24] block: Initial implementation of -blockdev
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL v2 21/24] block: Initial implementation of -blockdev |
Date: |
Mon, 6 Mar 2017 15:11:52 +0100 |
The new command line option -blockdev works like QMP command
blockdev-add.
The option argument may be given in JSON syntax, exactly as in QMP.
Example usage:
-blockdev '{"node-name": "foo", "driver": "raw", "file": {"driver": "file",
"filename": "foo.img"} }'
The JSON argument doesn't exactly blend into the existing option
syntax, so the traditional KEY=VALUE,... syntax is also supported,
using dotted keys to do the nesting:
-blockdev node-name=foo,driver=raw,file.driver=file,file.filename=foo.img
This does not yet support lists or downstream extensions, i.e. keys
with __RFQDN_ prefix, but the next few patches will take care of that.
Note that calling qmp_blockdev_add() (say via qmp_marshal_block_add())
right away would crash. We need to stash the configuration for later
instead. This is crudely done, and bypasses QemuOpts, even though
storing configuration is what QemuOpts is for. Need to revamp option
infrastructure to support QAPI types like BlockdevOptions.
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
---
qemu-options.hx | 7 +++++++
vl.c | 39 +++++++++++++++++++++++++++++++++++++++
2 files changed, 46 insertions(+)
diff --git a/qemu-options.hx b/qemu-options.hx
index 2292438..8dd8ee3 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -550,6 +550,13 @@ Use @var{file} as CD-ROM image (you cannot use
@option{-hdc} and
using @file{/dev/cdrom} as filename (@pxref{host_drives}).
ETEXI
+DEF("blockdev", HAS_ARG, QEMU_OPTION_blockdev,
+ "-blockdev [driver=]driver[,node-name=N][,discard=ignore|unmap]\n"
+ " [,cache.direct=on|off][,cache.no-flush=on|off]\n"
+ " [,read-only=on|off][,detect-zeroes=on|off|unmap]\n"
+ " [,driver specific parameters...]\n"
+ " configure a block backend\n", QEMU_ARCH_ALL)
+
DEF("drive", HAS_ARG, QEMU_OPTION_drive,
"-drive [file=file][,if=type][,bus=n][,unit=m][,media=d][,index=i]\n"
" [,cyls=c,heads=h,secs=s[,trans=t]][,snapshot=on|off]\n"
diff --git a/vl.c b/vl.c
index 71b75ef..7f1644a 100644
--- a/vl.c
+++ b/vl.c
@@ -95,6 +95,9 @@ int main(int argc, char **argv)
#include "migration/colo.h"
#include "sysemu/kvm.h"
#include "sysemu/hax.h"
+#include "qapi/qobject-input-visitor.h"
+#include "qapi/qobject-input-visitor.h"
+#include "qapi-visit.h"
#include "qapi/qmp/qjson.h"
#include "qemu/option.h"
#include "qemu/config-file.h"
@@ -2976,6 +2979,13 @@ int main(int argc, char **argv, char **envp)
Error *main_loop_err = NULL;
Error *err = NULL;
bool list_data_dirs = false;
+ typedef struct BlockdevOptions_queue {
+ BlockdevOptions *bdo;
+ Location loc;
+ QSIMPLEQ_ENTRY(BlockdevOptions_queue) entry;
+ } BlockdevOptions_queue;
+ QSIMPLEQ_HEAD(, BlockdevOptions_queue) bdo_queue
+ = QSIMPLEQ_HEAD_INITIALIZER(bdo_queue);
module_call_init(MODULE_INIT_TRACE);
@@ -3118,6 +3128,25 @@ int main(int argc, char **argv, char **envp)
drive_add(IF_DEFAULT, popt->index - QEMU_OPTION_hda, optarg,
HD_OPTS);
break;
+ case QEMU_OPTION_blockdev:
+ {
+ Visitor *v;
+ BlockdevOptions_queue *bdo;
+
+ v = qobject_input_visitor_new_str(optarg, "driver", &err);
+ if (!v) {
+ error_report_err(err);
+ exit(1);
+ }
+
+ bdo = g_new(BlockdevOptions_queue, 1);
+ visit_type_BlockdevOptions(v, NULL, &bdo->bdo,
+ &error_fatal);
+ visit_free(v);
+ loc_save(&bdo->loc);
+ QSIMPLEQ_INSERT_TAIL(&bdo_queue, bdo, entry);
+ break;
+ }
case QEMU_OPTION_drive:
if (drive_def(optarg) == NULL) {
exit(1);
@@ -4451,6 +4480,16 @@ int main(int argc, char **argv, char **envp)
}
/* open the virtual block devices */
+ while (!QSIMPLEQ_EMPTY(&bdo_queue)) {
+ BlockdevOptions_queue *bdo = QSIMPLEQ_FIRST(&bdo_queue);
+
+ QSIMPLEQ_REMOVE_HEAD(&bdo_queue, entry);
+ loc_push_restore(&bdo->loc);
+ qmp_blockdev_add(bdo->bdo, &error_fatal);
+ loc_pop(&bdo->loc);
+ qapi_free_BlockdevOptions(bdo->bdo);
+ g_free(bdo);
+ }
if (snapshot || replay_mode != REPLAY_MODE_NONE) {
qemu_opts_foreach(qemu_find_opts("drive"), drive_enable_snapshot,
NULL, NULL);
--
2.7.4
- [Qemu-devel] [PULL v2 19/24] keyval: Restrict key components to valid QAPI names, (continued)
- [Qemu-devel] [PULL v2 19/24] keyval: Restrict key components to valid QAPI names, Markus Armbruster, 2017/03/06
- [Qemu-devel] [PULL v2 10/24] qjson: Abort earlier on qobject_from_jsonf() misuse, Markus Armbruster, 2017/03/06
- [Qemu-devel] [PULL v2 09/24] libqtest: Fix qmp() & friends to abort on JSON parse errors, Markus Armbruster, 2017/03/06
- [Qemu-devel] [PULL v2 15/24] test-visitor-serialization: Pass &error_abort to qobject_from_json(), Markus Armbruster, 2017/03/06
- [Qemu-devel] [PULL v2 12/24] qobject: Propagate parse errors through qobject_from_json(), Markus Armbruster, 2017/03/06
- [Qemu-devel] [PULL v2 11/24] test-qobject-input-visitor: Abort earlier on bad test input, Markus Armbruster, 2017/03/06
- [Qemu-devel] [PULL v2 22/24] qapi: Improve how keyval input visitor reports unexpected dicts, Markus Armbruster, 2017/03/06
- [Qemu-devel] [PULL v2 05/24] test-keyval: Cover use with qobject input visitor, Markus Armbruster, 2017/03/06
- [Qemu-devel] [PULL v2 04/24] qapi: qobject input visitor variant for use with keyval_parse(), Markus Armbruster, 2017/03/06
- [Qemu-devel] [PULL v2 17/24] test-qapi-util: New, covering qapi/qapi-util.c, Markus Armbruster, 2017/03/06
- [Qemu-devel] [PULL v2 21/24] block: Initial implementation of -blockdev,
Markus Armbruster <=
- [Qemu-devel] [PULL v2 24/24] keyval: Support lists, Markus Armbruster, 2017/03/06
- [Qemu-devel] [PULL v2 03/24] keyval: New keyval_parse(), Markus Armbruster, 2017/03/06
- [Qemu-devel] [PULL v2 20/24] qapi: New qobject_input_visitor_new_str() for convenience, Markus Armbruster, 2017/03/06
- [Qemu-devel] [PULL v2 02/24] tests: Fix gcov-files-test-qemu-opts-y, gcov-files-test-logging-y, Markus Armbruster, 2017/03/06
- [Qemu-devel] [PULL v2 07/24] qapi: Factor out common qobject_input_get_keyval(), Markus Armbruster, 2017/03/06
- [Qemu-devel] [PULL v2 14/24] check-qjson: Test errors from qobject_from_json(), Markus Armbruster, 2017/03/06
- [Qemu-devel] [PULL v2 23/24] docs/qapi-code-gen.txt: Clarify naming rules, Markus Armbruster, 2017/03/06
- Re: [Qemu-devel] [PULL v2 00/24] block: Command line option -blockdev, no-reply, 2017/03/06
- Re: [Qemu-devel] [PULL v2 00/24] block: Command line option -blockdev, Peter Maydell, 2017/03/06