[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 01/10] chardev: move greeting into vc backend.
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 01/10] chardev: move greeting into vc backend. |
Date: |
Tue, 24 Nov 2009 09:58:35 +0100 |
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 <address@hidden>
---
console.c | 8 ++++++++
vl.c | 24 ------------------------
2 files changed, 8 insertions(+), 24 deletions(-)
diff --git a/console.c b/console.c
index 82ddbe4..2aeb5b3 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 ee43808..6fb1858 100644
--- a/vl.c
+++ b/vl.c
@@ -5800,30 +5800,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);
--
1.6.2.5
- [Qemu-devel] [PATCH 00/10] default devices: qdev integration., Gerd Hoffmann, 2009/11/24
- [Qemu-devel] [PATCH 01/10] chardev: move greeting into vc backend.,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 02/10] vc: colorize chardev title line with blue background., Gerd Hoffmann, 2009/11/24
- [Qemu-devel] [PATCH 03/10] default devices: core code & serial lines., Gerd Hoffmann, 2009/11/24
- [Qemu-devel] [PATCH 06/10] zap serial_monitor_mux, Gerd Hoffmann, 2009/11/24
- [Qemu-devel] [PATCH 08/10] default devices: add global cmd line option., Gerd Hoffmann, 2009/11/24
- [Qemu-devel] [PATCH 07/10] default devices: vga adapter., Gerd Hoffmann, 2009/11/24
- [Qemu-devel] [PATCH 04/10] default devices: parallel port., Gerd Hoffmann, 2009/11/24
- [Qemu-devel] [PATCH 05/10] default devices: qemu monitor., Gerd Hoffmann, 2009/11/24
- [Qemu-devel] [PATCH 10/10] default devices: drives, Gerd Hoffmann, 2009/11/24
- [Qemu-devel] [PATCH 09/10] default devices: network, Gerd Hoffmann, 2009/11/24
- Re: [Qemu-devel] [PATCH 00/10] default devices: qdev integration., Markus Armbruster, 2009/11/24