From patchwork Thu Jul 14 19:13:21 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alon Levy X-Patchwork-Id: 104712 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 70520B6F65 for ; Fri, 15 Jul 2011 05:31:21 +1000 (EST) Received: from localhost ([::1]:48366 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QhRd0-0006RD-0V for incoming@patchwork.ozlabs.org; Thu, 14 Jul 2011 15:31:18 -0400 Received: from eggs.gnu.org ([140.186.70.92]:41084) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QhRML-0002eq-DO for qemu-devel@nongnu.org; Thu, 14 Jul 2011 15:14:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QhRMI-0000fd-Ou for qemu-devel@nongnu.org; Thu, 14 Jul 2011 15:14:05 -0400 Received: from mx1.redhat.com ([209.132.183.28]:19044) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QhRMH-0000fL-TI for qemu-devel@nongnu.org; Thu, 14 Jul 2011 15:14:02 -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 p6EJE12e007240 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 14 Jul 2011 15:14:01 -0400 Received: from bow.tlv.redhat.com (dhcp-3-110.tlv.redhat.com [10.35.3.110]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p6EJDeZI026697; Thu, 14 Jul 2011 15:13:59 -0400 From: Alon Levy To: qemu-devel@nongnu.org Date: Thu, 14 Jul 2011 22:13:21 +0300 Message-Id: <1310670801-14687-13-git-send-email-alevy@redhat.com> In-Reply-To: <1310670801-14687-1-git-send-email-alevy@redhat.com> References: <1310670801-14687-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] [PATCHv5 12/12] 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 Signed-off-by: Alon Levy --- hw/qxl.c | 27 ++++++++++++++------------- 1 files changed, 14 insertions(+), 13 deletions(-) diff --git a/hw/qxl.c b/hw/qxl.c index 5052206..b9d27b9 100644 --- a/hw/qxl.c +++ b/hw/qxl.c @@ -1579,7 +1579,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; @@ -1587,23 +1586,25 @@ static int qxl_init_common(PCIQXLDevice *qxl) qxl->num_memslots = NUM_MEMSLOTS; qxl->num_surfaces = NUM_SURFACES; qemu_mutex_init(&qxl->track_lock); - +#if SPICE_INTERFACE_QXL_MINOR >= 1 + qemu_mutex_init(&qxl->async_lock); + qxl->current_async = QXL_UNDEFINED_IO; +#endif switch (qxl->revision) { - case 1: /* spice 0.4 -- qxl-1 */ - pci_device_rev = QXL_REVISION_STABLE_V04; - break; - case 2: /* spice 0.6 -- qxl-2 */ - pci_device_rev = QXL_REVISION_STABLE_V06; - break; + case QXL_REVISION_STABLE_V04: /* spice 0.4 -- qxl-1 */ + case QXL_REVISION_STABLE_V06: /* spice 0.6 -- qxl-2 */ #if SPICE_INTERFACE_QXL_MINOR >= 1 - case 3: /* qxl-3 */ + case QXL_REVISION_STABLE_V10: /* spice 0.10? -- qxl-3 */ + break; #endif default: - pci_device_rev = QXL_DEFAULT_REVISION; + fprintf(stderr, "invalid revision %d, resetting to %d\n", qxl->revision, + QXL_DEFAULT_REVISION); + qxl->revision = QXL_DEFAULT_REVISION; 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(); @@ -1614,14 +1615,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; }