also errors if provided revision is wrong. 0 is reserved for experimental revision, the other valid values are as before: 1 - V04 2 - V06 And the new 3 - V10 --- hw/qxl.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/hw/qxl.c b/hw/qxl.c index b4bc376..969a984 100644 --- a/hw/qxl.c +++ b/hw/qxl.c @@ -1424,18 +1424,24 @@ static int qxl_init_common(PCIQXLDevice *qxl) qxl->num_surfaces = NUM_SURFACES; switch (qxl->revision) { - case 1: /* spice 0.4 -- qxl-1 */ + case QXL_REVISION_STABLE_V04: /* 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 */ + case QXL_REVISION_STABLE_V06: /* spice 0.6 -- qxl-2 */ pci_device_id = QXL_DEVICE_ID_STABLE; pci_device_rev = QXL_REVISION_STABLE_V06; break; - default: /* experimental */ + case QXL_REVISION_STABLE_V10: /* spice 1.0 -- qxl-3 */ + pci_device_id = QXL_DEVICE_ID_STABLE; + pci_device_rev = QXL_REVISION_STABLE_V10; + break; + case 0: /* experimental */ pci_device_id = QXL_DEVICE_ID_DEVEL; pci_device_rev = 1; break; + default: + error_report("bad revision paramter"); } pci_config_set_vendor_id(config, REDHAT_PCI_VENDOR_ID); @@ -1723,7 +1729,7 @@ static PCIDeviceInfo qxl_info_secondary = { .qdev.props = (Property[]) { DEFINE_PROP_UINT32("ram_size", PCIQXLDevice, vga.vram_size, 64 * 1024 * 1024), DEFINE_PROP_UINT32("vram_size", PCIQXLDevice, vram_size, 64 * 1024 * 1024), - DEFINE_PROP_UINT32("revision", PCIQXLDevice, revision, 2), + DEFINE_PROP_UINT32("revision", PCIQXLDevice, revision, QXL_REVISION_STABLE_V10), DEFINE_PROP_UINT32("debug", PCIQXLDevice, debug, 0), DEFINE_PROP_UINT32("guestdebug", PCIQXLDevice, guestdebug, 0), DEFINE_PROP_UINT32("cmdlog", PCIQXLDevice, cmdlog, 0), -- 1.7.5.4