[Spice-commits] Branch 'spice.v13' - 3 commits - hw/qxl.c spice-display.c

[Gerd Hoffmann]

 hw/qxl.c        |   20 ++++++++------------
 spice-display.c |    6 +-----
 2 files changed, 9 insertions(+), 17 deletions(-)

New commits:
commit eb808991830cfb0056b31aa0a79d4405062cdb8d
Author: Gerd Hoffmann <kraxel at redhat.com>
Date:   Thu Jul 8 16:29:27 2010 +0200

    qxl: pci rev fixups

diff --git a/hw/qxl.c b/hw/qxl.c
index 475360c..2a0ea4e 100644
--- a/hw/qxl.c
+++ b/hw/qxl.c
@@ -511,10 +511,6 @@ static const QXLInterface qxl_interface = {
     .base.major_version      = SPICE_INTERFACE_QXL_MAJOR,
     .base.minor_version      = SPICE_INTERFACE_QXL_MINOR,
 
-    .pci_vendor              = REDHAT_PCI_VENDOR_ID,
-    .pci_id                  = QXL_DEVICE_ID,
-    .pci_revision            = QXL_REVISION,
-
     .attache_worker          = interface_attach_worker,
     .set_compression_level   = interface_set_compression_level,
     .set_mm_time             = interface_set_mm_time,
@@ -1136,16 +1132,16 @@ static int qxl_init(PCIDevice *dev)
     qxl->generation = 1;
 
     switch (qxl->revision) {
-    case 1: /* qxl-1 */
-        pci_device_id  = 0x0100;
-        pci_device_rev = 1;
+    case 1: /* spice 0.4 -- qxl-1 */
+        pci_device_id  = QXL_DEVICE_ID_STABLE;
+        pci_device_rev = QXL_REVISION_STABLE_V04;
         break;
-    case 2: /* qxl-2 */
-        pci_device_id  = 0x0100;
-        pci_device_rev = 2;
+    case 2: /* spice 0.6 -- qxl-2 */
+        pci_device_id  = QXL_DEVICE_ID_STABLE;
+        pci_device_rev = QXL_REVISION_STABLE_V06;
         break;
-    default: /* unstable */
-        pci_device_id  = 0x01ff;
+    default: /* experimental */
+        pci_device_id  = QXL_DEVICE_ID_DEVEL;
         pci_device_rev = 1;
         break;
     }
commit 9b99c7ce7c6e2fac78cc6ac0bdde2f80f64382e4
Author: Gerd Hoffmann <kraxel at redhat.com>
Date:   Thu Jul 8 16:29:15 2010 +0200

    spice-display: pci rev fixups

diff --git a/spice-display.c b/spice-display.c
index 2291cc7..87a71cd 100644
--- a/spice-display.c
+++ b/spice-display.c
@@ -334,10 +334,6 @@ static const QXLInterface dpy_interface = {
     .base.major_version      = SPICE_INTERFACE_QXL_MAJOR,
     .base.minor_version      = SPICE_INTERFACE_QXL_MINOR,
 
-    .pci_vendor              = REDHAT_PCI_VENDOR_ID,
-    .pci_id                  = QXL_DEVICE_ID,
-    .pci_revision            = QXL_REVISION,
-
     .attache_worker          = interface_attach_worker,
     .set_compression_level   = interface_set_compression_level,
     .set_mm_time             = interface_set_mm_time,
commit 38654f56387317f9cd16c184a5b5ecb444c6e813
Author: Gerd Hoffmann <kraxel at redhat.com>
Date:   Thu Jul 8 14:31:10 2010 +0200

    spice-display: disable debug

diff --git a/spice-display.c b/spice-display.c
index a749e64..2291cc7 100644
--- a/spice-display.c
+++ b/spice-display.c
@@ -15,7 +15,7 @@
 
 #include "spice-display.h"
 
-static int debug = 1;
+static int debug = 0;
 
 int qemu_spice_rect_is_empty(const QXLRect* r)
 {