From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:42881) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNebq-0007KI-Jr for qemu-devel@nongnu.org; Thu, 04 Apr 2013 03:29:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UNebi-0004wT-6k for qemu-devel@nongnu.org; Thu, 04 Apr 2013 03:29:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:26267) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNebh-0004wG-V2 for qemu-devel@nongnu.org; Thu, 04 Apr 2013 03:29:14 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r347TDWV012073 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 4 Apr 2013 03:29:13 -0400 From: Gerd Hoffmann Date: Thu, 4 Apr 2013 09:29:06 +0200 Message-Id: <1365060546-24638-25-git-send-email-kraxel@redhat.com> In-Reply-To: <1365060546-24638-1-git-send-email-kraxel@redhat.com> References: <1365060546-24638-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 24/24] qxl: register QemuConsole for secondary cards List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann Hook secondary qxl cards properly into the qemu console subsystem. Signed-off-by: Gerd Hoffmann --- hw/qxl.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hw/qxl.c b/hw/qxl.c index 320c017..e484610 100644 --- a/hw/qxl.c +++ b/hw/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); } -- 1.7.9.7