From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:54912) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1STqb6-0002wm-P4 for qemu-devel@nongnu.org; Mon, 14 May 2012 04:25:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1STqaz-0003WD-P9 for qemu-devel@nongnu.org; Mon, 14 May 2012 04:25:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51527) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1STqaz-0003Vt-Gi for qemu-devel@nongnu.org; Mon, 14 May 2012 04:25:33 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q4E8PVLh031583 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 14 May 2012 04:25:31 -0400 From: Gerd Hoffmann Date: Mon, 14 May 2012 10:25:27 +0200 Message-Id: <1336983927-10191-2-git-send-email-kraxel@redhat.com> In-Reply-To: <1336983927-10191-1-git-send-email-kraxel@redhat.com> References: <1336983927-10191-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 1.1] qxl: set size of PCI IO BAR correctly (16) for revision 2 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Uri Lublin , Gerd Hoffmann From: Uri Lublin Also move it up into switch(qxl->revision) block Signed-off-by: Uri Lublin Signed-off-by: Gerd Hoffmann --- hw/qxl.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/hw/qxl.c b/hw/qxl.c index 6c11e70..3da3399 100644 --- a/hw/qxl.c +++ b/hw/qxl.c @@ -1746,13 +1746,16 @@ static int qxl_init_common(PCIQXLDevice *qxl) switch (qxl->revision) { case 1: /* spice 0.4 -- qxl-1 */ pci_device_rev = QXL_REVISION_STABLE_V04; + io_size = 8; break; case 2: /* spice 0.6 -- qxl-2 */ pci_device_rev = QXL_REVISION_STABLE_V06; + io_size = 16; break; case 3: /* qxl-3 */ default: pci_device_rev = QXL_DEFAULT_REVISION; + io_size = msb_mask(QXL_IO_RANGE_SIZE * 2 - 1); break; } @@ -1770,11 +1773,6 @@ static int qxl_init_common(PCIQXLDevice *qxl) memory_region_init_alias(&qxl->vram32_bar, "qxl.vram32", &qxl->vram_bar, 0, qxl->vram32_size); - io_size = msb_mask(QXL_IO_RANGE_SIZE * 2 - 1); - if (qxl->revision == 1) { - io_size = 8; - } - memory_region_init_io(&qxl->io_bar, &qxl_io_ops, qxl, "qxl-ioports", io_size); if (qxl->id == 0) { -- 1.7.1