From patchwork Tue Apr 16 09:39:38 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 236937 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 30EB12C010E for ; Tue, 16 Apr 2013 20:56:56 +1000 (EST) Received: from localhost ([::1]:34074 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1US2So-00010i-Py for incoming@patchwork.ozlabs.org; Tue, 16 Apr 2013 05:46:10 -0400 Received: from eggs.gnu.org ([208.118.235.92]:47582) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1US2Mm-0001i0-Fi for qemu-devel@nongnu.org; Tue, 16 Apr 2013 05:40:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1US2Mb-0006wf-5D for qemu-devel@nongnu.org; Tue, 16 Apr 2013 05:39:56 -0400 Received: from mx1.redhat.com ([209.132.183.28]:1369) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1US2Ma-0006w3-Sw for qemu-devel@nongnu.org; Tue, 16 Apr 2013 05:39:45 -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 r3G9diQZ027085 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 16 Apr 2013 05:39:44 -0400 Received: from rincewind.home.kraxel.org (ovpn-116-37.ams2.redhat.com [10.36.116.37]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r3G9dgX8020531; Tue, 16 Apr 2013 05:39:43 -0400 Received: by rincewind.home.kraxel.org (Postfix, from userid 500) id 0B5084104E; Tue, 16 Apr 2013 11:39:40 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Tue, 16 Apr 2013 11:39:38 +0200 Message-Id: <1366105178-26744-25-git-send-email-kraxel@redhat.com> In-Reply-To: <1366105178-26744-1-git-send-email-kraxel@redhat.com> References: <1366105178-26744-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH 24/24] qxl: register QemuConsole for secondary cards X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 bbc6f56..437f8d0 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); }