ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

default devices: virtio consoles. 

This patch adds a variable default_virtcon which says whenever a default
virtio console should be added.  It is disabled by default, followup
patch will enable it for s390.  It is cleared when qemu finds
'-virtiocon', '-device virtio-console-s390' or '-device
virtio-console-pci' on the command line.

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-12-08 13:11:53 +01:00 committed by Anthony Liguori
parent 6ca5582d4f
commit aee1b935c5
1 changed files with 35 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
vl.c
View File

@ -270,6 +270,7 @@ static void *boot_set_opaque;
static int default_serial = 1; static int default_serial = 1;
static int default_parallel = 1; static int default_parallel = 1;
static int default_virtcon = 0;
static int default_monitor = 1; static int default_monitor = 1;
static int default_vga = 1; static int default_vga = 1;
static int default_drive = 1; static int default_drive = 1;
@ -280,6 +281,8 @@ static struct {
} default_list[] = { } default_list[] = {
{ .driver = "isa-serial", .flag = &default_serial }, { .driver = "isa-serial", .flag = &default_serial },
{ .driver = "isa-parallel", .flag = &default_parallel }, { .driver = "isa-parallel", .flag = &default_parallel },
{ .driver = "virtio-console-pci", .flag = &default_virtcon },
{ .driver = "virtio-console-s390", .flag = &default_virtcon },
{ .driver = "VGA", .flag = &default_vga }, { .driver = "VGA", .flag = &default_vga },
{ .driver = "Cirrus VGA", .flag = &default_vga }, { .driver = "Cirrus VGA", .flag = &default_vga },
{ .driver = "QEMUware SVGA", .flag = &default_vga }, { .driver = "QEMUware SVGA", .flag = &default_vga },
@ -4699,10 +4702,11 @@ static void monitor_parse(const char *optarg, const char *mode)
struct device_config { struct device_config {
enum { enum {
DEV_USB, /* -usbdevice */ DEV_USB, /* -usbdevice */
DEV_BT, /* -bt */ DEV_BT, /* -bt */
DEV_SERIAL, /* -serial */ DEV_SERIAL, /* -serial */
DEV_PARALLEL, /* -parallel */ DEV_PARALLEL, /* -parallel */
DEV_VIRTCON, /* -virtioconsole */
} type; } type;
const char *cmdline; const char *cmdline;
QTAILQ_ENTRY(device_config) next; QTAILQ_ENTRY(device_config) next;
@ -4778,6 +4782,28 @@ static int parallel_parse(const char *devname)
return 0; return 0;
} }
static int virtcon_parse(const char *devname)
{
static int index = 0;
char label[32];
if (strcmp(devname, "none") == 0)
return 0;
if (index == MAX_VIRTIO_CONSOLES) {
fprintf(stderr, "qemu: too many virtio consoles\n");
exit(1);
}
snprintf(label, sizeof(label), "virtcon%d", index);
virtcon_hds[index] = qemu_chr_open(label, devname, NULL);
if (!virtcon_hds[index]) {
fprintf(stderr, "qemu: could not open virtio console '%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;
@ -4793,8 +4819,6 @@ int main(int argc, char **argv, char **envp)
QemuOpts *hda_opts = NULL, *opts; QemuOpts *hda_opts = NULL, *opts;
int optind; int optind;
const char *r, *optarg; const char *r, *optarg;
const char *virtio_consoles[MAX_VIRTIO_CONSOLES];
int virtio_console_index;
const char *loadvm = NULL; const char *loadvm = NULL;
QEMUMachine *machine; QEMUMachine *machine;
const char *cpu_model; const char *cpu_model;
@ -4860,10 +4884,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;
for(i = 0; i < MAX_VIRTIO_CONSOLES; i++)
virtio_consoles[i] = NULL;
virtio_console_index = 0;
for (i = 0; i < MAX_NODES; i++) { for (i = 0; i < MAX_NODES; i++) {
node_mem[i] = 0; node_mem[i] = 0;
node_cpumask[i] = 0; node_cpumask[i] = 0;
@ -5322,12 +5342,8 @@ int main(int argc, char **argv, char **envp)
} }
break; break;
case QEMU_OPTION_virtiocon: case QEMU_OPTION_virtiocon:
if (virtio_console_index >= MAX_VIRTIO_CONSOLES) { add_device_config(DEV_VIRTCON, optarg);
fprintf(stderr, "qemu: too many virtio consoles\n"); default_virtcon = 0;
exit(1);
}
virtio_consoles[virtio_console_index] = optarg;
virtio_console_index++;
break; break;
case QEMU_OPTION_parallel: case QEMU_OPTION_parallel:
add_device_config(DEV_PARALLEL, optarg); add_device_config(DEV_PARALLEL, optarg);
@ -5527,6 +5543,7 @@ int main(int argc, char **argv, char **envp)
case QEMU_OPTION_nodefaults: case QEMU_OPTION_nodefaults:
default_serial = 0; default_serial = 0;
default_parallel = 0; default_parallel = 0;
default_virtcon = 0;
default_monitor = 0; default_monitor = 0;
default_vga = 0; default_vga = 0;
default_net = 0; default_net = 0;
@ -5830,20 +5847,8 @@ int main(int argc, char **argv, char **envp)
exit(1); exit(1);
if (foreach_device_config(DEV_PARALLEL, parallel_parse) < 0) if (foreach_device_config(DEV_PARALLEL, parallel_parse) < 0)
exit(1); exit(1);
if (foreach_device_config(DEV_VIRTCON, virtcon_parse) < 0)
for(i = 0; i < MAX_VIRTIO_CONSOLES; i++) { exit(1);
const char *devname = virtio_consoles[i];
if (devname && strcmp(devname, "none")) {
char label[32];
snprintf(label, sizeof(label), "virtcon%d", i);
virtcon_hds[i] = qemu_chr_open(label, devname, NULL);
if (!virtcon_hds[i]) {
fprintf(stderr, "qemu: could not open virtio console '%s': %s\n",
devname, strerror(errno));
exit(1);
}
}
}
module_call_init(MODULE_INIT_DEVICE); module_call_init(MODULE_INIT_DEVICE);