summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2009-12-08 13:11:39 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2009-12-12 08:17:29 -0600
commit25d82d331113e8797199f960ce823089c1dbf829 (patch)
treeb294845d142c0f526973f25042a3541a550c6a2d
parentRevert "Set default console to virtio on S390x" (diff)
downloadqemu-kvm-25d82d331113e8797199f960ce823089c1dbf829.tar.gz
qemu-kvm-25d82d331113e8797199f960ce823089c1dbf829.tar.bz2
qemu-kvm-25d82d331113e8797199f960ce823089c1dbf829.zip
chardev: move greeting into vc backend.
Make the 'vc' chardev backend print a title line with the chardev name after initialization, using CharDriverState->label. This replaces the banner printing code in vl.c. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit 51bfa4d3160fe1d5c2eca381020b8b6dd69c3c80)
-rw-r--r--console.c8
-rw-r--r--vl.c24
2 files changed, 8 insertions, 24 deletions
diff --git a/console.c b/console.c
index 82ddbe4d9..2aeb5b33c 100644
--- a/console.c
+++ b/console.c
@@ -1384,6 +1384,14 @@ static void text_console_do_init(CharDriverState *chr, DisplayState *ds, QemuOpt
s->t_attrib = s->t_attrib_default;
text_console_resize(s);
+ if (chr->label) {
+ char msg[128];
+ int len;
+
+ len = snprintf(msg, sizeof(msg), "%s console\r\n", chr->label);
+ console_puts(chr, (uint8_t*)msg, len);
+ }
+
qemu_chr_generic_open(chr);
if (chr->init)
chr->init(chr);
diff --git a/vl.c b/vl.c
index 172828afa..333780f38 100644
--- a/vl.c
+++ b/vl.c
@@ -5866,30 +5866,6 @@ int main(int argc, char **argv, char **envp)
}
}
- for(i = 0; i < MAX_SERIAL_PORTS; i++) {
- const char *devname = serial_devices[i];
- if (devname && strcmp(devname, "none")) {
- if (strstart(devname, "vc", 0))
- qemu_chr_printf(serial_hds[i], "serial%d console\r\n", i);
- }
- }
-
- for(i = 0; i < MAX_PARALLEL_PORTS; i++) {
- const char *devname = parallel_devices[i];
- if (devname && strcmp(devname, "none")) {
- if (strstart(devname, "vc", 0))
- qemu_chr_printf(parallel_hds[i], "parallel%d console\r\n", i);
- }
- }
-
- for(i = 0; i < MAX_VIRTIO_CONSOLES; i++) {
- const char *devname = virtio_consoles[i];
- if (virtcon_hds[i] && devname) {
- if (strstart(devname, "vc", 0))
- qemu_chr_printf(virtcon_hds[i], "virtio console%d\r\n", i);
- }
- }
-
if (gdbstub_dev && gdbserver_start(gdbstub_dev) < 0) {
fprintf(stderr, "qemu: could not open gdbserver on device '%s'\n",
gdbstub_dev);