@@ -1494,8 +1494,8 @@ 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 pci_device_id = 0;
+ uint32_t pci_device_rev = 0;
uint32_t io_size;
qxl->mode = QXL_MODE_UNDEFINED;
@@ -1505,22 +1505,24 @@ static int qxl_init_common(PCIQXLDevice *qxl)
qemu_mutex_init(&qxl->track_lock);
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;
- case 3: /* qxl-3 */
+ case QXL_REVISION_STABLE_V10: /* spice 0.10 -- qxl-3 */
pci_device_id = QXL_DEVICE_ID_STABLE;
- pci_device_rev = 3;
+ pci_device_rev = QXL_REVISION_STABLE_V10;
break;
- default: /* experimental */
+ case 0: /* experimental */
pci_device_id = QXL_DEVICE_ID_DEVEL;
pci_device_rev = 1;
break;
+ default:
+ error_report("bad revision paramter");
}
pci_config_set_device_id(config, pci_device_id);