default devices: core code & serial lines.
Qemu creates a default serial line for you in case you didn't specify one on the command line. Right now this is tied to the '-serial <chardev>' command line switch, which in turn causes trouble if you are creating your serial line via '-device isa-serial,<props>'. This patch adds a variable default_serial which says whenever a default serial line should be added. It is enabled by default. It is cleared when qemu finds '-serial' or '-device isa-serial' on the command line. Part of the patch is some infrastructure for the '-device $driver' checking (default_driver_check function) which will also be used by the other patches of this series. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
parent
735ba58849
commit
998bbd74b9
120
vl.c
120
vl.c
@ -271,6 +271,30 @@ uint8_t qemu_uuid[16];
|
|||||||
static QEMUBootSetHandler *boot_set_handler;
|
static QEMUBootSetHandler *boot_set_handler;
|
||||||
static void *boot_set_opaque;
|
static void *boot_set_opaque;
|
||||||
|
|
||||||
|
static int default_serial = 1;
|
||||||
|
|
||||||
|
static struct {
|
||||||
|
const char *driver;
|
||||||
|
int *flag;
|
||||||
|
} default_list[] = {
|
||||||
|
{ .driver = "isa-serial", .flag = &default_serial },
|
||||||
|
};
|
||||||
|
|
||||||
|
static int default_driver_check(QemuOpts *opts, void *opaque)
|
||||||
|
{
|
||||||
|
const char *driver = qemu_opt_get(opts, "driver");
|
||||||
|
int i;
|
||||||
|
|
||||||
|
if (!driver)
|
||||||
|
return 0;
|
||||||
|
for (i = 0; i < ARRAY_SIZE(default_list); i++) {
|
||||||
|
if (strcmp(default_list[i].driver, driver) != 0)
|
||||||
|
continue;
|
||||||
|
*(default_list[i].flag) = 0;
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
/***********************************************************/
|
/***********************************************************/
|
||||||
/* x86 ISA bus support */
|
/* x86 ISA bus support */
|
||||||
|
|
||||||
@ -4600,6 +4624,7 @@ struct device_config {
|
|||||||
enum {
|
enum {
|
||||||
DEV_USB, /* -usbdevice */
|
DEV_USB, /* -usbdevice */
|
||||||
DEV_BT, /* -bt */
|
DEV_BT, /* -bt */
|
||||||
|
DEV_SERIAL, /* -serial */
|
||||||
} type;
|
} type;
|
||||||
const char *cmdline;
|
const char *cmdline;
|
||||||
QTAILQ_ENTRY(device_config) next;
|
QTAILQ_ENTRY(device_config) next;
|
||||||
@ -4631,6 +4656,50 @@ static int foreach_device_config(int type, int (*func)(const char *cmdline))
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void serial_monitor_mux(const char *monitor_devices[])
|
||||||
|
{
|
||||||
|
struct device_config *serial;
|
||||||
|
const char *devname;
|
||||||
|
|
||||||
|
if (strcmp(monitor_devices[0],"stdio") != 0)
|
||||||
|
return;
|
||||||
|
QTAILQ_FOREACH(serial, &device_configs, next) {
|
||||||
|
if (serial->type != DEV_SERIAL)
|
||||||
|
continue;
|
||||||
|
devname = serial->cmdline;
|
||||||
|
if (devname && !strcmp(devname,"mon:stdio")) {
|
||||||
|
monitor_devices[0] = NULL;
|
||||||
|
break;
|
||||||
|
} else if (devname && !strcmp(devname,"stdio")) {
|
||||||
|
monitor_devices[0] = NULL;
|
||||||
|
serial->cmdline = "mon:stdio";
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static int serial_parse(const char *devname)
|
||||||
|
{
|
||||||
|
static int index = 0;
|
||||||
|
char label[32];
|
||||||
|
|
||||||
|
if (strcmp(devname, "none") == 0)
|
||||||
|
return 0;
|
||||||
|
if (index == MAX_SERIAL_PORTS) {
|
||||||
|
fprintf(stderr, "qemu: too many serial ports\n");
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
snprintf(label, sizeof(label), "serial%d", index);
|
||||||
|
serial_hds[index] = qemu_chr_open(label, devname, NULL);
|
||||||
|
if (!serial_hds[index]) {
|
||||||
|
fprintf(stderr, "qemu: could not open serial device '%s': %s\n",
|
||||||
|
devname, strerror(errno));
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
index++;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
int main(int argc, char **argv, char **envp)
|
int main(int argc, char **argv, char **envp)
|
||||||
{
|
{
|
||||||
const char *gdbstub_dev = NULL;
|
const char *gdbstub_dev = NULL;
|
||||||
@ -4649,8 +4718,6 @@ int main(int argc, char **argv, char **envp)
|
|||||||
CharDriverState *monitor_hds[MAX_MONITOR_DEVICES];
|
CharDriverState *monitor_hds[MAX_MONITOR_DEVICES];
|
||||||
const char *monitor_devices[MAX_MONITOR_DEVICES];
|
const char *monitor_devices[MAX_MONITOR_DEVICES];
|
||||||
int monitor_device_index;
|
int monitor_device_index;
|
||||||
const char *serial_devices[MAX_SERIAL_PORTS];
|
|
||||||
int serial_device_index;
|
|
||||||
const char *parallel_devices[MAX_PARALLEL_PORTS];
|
const char *parallel_devices[MAX_PARALLEL_PORTS];
|
||||||
int parallel_device_index;
|
int parallel_device_index;
|
||||||
const char *virtio_consoles[MAX_VIRTIO_CONSOLES];
|
const char *virtio_consoles[MAX_VIRTIO_CONSOLES];
|
||||||
@ -4720,11 +4787,6 @@ int main(int argc, char **argv, char **envp)
|
|||||||
cyls = heads = secs = 0;
|
cyls = heads = secs = 0;
|
||||||
translation = BIOS_ATA_TRANSLATION_AUTO;
|
translation = BIOS_ATA_TRANSLATION_AUTO;
|
||||||
|
|
||||||
serial_devices[0] = "vc:80Cx24C";
|
|
||||||
for(i = 1; i < MAX_SERIAL_PORTS; i++)
|
|
||||||
serial_devices[i] = NULL;
|
|
||||||
serial_device_index = 0;
|
|
||||||
|
|
||||||
parallel_devices[0] = "vc:80Cx24C";
|
parallel_devices[0] = "vc:80Cx24C";
|
||||||
for(i = 1; i < MAX_PARALLEL_PORTS; i++)
|
for(i = 1; i < MAX_PARALLEL_PORTS; i++)
|
||||||
parallel_devices[i] = NULL;
|
parallel_devices[i] = NULL;
|
||||||
@ -5172,12 +5234,8 @@ int main(int argc, char **argv, char **envp)
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case QEMU_OPTION_serial:
|
case QEMU_OPTION_serial:
|
||||||
if (serial_device_index >= MAX_SERIAL_PORTS) {
|
add_device_config(DEV_SERIAL, optarg);
|
||||||
fprintf(stderr, "qemu: too many serial ports\n");
|
default_serial = 0;
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
serial_devices[serial_device_index] = optarg;
|
|
||||||
serial_device_index++;
|
|
||||||
break;
|
break;
|
||||||
case QEMU_OPTION_watchdog:
|
case QEMU_OPTION_watchdog:
|
||||||
if (watchdog) {
|
if (watchdog) {
|
||||||
@ -5478,14 +5536,19 @@ int main(int argc, char **argv, char **envp)
|
|||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
qemu_opts_foreach(&qemu_device_opts, default_driver_check, NULL, 0);
|
||||||
|
|
||||||
if (display_type == DT_NOGRAPHIC) {
|
if (display_type == DT_NOGRAPHIC) {
|
||||||
if (serial_device_index == 0)
|
if (default_serial)
|
||||||
serial_devices[0] = "stdio";
|
add_device_config(DEV_SERIAL, "stdio");
|
||||||
if (parallel_device_index == 0)
|
if (parallel_device_index == 0)
|
||||||
parallel_devices[0] = "null";
|
parallel_devices[0] = "null";
|
||||||
if (strncmp(monitor_devices[0], "vc", 2) == 0) {
|
if (strncmp(monitor_devices[0], "vc", 2) == 0) {
|
||||||
monitor_devices[0] = "stdio";
|
monitor_devices[0] = "stdio";
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
if (default_serial)
|
||||||
|
add_device_config(DEV_SERIAL, "vc:80Cx24C");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (qemu_opts_foreach(&qemu_chardev_opts, chardev_init_func, NULL, 1) != 0)
|
if (qemu_opts_foreach(&qemu_chardev_opts, chardev_init_func, NULL, 1) != 0)
|
||||||
@ -5637,19 +5700,7 @@ int main(int argc, char **argv, char **envp)
|
|||||||
ram_load, NULL);
|
ram_load, NULL);
|
||||||
|
|
||||||
/* Maintain compatibility with multiple stdio monitors */
|
/* Maintain compatibility with multiple stdio monitors */
|
||||||
if (!strcmp(monitor_devices[0],"stdio")) {
|
serial_monitor_mux(monitor_devices);
|
||||||
for (i = 0; i < MAX_SERIAL_PORTS; i++) {
|
|
||||||
const char *devname = serial_devices[i];
|
|
||||||
if (devname && !strcmp(devname,"mon:stdio")) {
|
|
||||||
monitor_devices[0] = NULL;
|
|
||||||
break;
|
|
||||||
} else if (devname && !strcmp(devname,"stdio")) {
|
|
||||||
monitor_devices[0] = NULL;
|
|
||||||
serial_devices[i] = "mon:stdio";
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (nb_numa_nodes > 0) {
|
if (nb_numa_nodes > 0) {
|
||||||
int i;
|
int i;
|
||||||
@ -5711,19 +5762,8 @@ int main(int argc, char **argv, char **envp)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for(i = 0; i < MAX_SERIAL_PORTS; i++) {
|
if (foreach_device_config(DEV_SERIAL, serial_parse) < 0)
|
||||||
const char *devname = serial_devices[i];
|
|
||||||
if (devname && strcmp(devname, "none")) {
|
|
||||||
char label[32];
|
|
||||||
snprintf(label, sizeof(label), "serial%d", i);
|
|
||||||
serial_hds[i] = qemu_chr_open(label, devname, NULL);
|
|
||||||
if (!serial_hds[i]) {
|
|
||||||
fprintf(stderr, "qemu: could not open serial device '%s': %s\n",
|
|
||||||
devname, strerror(errno));
|
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
for(i = 0; i < MAX_PARALLEL_PORTS; i++) {
|
for(i = 0; i < MAX_PARALLEL_PORTS; i++) {
|
||||||
const char *devname = parallel_devices[i];
|
const char *devname = parallel_devices[i];
|
||||||
|
Loading…
Reference in New Issue
Block a user