From patchwork Wed Nov 25 12:11:34 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 39311 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id EE0881007D1 for ; Wed, 25 Nov 2009 23:12:28 +1100 (EST) Received: from localhost ([127.0.0.1]:49174 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NDGjQ-00040f-8d for incoming@patchwork.ozlabs.org; Wed, 25 Nov 2009 07:12:24 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NDGin-0003zZ-BV for qemu-devel@nongnu.org; Wed, 25 Nov 2009 07:11:45 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NDGii-0003w3-Ax for qemu-devel@nongnu.org; Wed, 25 Nov 2009 07:11:44 -0500 Received: from [199.232.76.173] (port=53259 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NDGii-0003vz-2q for qemu-devel@nongnu.org; Wed, 25 Nov 2009 07:11:40 -0500 Received: from mx1.redhat.com ([209.132.183.28]:5536) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NDGih-0004KL-OG for qemu-devel@nongnu.org; Wed, 25 Nov 2009 07:11:40 -0500 Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nAPCBcD5014802 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 25 Nov 2009 07:11:38 -0500 Received: from zweiblum.home.kraxel.org (vpn1-4-184.ams2.redhat.com [10.36.4.184]) by int-mx05.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id nAPCBaQg018907; Wed, 25 Nov 2009 07:11:37 -0500 Received: by zweiblum.home.kraxel.org (Postfix, from userid 500) id 0655B700CB; Wed, 25 Nov 2009 13:11:34 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Wed, 25 Nov 2009 13:11:34 +0100 Message-Id: <1259151094-12287-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.18 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH] chardev: make chardevs specified in config file work. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 d188fc6..524b496 100644 --- a/vl.c +++ b/vl.c @@ -4573,6 +4573,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 */ @@ -5193,9 +5203,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); @@ -5506,6 +5513,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");