[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 1/9] qxl: device id fixup
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 1/9] qxl: device id fixup |
Date: |
Mon, 4 Jul 2011 17:14:07 +0200 |
Move device ID to PCIDeviceInfo.
Remove support for the unused unstable device ID.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/qxl.c | 11 +++--------
1 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/hw/qxl.c b/hw/qxl.c
index 16316f2..e95d6f7 100644
--- a/hw/qxl.c
+++ b/hw/qxl.c
@@ -1207,7 +1207,6 @@ 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 io_size;
@@ -1218,20 +1217,14 @@ static int qxl_init_common(PCIQXLDevice *qxl)
switch (qxl->revision) {
case 1: /* 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 */
- pci_device_id = QXL_DEVICE_ID_STABLE;
+ default:
pci_device_rev = QXL_REVISION_STABLE_V06;
break;
- default: /* experimental */
- pci_device_id = QXL_DEVICE_ID_DEVEL;
- pci_device_rev = 1;
- break;
}
- pci_config_set_device_id(config, pci_device_id);
pci_set_byte(&config[PCI_REVISION_ID], pci_device_rev);
pci_set_byte(&config[PCI_INTERRUPT_PIN], 1);
@@ -1492,6 +1485,7 @@ static PCIDeviceInfo qxl_info_primary = {
.config_write = qxl_write_config,
.romfile = "vgabios-qxl.bin",
.vendor_id = REDHAT_PCI_VENDOR_ID,
+ .device_id = QXL_DEVICE_ID_STABLE,
.class_id = PCI_CLASS_DISPLAY_VGA,
.qdev.props = (Property[]) {
DEFINE_PROP_UINT32("ram_size", PCIQXLDevice, vga.vram_size, 64 * 1024
* 1024),
@@ -1512,6 +1506,7 @@ static PCIDeviceInfo qxl_info_secondary = {
.qdev.vmsd = &qxl_vmstate,
.init = qxl_init_secondary,
.vendor_id = REDHAT_PCI_VENDOR_ID,
+ .device_id = QXL_DEVICE_ID_STABLE,
.class_id = PCI_CLASS_DISPLAY_OTHER,
.qdev.props = (Property[]) {
DEFINE_PROP_UINT32("ram_size", PCIQXLDevice, vga.vram_size, 64 * 1024
* 1024),
--
1.7.1
- [Qemu-devel] [PULL] spice patch queue, Gerd Hoffmann, 2011/07/04
- [Qemu-devel] [PATCH 2/9] spice: catch spice server initialization failures., Gerd Hoffmann, 2011/07/04
- [Qemu-devel] [PATCH 5/9] qxl-logger: add timestamp to command log, Gerd Hoffmann, 2011/07/04
- [Qemu-devel] [PATCH 3/9] qxl: set mm_time in vga update, Gerd Hoffmann, 2011/07/04
- [Qemu-devel] [PATCH 7/9] qxl: make sure primary surface is saved on migration, Gerd Hoffmann, 2011/07/04
- [Qemu-devel] [PATCH 8/9] qxl: put QXL_IO_UPDATE_IRQ into vgamode whitelist, Gerd Hoffmann, 2011/07/04
- [Qemu-devel] [PATCH 6/9] qxl: add dev id to guest prints, Gerd Hoffmann, 2011/07/04
- [Qemu-devel] [PATCH 1/9] qxl: device id fixup,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 4/9] qxl: interface_get_command: fix reported mode, Gerd Hoffmann, 2011/07/04
- [Qemu-devel] [PATCH 9/9] qxl: allow QXL_IO_LOG also in vga, Gerd Hoffmann, 2011/07/04
- Re: [Qemu-devel] [PULL] spice patch queue, Gerd Hoffmann, 2011/07/12
- Re: [Qemu-devel] [PULL] spice patch queue, Anthony Liguori, 2011/07/19