switch chardev to QemuOpts: infrastructure, null device

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 <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Gerd Hoffmann 2009-09-10 10:58:35 +02:00 committed by Anthony Liguori
parent 9d868d4517
commit 191bc01bc9
6 changed files with 93 additions and 4 deletions

View file

@ -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 const 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

View file

@ -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, ...);

View file

@ -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,
};

View file

@ -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);

View file

@ -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

10
vl.c
View file

@ -5281,6 +5281,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");