[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [FOR 0.12 PATCH v3 15/21] chardev: make chardevs specified
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [FOR 0.12 PATCH v3 15/21] chardev: make chardevs specified in config file work. |
Date: |
Mon, 7 Dec 2009 13:42:47 +0100 |
The patch decuples the -chardev switch and the actual chardev
initialization. Without this patch qemu ignores chardev entries
coming via -readconfig.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
vl.c | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/vl.c b/vl.c
index 4551ee8..701b687 100644
--- a/vl.c
+++ b/vl.c
@@ -4620,6 +4620,16 @@ static int device_init_func(QemuOpts *opts, void *opaque)
return 0;
}
+static int chardev_init_func(QemuOpts *opts, void *opaque)
+{
+ CharDriverState *chr;
+
+ chr = qemu_chr_open_opts(opts, NULL);
+ if (!chr)
+ return -1;
+ return 0;
+}
+
struct device_config {
enum {
DEV_USB, /* -usbdevice */
@@ -5240,9 +5250,6 @@ int main(int argc, char **argv, char **envp)
fprintf(stderr, "parse error: %s\n", optarg);
exit(1);
}
- if (qemu_chr_open_opts(opts, NULL) == NULL) {
- exit(1);
- }
break;
case QEMU_OPTION_serial:
add_device_config(DEV_SERIAL, optarg);
@@ -5553,6 +5560,9 @@ int main(int argc, char **argv, char **envp)
qemu_opts_foreach(&qemu_device_opts, default_driver_check, NULL, 0);
+ if (qemu_opts_foreach(&qemu_chardev_opts, chardev_init_func, NULL, 1) != 0)
+ exit(1);
+
if (display_type == DT_NOGRAPHIC) {
if (default_parallel)
add_device_config(DEV_PARALLEL, "null");
--
1.6.5.2
- [Qemu-devel] Re: [FOR 0.12 PATCH v3 05/21] default devices: core code & serial lines., (continued)
- [Qemu-devel] [FOR 0.12 PATCH v3 11/21] default devices: network, Gerd Hoffmann, 2009/12/07
- [Qemu-devel] [FOR 0.12 PATCH v3 12/21] default devices: drives, Gerd Hoffmann, 2009/12/07
- [Qemu-devel] [FOR 0.12 PATCH v3 08/21] zap serial_monitor_mux, Gerd Hoffmann, 2009/12/07
- [Qemu-devel] [FOR 0.12 PATCH v3 09/21] default devices: vga adapter., Gerd Hoffmann, 2009/12/07
- [Qemu-devel] [FOR 0.12 PATCH v3 07/21] default devices: qemu monitor., Gerd Hoffmann, 2009/12/07
- [Qemu-devel] [FOR 0.12 PATCH v3 10/21] default devices: add global cmd line option., Gerd Hoffmann, 2009/12/07
- [Qemu-devel] [FOR 0.12 PATCH v3 15/21] chardev: make chardevs specified in config file work.,
Gerd Hoffmann <=
- [Qemu-devel] [FOR 0.12 PATCH v3 06/21] default devices: parallel port., Gerd Hoffmann, 2009/12/07
- [Qemu-devel] [FOR 0.12 PATCH v3 13/21] qdev: make compat stuff more generic, Gerd Hoffmann, 2009/12/07
- [Qemu-devel] [FOR 0.12 PATCH v3 20/21] default devices: virtio consoles., Gerd Hoffmann, 2009/12/07
- [Qemu-devel] [FOR 0.12 PATCH v3 16/21] un-static qemu_chr_parse_compat(), Gerd Hoffmann, 2009/12/07
- [Qemu-devel] [FOR 0.12 PATCH v3 17/21] rework -monitor handling, switch to QemuOpts, Gerd Hoffmann, 2009/12/07