From patchwork Fri Jun 24 13:02:55 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alon Levy X-Patchwork-Id: 101802 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 554EDB6F7E for ; Sat, 25 Jun 2011 00:12:11 +1000 (EST) Received: from localhost ([::1]:34715 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qa779-0007fZ-9R for incoming@patchwork.ozlabs.org; Fri, 24 Jun 2011 10:12:07 -0400 Received: from eggs.gnu.org ([140.186.70.92]:49401) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qa62i-000666-2l for qemu-devel@nongnu.org; Fri, 24 Jun 2011 09:03:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qa62f-0001tM-RA for qemu-devel@nongnu.org; Fri, 24 Jun 2011 09:03:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:20913) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qa62f-0001sz-6j for qemu-devel@nongnu.org; Fri, 24 Jun 2011 09:03:25 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p5OD3Op4011316 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 24 Jun 2011 09:03:24 -0400 Received: from bow.redhat.com (vpn-11-77.rdu.redhat.com [10.11.11.77]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p5OD34T5021276; Fri, 24 Jun 2011 09:03:22 -0400 From: Alon Levy To: qemu-devel@nongnu.org Date: Fri, 24 Jun 2011 15:02:55 +0200 Message-Id: <1308920577-31569-11-git-send-email-alevy@redhat.com> In-Reply-To: <1308920577-31569-1-git-send-email-alevy@redhat.com> References: <1308920577-31569-1-git-send-email-alevy@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 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 v2] qxl: update revision to QXL_REVISION_STABLE_V10 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 also errors if provided revision is wrong. 0 is reserved for experimental revision, the other valid values are as before: 1 - V04 2 - V06 And the new 3 - V10 --- hw/qxl.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/hw/qxl.c b/hw/qxl.c index b4bc376..969a984 100644 --- a/hw/qxl.c +++ b/hw/qxl.c @@ -1424,18 +1424,24 @@ static int qxl_init_common(PCIQXLDevice *qxl) qxl->num_surfaces = NUM_SURFACES; switch (qxl->revision) { - case 1: /* spice 0.4 -- qxl-1 */ + case QXL_REVISION_STABLE_V04: /* spice 0.4 -- qxl-1 */ pci_device_id = QXL_DEVICE_ID_STABLE; pci_device_rev = QXL_REVISION_STABLE_V04; break; - case 2: /* spice 0.6 -- qxl-2 */ + case QXL_REVISION_STABLE_V06: /* spice 0.6 -- qxl-2 */ pci_device_id = QXL_DEVICE_ID_STABLE; pci_device_rev = QXL_REVISION_STABLE_V06; break; - default: /* experimental */ + case QXL_REVISION_STABLE_V10: /* spice 1.0 -- qxl-3 */ + pci_device_id = QXL_DEVICE_ID_STABLE; + pci_device_rev = QXL_REVISION_STABLE_V10; + break; + case 0: /* experimental */ pci_device_id = QXL_DEVICE_ID_DEVEL; pci_device_rev = 1; break; + default: + error_report("bad revision paramter"); } pci_config_set_vendor_id(config, REDHAT_PCI_VENDOR_ID); @@ -1723,7 +1729,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, 2), + 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),