From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:54103) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QbtOw-0004SG-EK for qemu-devel@nongnu.org; Wed, 29 Jun 2011 07:57:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QbtOs-00073N-Nu for qemu-devel@nongnu.org; Wed, 29 Jun 2011 07:57:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:21228) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QbtOs-000732-7Z for qemu-devel@nongnu.org; Wed, 29 Jun 2011 07:57:46 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p5TBvjYx020363 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 29 Jun 2011 07:57:45 -0400 From: Alon Levy Date: Wed, 29 Jun 2011 13:57:17 +0200 Message-Id: <1309348641-20061-12-git-send-email-alevy@redhat.com> In-Reply-To: <1309348641-20061-1-git-send-email-alevy@redhat.com> References: <1309348641-20061-1-git-send-email-alevy@redhat.com> Subject: [Qemu-devel] [PATCHv3] qxl: update revision to QXL_REVISION_STABLE_V10 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: yhalperi@redhat.com, kraxel@redhat.com 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 | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/hw/qxl.c b/hw/qxl.c index 0ab8074..29425a5 100644 --- a/hw/qxl.c +++ b/hw/qxl.c @@ -1494,8 +1494,8 @@ static DisplayChangeListener display_listener = { static int qxl_init_common(PCIQXLDevice *qxl) { uint8_t* config = qxl->pci.config; - uint32_t pci_device_id; - uint32_t pci_device_rev; + uint32_t pci_device_id = 0; + uint32_t pci_device_rev = 0; uint32_t io_size; qxl->mode = QXL_MODE_UNDEFINED; @@ -1505,22 +1505,24 @@ static int qxl_init_common(PCIQXLDevice *qxl) qemu_mutex_init(&qxl->track_lock); 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; - case 3: /* qxl-3 */ + case QXL_REVISION_STABLE_V10: /* spice 0.10 -- qxl-3 */ pci_device_id = QXL_DEVICE_ID_STABLE; - pci_device_rev = 3; + pci_device_rev = QXL_REVISION_STABLE_V10; break; - default: /* experimental */ + case 0: /* experimental */ pci_device_id = QXL_DEVICE_ID_DEVEL; pci_device_rev = 1; break; + default: + error_report("bad revision paramter"); } pci_config_set_device_id(config, pci_device_id); -- 1.7.5.4