dcavalca / rpms / qemu

Forked from rpms/qemu a year ago
Clone

Blame 0023-qxl-pci-rev-fixups.patch

Justin M. Forbes a81953
From 727553e1a33dccab2b27ee5e184e003440765289 Mon Sep 17 00:00:00 2001
Justin M. Forbes a81953
From: Gerd Hoffmann <kraxel@redhat.com>
Justin M. Forbes a81953
Date: Thu, 8 Jul 2010 16:29:27 +0200
Justin M. Forbes a81953
Subject: [PATCH 23/39] qxl: pci rev fixups
Justin M. Forbes a81953
Justin M. Forbes a81953
---
Justin M. Forbes a81953
 hw/qxl.c |   20 ++++++++------------
Justin M. Forbes a81953
 1 files changed, 8 insertions(+), 12 deletions(-)
Justin M. Forbes a81953
Justin M. Forbes a81953
diff --git a/hw/qxl.c b/hw/qxl.c
Justin M. Forbes a81953
index 475360c..2a0ea4e 100644
Justin M. Forbes a81953
--- a/hw/qxl.c
Justin M. Forbes a81953
+++ b/hw/qxl.c
Justin M. Forbes a81953
@@ -511,10 +511,6 @@ static const QXLInterface qxl_interface = {
Justin M. Forbes a81953
     .base.major_version      = SPICE_INTERFACE_QXL_MAJOR,
Justin M. Forbes a81953
     .base.minor_version      = SPICE_INTERFACE_QXL_MINOR,
Justin M. Forbes a81953
Justin M. Forbes a81953
-    .pci_vendor              = REDHAT_PCI_VENDOR_ID,
Justin M. Forbes a81953
-    .pci_id                  = QXL_DEVICE_ID,
Justin M. Forbes a81953
-    .pci_revision            = QXL_REVISION,
Justin M. Forbes a81953
-
Justin M. Forbes a81953
     .attache_worker          = interface_attach_worker,
Justin M. Forbes a81953
     .set_compression_level   = interface_set_compression_level,
Justin M. Forbes a81953
     .set_mm_time             = interface_set_mm_time,
Justin M. Forbes a81953
@@ -1136,16 +1132,16 @@ static int qxl_init(PCIDevice *dev)
Justin M. Forbes a81953
     qxl->generation = 1;
Justin M. Forbes a81953
Justin M. Forbes a81953
     switch (qxl->revision) {
Justin M. Forbes a81953
-    case 1: /* qxl-1 */
Justin M. Forbes a81953
-        pci_device_id  = 0x0100;
Justin M. Forbes a81953
-        pci_device_rev = 1;
Justin M. Forbes a81953
+    case 1: /* spice 0.4 -- qxl-1 */
Justin M. Forbes a81953
+        pci_device_id  = QXL_DEVICE_ID_STABLE;
Justin M. Forbes a81953
+        pci_device_rev = QXL_REVISION_STABLE_V04;
Justin M. Forbes a81953
         break;
Justin M. Forbes a81953
-    case 2: /* qxl-2 */
Justin M. Forbes a81953
-        pci_device_id  = 0x0100;
Justin M. Forbes a81953
-        pci_device_rev = 2;
Justin M. Forbes a81953
+    case 2: /* spice 0.6 -- qxl-2 */
Justin M. Forbes a81953
+        pci_device_id  = QXL_DEVICE_ID_STABLE;
Justin M. Forbes a81953
+        pci_device_rev = QXL_REVISION_STABLE_V06;
Justin M. Forbes a81953
         break;
Justin M. Forbes a81953
-    default: /* unstable */
Justin M. Forbes a81953
-        pci_device_id  = 0x01ff;
Justin M. Forbes a81953
+    default: /* experimental */
Justin M. Forbes a81953
+        pci_device_id  = QXL_DEVICE_ID_DEVEL;
Justin M. Forbes a81953
         pci_device_rev = 1;
Justin M. Forbes a81953
         break;
Justin M. Forbes a81953
     }
Justin M. Forbes a81953
-- 
Justin M. Forbes a81953
1.7.2.3
Justin M. Forbes a81953