From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NHcwv-0005Q9-Gq for qemu-devel@nongnu.org; Mon, 07 Dec 2009 07:44:21 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NHcwn-0005Kw-RK for qemu-devel@nongnu.org; Mon, 07 Dec 2009 07:44:19 -0500 Received: from [199.232.76.173] (port=58682 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NHcwm-0005KH-UP for qemu-devel@nongnu.org; Mon, 07 Dec 2009 07:44:12 -0500 Received: from mx1.redhat.com ([209.132.183.28]:41740) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NHcwm-0000gt-F2 for qemu-devel@nongnu.org; Mon, 07 Dec 2009 07:44:12 -0500 From: Gerd Hoffmann Date: Mon, 7 Dec 2009 13:42:47 +0100 Message-Id: <1260189773-20728-16-git-send-email-kraxel@redhat.com> In-Reply-To: <1260189773-20728-1-git-send-email-kraxel@redhat.com> References: <1260189773-20728-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [FOR 0.12 PATCH v3 15/21] chardev: make chardevs specified in config file work. List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , agraf@suse.de, lcapitulino@redhat.com 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 --- 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