qxl: bump pci rev
Inform guest drivers about the new features I/O commands we have now (async commands, S3 support) if building with newer spice, i.e. if SPICE_INTERFACE_QXL_MINOR >= 1. sneaked in some 81+ column line spliting. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Alon Levy <alevy@redhat.com>
This commit is contained in:
parent
3e16b9c534
commit
9197a7c8af
25
hw/qxl.c
25
hw/qxl.c
|
@ -1566,9 +1566,14 @@ static int qxl_init_common(PCIQXLDevice *qxl)
|
||||||
pci_device_rev = QXL_REVISION_STABLE_V04;
|
pci_device_rev = QXL_REVISION_STABLE_V04;
|
||||||
break;
|
break;
|
||||||
case 2: /* spice 0.6 -- qxl-2 */
|
case 2: /* spice 0.6 -- qxl-2 */
|
||||||
default:
|
|
||||||
pci_device_rev = QXL_REVISION_STABLE_V06;
|
pci_device_rev = QXL_REVISION_STABLE_V06;
|
||||||
break;
|
break;
|
||||||
|
#if SPICE_INTERFACE_QXL_MINOR >= 1
|
||||||
|
case 3: /* qxl-3 */
|
||||||
|
#endif
|
||||||
|
default:
|
||||||
|
pci_device_rev = QXL_DEFAULT_REVISION;
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
pci_set_byte(&config[PCI_REVISION_ID], pci_device_rev);
|
pci_set_byte(&config[PCI_REVISION_ID], pci_device_rev);
|
||||||
|
@ -1830,9 +1835,12 @@ static PCIDeviceInfo qxl_info_primary = {
|
||||||
.device_id = QXL_DEVICE_ID_STABLE,
|
.device_id = QXL_DEVICE_ID_STABLE,
|
||||||
.class_id = PCI_CLASS_DISPLAY_VGA,
|
.class_id = PCI_CLASS_DISPLAY_VGA,
|
||||||
.qdev.props = (Property[]) {
|
.qdev.props = (Property[]) {
|
||||||
DEFINE_PROP_UINT32("ram_size", PCIQXLDevice, vga.vram_size, 64 * 1024 * 1024),
|
DEFINE_PROP_UINT32("ram_size", PCIQXLDevice, vga.vram_size,
|
||||||
DEFINE_PROP_UINT32("vram_size", PCIQXLDevice, vram_size, 64 * 1024 * 1024),
|
64 * 1024 * 1024),
|
||||||
DEFINE_PROP_UINT32("revision", PCIQXLDevice, revision, 2),
|
DEFINE_PROP_UINT32("vram_size", PCIQXLDevice, vram_size,
|
||||||
|
64 * 1024 * 1024),
|
||||||
|
DEFINE_PROP_UINT32("revision", PCIQXLDevice, revision,
|
||||||
|
QXL_DEFAULT_REVISION),
|
||||||
DEFINE_PROP_UINT32("debug", PCIQXLDevice, debug, 0),
|
DEFINE_PROP_UINT32("debug", PCIQXLDevice, debug, 0),
|
||||||
DEFINE_PROP_UINT32("guestdebug", PCIQXLDevice, guestdebug, 0),
|
DEFINE_PROP_UINT32("guestdebug", PCIQXLDevice, guestdebug, 0),
|
||||||
DEFINE_PROP_UINT32("cmdlog", PCIQXLDevice, cmdlog, 0),
|
DEFINE_PROP_UINT32("cmdlog", PCIQXLDevice, cmdlog, 0),
|
||||||
|
@ -1851,9 +1859,12 @@ static PCIDeviceInfo qxl_info_secondary = {
|
||||||
.device_id = QXL_DEVICE_ID_STABLE,
|
.device_id = QXL_DEVICE_ID_STABLE,
|
||||||
.class_id = PCI_CLASS_DISPLAY_OTHER,
|
.class_id = PCI_CLASS_DISPLAY_OTHER,
|
||||||
.qdev.props = (Property[]) {
|
.qdev.props = (Property[]) {
|
||||||
DEFINE_PROP_UINT32("ram_size", PCIQXLDevice, vga.vram_size, 64 * 1024 * 1024),
|
DEFINE_PROP_UINT32("ram_size", PCIQXLDevice, vga.vram_size,
|
||||||
DEFINE_PROP_UINT32("vram_size", PCIQXLDevice, vram_size, 64 * 1024 * 1024),
|
64 * 1024 * 1024),
|
||||||
DEFINE_PROP_UINT32("revision", PCIQXLDevice, revision, 2),
|
DEFINE_PROP_UINT32("vram_size", PCIQXLDevice, vram_size,
|
||||||
|
64 * 1024 * 1024),
|
||||||
|
DEFINE_PROP_UINT32("revision", PCIQXLDevice, revision,
|
||||||
|
QXL_DEFAULT_REVISION),
|
||||||
DEFINE_PROP_UINT32("debug", PCIQXLDevice, debug, 0),
|
DEFINE_PROP_UINT32("debug", PCIQXLDevice, debug, 0),
|
||||||
DEFINE_PROP_UINT32("guestdebug", PCIQXLDevice, guestdebug, 0),
|
DEFINE_PROP_UINT32("guestdebug", PCIQXLDevice, guestdebug, 0),
|
||||||
DEFINE_PROP_UINT32("cmdlog", PCIQXLDevice, cmdlog, 0),
|
DEFINE_PROP_UINT32("cmdlog", PCIQXLDevice, cmdlog, 0),
|
||||||
|
|
6
hw/qxl.h
6
hw/qxl.h
|
@ -102,6 +102,12 @@ typedef struct PCIQXLDevice {
|
||||||
} \
|
} \
|
||||||
} while (0)
|
} while (0)
|
||||||
|
|
||||||
|
#if SPICE_INTERFACE_QXL_MINOR >= 1
|
||||||
|
#define QXL_DEFAULT_REVISION QXL_REVISION_STABLE_V10
|
||||||
|
#else
|
||||||
|
#define QXL_DEFAULT_REVISION QXL_REVISION_STABLE_V06
|
||||||
|
#endif
|
||||||
|
|
||||||
/* qxl.c */
|
/* qxl.c */
|
||||||
void *qxl_phys2virt(PCIQXLDevice *qxl, QXLPHYSICAL phys, int group_id);
|
void *qxl_phys2virt(PCIQXLDevice *qxl, QXLPHYSICAL phys, int group_id);
|
||||||
void qxl_guest_bug(PCIQXLDevice *qxl, const char *msg, ...);
|
void qxl_guest_bug(PCIQXLDevice *qxl, const char *msg, ...);
|
||||||
|
|
Loading…
Reference in a new issue