From bfe528b9b99d52693a55f2b803039d68a97bcfb2 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Tue, 19 Mar 2013 16:59:58 +0100 Subject: [PATCH] qxl: register QemuConsole for secondary cards Hook secondary qxl cards properly into the qemu console subsystem. Signed-off-by: Gerd Hoffmann --- hw/display/qxl.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hw/display/qxl.c b/hw/display/qxl.c index bbc6f56a0d..437f8d0eee 100644 --- a/hw/display/qxl.c +++ b/hw/display/qxl.c @@ -1769,7 +1769,10 @@ static void qxl_hw_invalidate(void *opaque) PCIQXLDevice *qxl = opaque; VGACommonState *vga = &qxl->vga; - vga->hw_ops->invalidate(vga); + if (qxl->mode == QXL_MODE_VGA) { + vga->hw_ops->invalidate(vga); + return; + } } static void qxl_hw_text_update(void *opaque, console_ch_t *chardata) @@ -2085,6 +2088,7 @@ static int qxl_init_secondary(PCIDevice *dev) memory_region_init_ram(&qxl->vga.vram, "qxl.vgavram", qxl->vga.vram_size); vmstate_register_ram(&qxl->vga.vram, &qxl->pci.qdev); qxl->vga.vram_ptr = memory_region_get_ram_ptr(&qxl->vga.vram); + qxl->vga.con = graphic_console_init(&qxl_ops, qxl); return qxl_init_common(qxl); } -- 2.11.4.GIT