From patchwork Wed Jul 6 12:19:26 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alon Levy X-Patchwork-Id: 103467 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 39722B6F7A for ; Wed, 6 Jul 2011 22:46:08 +1000 (EST) Received: from localhost ([::1]:49954 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QeRUS-0007lN-9r for incoming@patchwork.ozlabs.org; Wed, 06 Jul 2011 08:46:04 -0400 Received: from eggs.gnu.org ([140.186.70.92]:34147) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QeR5J-0001lp-4n for qemu-devel@nongnu.org; Wed, 06 Jul 2011 08:20:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QeR5D-0005GA-VL for qemu-devel@nongnu.org; Wed, 06 Jul 2011 08:20:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:65330) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QeR5D-0005Fw-Cc for qemu-devel@nongnu.org; Wed, 06 Jul 2011 08:19:59 -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 p66CJwAu022837 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 6 Jul 2011 08:19:58 -0400 Received: from bow.redhat.com (vpn-10-220.rdu.redhat.com [10.11.10.220]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p66CJR0x022836; Wed, 6 Jul 2011 08:19:57 -0400 From: Alon Levy To: qemu-devel@nongnu.org Date: Wed, 6 Jul 2011 14:19:26 +0200 Message-Id: <1309954766-9728-18-git-send-email-alevy@redhat.com> In-Reply-To: <1309954766-9728-1-git-send-email-alevy@redhat.com> References: <1309954766-9728-1-git-send-email-alevy@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: yhalperi@redhat.com, kraxel@redhat.com Subject: [Qemu-devel] [PATCH] qxl: use QXL_REVISION_* 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 --- hw/qxl.c | 24 +++++++++++------------- 1 files changed, 11 insertions(+), 13 deletions(-) diff --git a/hw/qxl.c b/hw/qxl.c index 8c7b03b..05dfc10 100644 --- a/hw/qxl.c +++ b/hw/qxl.c @@ -1532,7 +1532,6 @@ static DisplayChangeListener display_listener = { static int qxl_init_common(PCIQXLDevice *qxl) { uint8_t* config = qxl->pci.config; - uint32_t pci_device_rev; uint32_t io_size; qxl->mode = QXL_MODE_UNDEFINED; @@ -1542,19 +1541,18 @@ static int qxl_init_common(PCIQXLDevice *qxl) qemu_mutex_init(&qxl->track_lock); switch (qxl->revision) { - case 1: /* spice 0.4 -- qxl-1 */ - pci_device_rev = QXL_REVISION_STABLE_V04; + case QXL_REVISION_STABLE_V04: /* spice 0.4 -- qxl-1 */ + case QXL_REVISION_STABLE_V06: /* spice 0.6 -- qxl-2 */ + case QXL_REVISION_STABLE_V10: /* spice 0.10? -- qxl-3 */ break; - case 2: /* spice 0.6 -- qxl-2 */ - pci_device_rev = QXL_REVISION_STABLE_V06; - break; - case 3: /* qxl-3 */ default: - pci_device_rev = 3; + fprintf(stderr, "invalid revision %d, resetting to %d\n", qxl->revision, + QXL_REVISION_STABLE_V10); + qxl->revision = QXL_REVISION_STABLE_V10; break; } - pci_set_byte(&config[PCI_REVISION_ID], pci_device_rev); + pci_set_byte(&config[PCI_REVISION_ID], qxl->revision); pci_set_byte(&config[PCI_INTERRUPT_PIN], 1); qxl->rom_size = qxl_rom_size(); @@ -1565,14 +1563,14 @@ static int qxl_init_common(PCIQXLDevice *qxl) if (qxl->vram_size < 16 * 1024 * 1024) { qxl->vram_size = 16 * 1024 * 1024; } - if (qxl->revision == 1) { + if (qxl->revision == QXL_REVISION_STABLE_V04) { qxl->vram_size = 4096; } qxl->vram_size = msb_mask(qxl->vram_size * 2 - 1); qxl->vram_offset = qemu_ram_alloc(&qxl->pci.qdev, "qxl.vram", qxl->vram_size); io_size = msb_mask(QXL_IO_RANGE_SIZE * 2 - 1); - if (qxl->revision == 1) { + if (qxl->revision == QXL_REVISION_STABLE_V04) { io_size = 8; } @@ -1819,7 +1817,7 @@ static PCIDeviceInfo qxl_info_primary = { .qdev.props = (Property[]) { DEFINE_PROP_UINT32("ram_size", PCIQXLDevice, vga.vram_size, 64 * 1024 * 1024), DEFINE_PROP_UINT32("vram_size", PCIQXLDevice, vram_size, 64 * 1024 * 1024), - DEFINE_PROP_UINT32("revision", PCIQXLDevice, revision, 3), + DEFINE_PROP_UINT32("revision", PCIQXLDevice, revision, QXL_REVISION_STABLE_V10), DEFINE_PROP_UINT32("debug", PCIQXLDevice, debug, 0), DEFINE_PROP_UINT32("guestdebug", PCIQXLDevice, guestdebug, 0), DEFINE_PROP_UINT32("cmdlog", PCIQXLDevice, cmdlog, 0), @@ -1840,7 +1838,7 @@ static PCIDeviceInfo qxl_info_secondary = { .qdev.props = (Property[]) { DEFINE_PROP_UINT32("ram_size", PCIQXLDevice, vga.vram_size, 64 * 1024 * 1024), DEFINE_PROP_UINT32("vram_size", PCIQXLDevice, vram_size, 64 * 1024 * 1024), - DEFINE_PROP_UINT32("revision", PCIQXLDevice, revision, 3), + DEFINE_PROP_UINT32("revision", PCIQXLDevice, revision, QXL_REVISION_STABLE_V10), DEFINE_PROP_UINT32("debug", PCIQXLDevice, debug, 0), DEFINE_PROP_UINT32("guestdebug", PCIQXLDevice, guestdebug, 0), DEFINE_PROP_UINT32("cmdlog", PCIQXLDevice, cmdlog, 0),