From 2bf2512b88bdf68d1f02cc46dbbd75d669d823a8 Mon Sep 17 00:00:00 2001
From: Yaniv Kamay <ykamay@redhat.com>
Date: Mon, 8 Jun 2009 12:21:15 +0300
Subject: [PATCH 2/2] spice: change vendor id #504190

Hi,

Attaching patch that change PCI vendor id from Qumranet 0x1af4 to RedHat
0x1b36.
BZ #504190

Thanks,
Yaniv

>From 1a27b95e9262af59c9c2a2bc58b87726e898e288 Mon Sep 17 00:00:00 2001
From: Yaniv Kamay <ykamay@redhat.com>
Date: Thu, 4 Jun 2009 22:44:07 +0300
Subject: [PATCH 1/2] spice: change vendor id #504190

Message-ID: <4A2CD80B.1020200@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
RH-Upstream-status: not-applicable
Acked-by: Dor Laor <dlaor@redhat.com>
Acked-by: Izik Eidus <ieidus@redhat.com>
Acked-by: Juan Quintela <quintela@redhat.com>
Bugzilla: 504237
---
 qemu/hw/qxl.c     |    6 +++---
 qemu/hw/qxl_dev.h |    8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/qemu/hw/qxl.c b/qemu/hw/qxl.c
index 473378a..f8f3eb6 100644
--- a/qemu/hw/qxl.c
+++ b/qemu/hw/qxl.c
@@ -1665,7 +1665,7 @@ static void regitser_interface(PCIQXLDevice *d)
     interface->vd_interface.base.major_version = VD_INTERFACE_QXL_MAJOR;
     interface->vd_interface.base.minor_version = VD_INTERFACE_QXL_MINOR;
 
-    interface->vd_interface.pci_vendor = QUMRANET_PCI_VENDOR_ID;
+    interface->vd_interface.pci_vendor = REDHAT_PCI_VENDOR_ID;
     interface->vd_interface.pci_id = QXL_DEVICE_ID;
     interface->vd_interface.pci_revision = QXL_REVISION;
 
@@ -1851,7 +1851,7 @@ static void vdi_port_init(PCIBus *bus, uint8_t *ram, unsigned long ram_offset,
     }
     pci_conf = (PCIConf *)d->pci_dev.config;
 
-    pci_conf->vendor_ID = QUMRANET_PCI_VENDOR_ID;
+    pci_conf->vendor_ID = REDHAT_PCI_VENDOR_ID;
     pci_conf->device_ID = VDI_PORT_DEVICE_ID;
     pci_conf->revision = VDI_PORT_REVISION;
     pci_conf->class_base = PCI_CLASS_COM_CONTROLLER;
@@ -1914,7 +1914,7 @@ void qxl_init(PCIBus *bus, uint8_t *vram, unsigned long vram_offset,
 
     pci_conf = (PCIConf *)d->pci_dev.config;
 
-    pci_conf->vendor_ID = QUMRANET_PCI_VENDOR_ID;
+    pci_conf->vendor_ID = REDHAT_PCI_VENDOR_ID;
     pci_conf->device_ID = QXL_DEVICE_ID;
     pci_conf->revision = QXL_REVISION;
     pci_conf->class_base = PCI_CLASS_DISPLAY;
diff --git a/qemu/hw/qxl_dev.h b/qemu/hw/qxl_dev.h
index 15b8fb9..def2bc9 100644
--- a/qemu/hw/qxl_dev.h
+++ b/qemu/hw/qxl_dev.h
@@ -19,9 +19,9 @@
 #define mb() __asm {lock add [esp], 0}
 #endif
 
-#define QUMRANET_PCI_VENDOR_ID 0x1af4
-#define QXL_DEVICE_ID 0x0100 /* 0x100-0x1ff reserved for spice */
-#define QXL_REVISION 0x11
+#define REDHAT_PCI_VENDOR_ID 0x1b36
+#define QXL_DEVICE_ID 0x0100 /* 0x100-0x11f reserved for spice */
+#define QXL_REVISION 0x01
 
 #define QXL_ROM_MAGIC (*(UINT32*)"QXRO")
 #define QXL_RAM_MAGIC (*(UINT32*)"QXRA")
@@ -294,7 +294,7 @@ typedef struct ATTR_PACKED QXLImage {
 } QXLImage;
 
 
-#define VDI_PORT_DEVICE_ID 0x0121
+#define VDI_PORT_DEVICE_ID 0x0105
 #define VDI_PORT_REVISION 0x01
 
 #define VDI_PORT_INTERRUPT (1 << 0)
-- 
1.6.3.rc4.29.g8146