[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 19/29] qemu-storage-daemon: Add --chardev option
From: |
Kevin Wolf |
Subject: |
[PULL 19/29] qemu-storage-daemon: Add --chardev option |
Date: |
Fri, 6 Mar 2020 18:14:48 +0100 |
This adds a --chardev option to the storage daemon that works the same
as the -chardev option of the system emulator.
The syntax of the --chardev option is still considered unstable. We want
to QAPIfy it and will potentially make changes to its syntax while
converting it. However, we haven't decided yet on a design for the
QAPIfication, so QemuOpts will have to do for now.
Signed-off-by: Kevin Wolf <address@hidden>
Message-Id: <address@hidden>
Acked-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
qemu-storage-daemon.c | 24 ++++++++++++++++++++++++
Makefile | 2 +-
2 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/qemu-storage-daemon.c b/qemu-storage-daemon.c
index 14093ac3a0..82fe6cd5f2 100644
--- a/qemu-storage-daemon.c
+++ b/qemu-storage-daemon.c
@@ -29,6 +29,7 @@
#include "block/block.h"
#include "block/nbd.h"
+#include "chardev/char.h"
#include "crypto/init.h"
#include "qapi/error.h"
@@ -78,6 +79,9 @@ static void help(void)
" [,driver specific parameters...]\n"
" configure a block backend\n"
"\n"
+" --chardev <options> configure a character device backend\n"
+" (see the qemu(1) man page for possible options)\n"
+"\n"
" --export [type=]nbd,device=<node-name>[,name=<export-name>]\n"
" [,writable=on|off][,bitmap=<name>]\n"
" export the specified block node over NBD\n"
@@ -104,11 +108,14 @@ QEMU_HELP_BOTTOM "\n",
enum {
OPTION_BLOCKDEV = 256,
+ OPTION_CHARDEV,
OPTION_EXPORT,
OPTION_NBD_SERVER,
OPTION_OBJECT,
};
+extern QemuOptsList qemu_chardev_opts;
+
static QemuOptsList qemu_object_opts = {
.name = "object",
.implied_opt_name = "qom-type",
@@ -135,6 +142,7 @@ static void process_options(int argc, char *argv[])
static const struct option long_options[] = {
{"blockdev", required_argument, NULL, OPTION_BLOCKDEV},
+ {"chardev", required_argument, NULL, OPTION_CHARDEV},
{"export", required_argument, NULL, OPTION_EXPORT},
{"help", no_argument, NULL, 'h'},
{"nbd-server", required_argument, NULL, OPTION_NBD_SERVER},
@@ -182,6 +190,22 @@ static void process_options(int argc, char *argv[])
qapi_free_BlockdevOptions(options);
break;
}
+ case OPTION_CHARDEV:
+ {
+ /* TODO This interface is not stable until we QAPIfy it */
+ QemuOpts *opts = qemu_opts_parse_noisily(&qemu_chardev_opts,
+ optarg, true);
+ if (opts == NULL) {
+ exit(EXIT_FAILURE);
+ }
+
+ if (!qemu_chr_new_from_opts(opts, NULL, &error_fatal)) {
+ /* No error, but NULL returned means help was printed */
+ exit(EXIT_SUCCESS);
+ }
+ qemu_opts_del(opts);
+ break;
+ }
case OPTION_EXPORT:
{
Visitor *v;
diff --git a/Makefile b/Makefile
index 7c75440182..05a74c77b2 100644
--- a/Makefile
+++ b/Makefile
@@ -589,7 +589,7 @@ qemu-img.o: qemu-img-cmds.h
qemu-img$(EXESUF): qemu-img.o $(authz-obj-y) $(block-obj-y) $(crypto-obj-y)
$(io-obj-y) $(qom-obj-y) $(COMMON_LDADDS)
qemu-nbd$(EXESUF): qemu-nbd.o $(authz-obj-y) $(block-obj-y) $(crypto-obj-y)
$(io-obj-y) $(qom-obj-y) $(COMMON_LDADDS)
qemu-io$(EXESUF): qemu-io.o $(authz-obj-y) $(block-obj-y) $(crypto-obj-y)
$(io-obj-y) $(qom-obj-y) $(COMMON_LDADDS)
-qemu-storage-daemon$(EXESUF): qemu-storage-daemon.o $(authz-obj-y)
$(block-obj-y) $(crypto-obj-y) $(io-obj-y) $(qom-obj-y) $(storage-daemon-obj-y)
$(COMMON_LDADDS)
+qemu-storage-daemon$(EXESUF): qemu-storage-daemon.o $(authz-obj-y)
$(block-obj-y) $(crypto-obj-y) $(chardev-obj-y) $(io-obj-y) $(qom-obj-y)
$(storage-daemon-obj-y) $(COMMON_LDADDS)
qemu-bridge-helper$(EXESUF): qemu-bridge-helper.o $(COMMON_LDADDS)
--
2.20.1
- [PULL 04/29] block: Fix leak in bdrv_create_file_fallback(), (continued)
- [PULL 04/29] block: Fix leak in bdrv_create_file_fallback(), Kevin Wolf, 2020/03/06
- [PULL 03/29] iotests/026: Test EIO on allocation in a data-file, Kevin Wolf, 2020/03/06
- [PULL 01/29] qcow2: Fix alloc_cluster_abort() for pre-existing clusters, Kevin Wolf, 2020/03/06
- [PULL 07/29] qemu-storage-daemon: Add barebone tool, Kevin Wolf, 2020/03/06
- [PULL 08/29] stubs: Add arch_type, Kevin Wolf, 2020/03/06
- [PULL 14/29] qemu-storage-daemon: Add --object option, Kevin Wolf, 2020/03/06
- [PULL 06/29] block/qcow2: Move bitmap reopen into bdrv_reopen_commit_post, Kevin Wolf, 2020/03/06
- [PULL 16/29] blockdev-nbd: Boxed argument type for nbd-server-add, Kevin Wolf, 2020/03/06
- [PULL 13/29] qapi: Flatten object-add, Kevin Wolf, 2020/03/06
- [PULL 15/29] qemu-storage-daemon: Add --nbd-server option, Kevin Wolf, 2020/03/06
- [PULL 19/29] qemu-storage-daemon: Add --chardev option,
Kevin Wolf <=
- [PULL 18/29] qemu-storage-daemon: Add main loop, Kevin Wolf, 2020/03/06
- [PULL 22/29] monitor: Create QAPIfied monitor_init(), Kevin Wolf, 2020/03/06
- [PULL 21/29] qapi: Create 'pragma' module, Kevin Wolf, 2020/03/06
- [PULL 10/29] block: Move common QMP commands to block-core QAPI module, Kevin Wolf, 2020/03/06
- [PULL 12/29] qemu-storage-daemon: Add --blockdev option, Kevin Wolf, 2020/03/06
- [PULL 20/29] stubs: Update monitor stubs for qemu-storage-daemon, Kevin Wolf, 2020/03/06
- [PULL 25/29] monitor: Add allow_hmp parameter to monitor_init(), Kevin Wolf, 2020/03/06
- [PULL 24/29] hmp: Fail gracefully if chardev is already in use, Kevin Wolf, 2020/03/06
- [PULL 09/29] block: Move system emulator QMP commands to block/qapi-sysemu.c, Kevin Wolf, 2020/03/06
- [PULL 17/29] qemu-storage-daemon: Add --export option, Kevin Wolf, 2020/03/06