Revision 638f4e47

b/hw/qxl.c
1207 1207
static int qxl_init_common(PCIQXLDevice *qxl)
1208 1208
{
1209 1209
    uint8_t* config = qxl->pci.config;
1210
    uint32_t pci_device_id;
1211 1210
    uint32_t pci_device_rev;
1212 1211
    uint32_t io_size;
1213 1212

  
......
1218 1217

  
1219 1218
    switch (qxl->revision) {
1220 1219
    case 1: /* spice 0.4 -- qxl-1 */
1221
        pci_device_id  = QXL_DEVICE_ID_STABLE;
1222 1220
        pci_device_rev = QXL_REVISION_STABLE_V04;
1223 1221
        break;
1224 1222
    case 2: /* spice 0.6 -- qxl-2 */
1225
        pci_device_id  = QXL_DEVICE_ID_STABLE;
1223
    default:
1226 1224
        pci_device_rev = QXL_REVISION_STABLE_V06;
1227 1225
        break;
1228
    default: /* experimental */
1229
        pci_device_id  = QXL_DEVICE_ID_DEVEL;
1230
        pci_device_rev = 1;
1231
        break;
1232 1226
    }
1233 1227

  
1234
    pci_config_set_device_id(config, pci_device_id);
1235 1228
    pci_set_byte(&config[PCI_REVISION_ID], pci_device_rev);
1236 1229
    pci_set_byte(&config[PCI_INTERRUPT_PIN], 1);
1237 1230

  
......
1492 1485
    .config_write = qxl_write_config,
1493 1486
    .romfile      = "vgabios-qxl.bin",
1494 1487
    .vendor_id    = REDHAT_PCI_VENDOR_ID,
1488
    .device_id    = QXL_DEVICE_ID_STABLE,
1495 1489
    .class_id     = PCI_CLASS_DISPLAY_VGA,
1496 1490
    .qdev.props = (Property[]) {
1497 1491
        DEFINE_PROP_UINT32("ram_size", PCIQXLDevice, vga.vram_size, 64 * 1024 * 1024),
......
1512 1506
    .qdev.vmsd    = &qxl_vmstate,
1513 1507
    .init         = qxl_init_secondary,
1514 1508
    .vendor_id    = REDHAT_PCI_VENDOR_ID,
1509
    .device_id    = QXL_DEVICE_ID_STABLE,
1515 1510
    .class_id     = PCI_CLASS_DISPLAY_OTHER,
1516 1511
    .qdev.props = (Property[]) {
1517 1512
        DEFINE_PROP_UINT32("ram_size", PCIQXLDevice, vga.vram_size, 64 * 1024 * 1024),

Also available in: Unified diff