From patchwork Mon Sep 7 16:06:05 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 33086 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 570C1B70CF for ; Tue, 8 Sep 2009 02:11:28 +1000 (EST) Received: from localhost ([127.0.0.1]:46628 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MkgoP-0002Ay-5n for incoming@patchwork.ozlabs.org; Mon, 07 Sep 2009 12:11:25 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mkgjm-0007Oh-Hm for qemu-devel@nongnu.org; Mon, 07 Sep 2009 12:06:38 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mkgjh-0007Lw-R5 for qemu-devel@nongnu.org; Mon, 07 Sep 2009 12:06:37 -0400 Received: from [199.232.76.173] (port=34945 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mkgjh-0007Lj-EH for qemu-devel@nongnu.org; Mon, 07 Sep 2009 12:06:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:63232) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Mkgjg-0003U2-Ju for qemu-devel@nongnu.org; Mon, 07 Sep 2009 12:06:33 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n87G6VFP013947 for ; Mon, 7 Sep 2009 12:06:31 -0400 Received: from zweiblum.home.kraxel.org (vpn2-9-74.ams2.redhat.com [10.36.9.74]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id n87G6R5Y008849; Mon, 7 Sep 2009 12:06:28 -0400 Received: by zweiblum.home.kraxel.org (Postfix, from userid 500) id 407E9700E4; Mon, 7 Sep 2009 18:06:25 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Mon, 7 Sep 2009 18:06:05 +0200 Message-Id: <1252339585-27797-4-git-send-email-kraxel@redhat.com> In-Reply-To: <1252339585-27797-1-git-send-email-kraxel@redhat.com> References: <1252339585-27797-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH 03/23] switch chardev to QemuOpts: infrastructure, null device 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 start switching chardevs to QemuOpts. This patch adds the infrastructure and converts the null device. The patch brings two new functions: qemu_chr_open_opts() same as qemu_chr_open(), but uses QemuOpts instead of a option char string. qemu_chr_parse_compat() accepts a traditional chardev option string, returns the corresponding QemuOpts instance, to handle backward compatibility. The patch also adds a new -chardev switch which can be used to create named+unconnected chardevs, like this: -chardev null,id=test This uses the new qemu_chr_open_opts. Thus with this patch alone only the null device works. The other devices will follow ... Signed-off-by: Gerd Hoffmann --- qemu-char.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++--- qemu-char.h | 4 +++ qemu-config.c | 9 +++++++ qemu-config.h | 1 + qemu-options.hx | 2 + vl.c | 10 +++++++ 6 files changed, 93 insertions(+), 4 deletions(-) diff --git a/qemu-char.c b/qemu-char.c index c25ed1c..97877ce 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -214,7 +214,7 @@ static int null_chr_write(CharDriverState *chr, const uint8_t *buf, int len) return len; } -static CharDriverState *qemu_chr_open_null(void) +static CharDriverState *qemu_chr_open_null(QemuOpts *opts) { CharDriverState *chr; @@ -2216,10 +2216,76 @@ static CharDriverState *qemu_chr_open_tcp(const char *host_str, return NULL; } +static QemuOpts *qemu_chr_parse_compat(const char *label, const char *filename) +{ + QemuOpts *opts; + + opts = qemu_opts_create(&qemu_chardev_opts, label, 1); + if (NULL == opts) + return NULL; + + if (strcmp(filename, "null") == 0) { + qemu_opt_set(opts, "backend", "null"); + return opts; + } + + qemu_opts_del(opts); + return NULL; +} + +static struct { + const char *name; + CharDriverState *(*open)(QemuOpts *opts); +} backend_table[] = { + { .name = "null", .open = qemu_chr_open_null }, +}; + +CharDriverState *qemu_chr_open_opts(QemuOpts *opts, + void (*init)(struct CharDriverState *s)) +{ + CharDriverState *chr; + int i; + + if (qemu_opts_id(opts) == NULL) { + fprintf(stderr, "chardev: no id specified\n"); + return NULL; + } + + for (i = 0; i < ARRAY_SIZE(backend_table); i++) { + if (strcmp(backend_table[i].name, qemu_opt_get(opts, "backend")) == 0) + break; + } + if (i == ARRAY_SIZE(backend_table)) { + fprintf(stderr, "chardev: backend \"%s\" not found\n", + qemu_opt_get(opts, "backend")); + return NULL; + } + + chr = backend_table[i].open(opts); + if (!chr) { + fprintf(stderr, "chardev: opening backend \"%s\" failed\n", + qemu_opt_get(opts, "backend")); + return NULL; + } + + if (!chr->filename) + chr->filename = qemu_strdup(qemu_opt_get(opts, "backend")); + chr->init = init; + chr->label = qemu_strdup(qemu_opts_id(opts)); + TAILQ_INSERT_TAIL(&chardevs, chr, next); + return chr; +} + CharDriverState *qemu_chr_open(const char *label, const char *filename, void (*init)(struct CharDriverState *s)) { const char *p; CharDriverState *chr; + QemuOpts *opts; + + opts = qemu_chr_parse_compat(label, filename); + if (opts) { + return qemu_chr_open_opts(opts, init); + } if (!strcmp(filename, "vc")) { chr = text_console_init(NULL); @@ -2227,9 +2293,6 @@ CharDriverState *qemu_chr_open(const char *label, const char *filename, void (*i if (strstart(filename, "vc:", &p)) { chr = text_console_init(p); } else - if (!strcmp(filename, "null")) { - chr = qemu_chr_open_null(); - } else if (strstart(filename, "tcp:", &p)) { chr = qemu_chr_open_tcp(p, 0, 0); } else diff --git a/qemu-char.h b/qemu-char.h index df620bc..9bff0c7 100644 --- a/qemu-char.h +++ b/qemu-char.h @@ -3,6 +3,8 @@ #include "qemu-common.h" #include "sys-queue.h" +#include "qemu-option.h" +#include "qemu-config.h" /* character device */ @@ -68,6 +70,8 @@ struct CharDriverState { TAILQ_ENTRY(CharDriverState) next; }; +CharDriverState *qemu_chr_open_opts(QemuOpts *opts, + void (*init)(struct CharDriverState *s)); CharDriverState *qemu_chr_open(const char *label, const char *filename, void (*init)(struct CharDriverState *s)); void qemu_chr_close(CharDriverState *chr); void qemu_chr_printf(CharDriverState *s, const char *fmt, ...); diff --git a/qemu-config.c b/qemu-config.c index 4808db0..b156c24 100644 --- a/qemu-config.c +++ b/qemu-config.c @@ -75,6 +75,14 @@ QemuOptsList qemu_drive_opts = { }, }; +QemuOptsList qemu_chardev_opts = { + .name = "chardev", + .head = TAILQ_HEAD_INITIALIZER(qemu_chardev_opts.head), + .desc = { + { /* end if list */ } + }, +}; + QemuOptsList qemu_device_opts = { .name = "device", .head = TAILQ_HEAD_INITIALIZER(qemu_device_opts.head), @@ -90,6 +98,7 @@ QemuOptsList qemu_device_opts = { static QemuOptsList *lists[] = { &qemu_drive_opts, + &qemu_chardev_opts, &qemu_device_opts, NULL, }; diff --git a/qemu-config.h b/qemu-config.h index e49d715..13b0f19 100644 --- a/qemu-config.h +++ b/qemu-config.h @@ -2,6 +2,7 @@ #define QEMU_CONFIG_H extern QemuOptsList qemu_drive_opts; +extern QemuOptsList qemu_chardev_opts; extern QemuOptsList qemu_device_opts; int qemu_set_option(const char *str); diff --git a/qemu-options.hx b/qemu-options.hx index ce38a3b..d3aa55b 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1195,6 +1195,8 @@ STEXI @table @option ETEXI +DEF("chardev", HAS_ARG, QEMU_OPTION_chardev, \ + "-chardev spec create unconnected chardev\n") DEF("serial", HAS_ARG, QEMU_OPTION_serial, \ "-serial dev redirect the serial port to char device 'dev'\n") STEXI diff --git a/vl.c b/vl.c index 098daaa..0ea2206 100644 --- a/vl.c +++ b/vl.c @@ -5369,6 +5369,16 @@ int main(int argc, char **argv, char **envp) monitor_devices[monitor_device_index] = optarg; monitor_device_index++; break; + case QEMU_OPTION_chardev: + opts = qemu_opts_parse(&qemu_chardev_opts, optarg, "backend"); + if (!opts) { + fprintf(stderr, "parse error: %s\n", optarg); + exit(1); + } + if (NULL == qemu_chr_open_opts(opts, NULL)) { + exit(1); + } + break; case QEMU_OPTION_serial: if (serial_device_index >= MAX_SERIAL_PORTS) { fprintf(stderr, "qemu: too many serial ports\n");