[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCHv3] qxl: bump pci rev
From: |
Alon Levy |
Subject: |
[Qemu-devel] [PATCHv3] qxl: bump pci rev |
Date: |
Tue, 12 Jul 2011 16:55:22 +0300 |
From: Gerd Hoffmann <address@hidden>
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.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/qxl.c | 11 ++++++++---
hw/qxl.h | 6 ++++++
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/hw/qxl.c b/hw/qxl.c
index ae1d0de..d3b1581 100644
--- a/hw/qxl.c
+++ b/hw/qxl.c
@@ -1389,9 +1389,14 @@ static int qxl_init_common(PCIQXLDevice *qxl)
pci_device_rev = QXL_REVISION_STABLE_V04;
break;
case 2: /* spice 0.6 -- qxl-2 */
- default:
pci_device_rev = QXL_REVISION_STABLE_V06;
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);
@@ -1655,7 +1660,7 @@ static PCIDeviceInfo qxl_info_primary = {
.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_DEFAULT_REVISION),
DEFINE_PROP_UINT32("debug", PCIQXLDevice, debug, 0),
DEFINE_PROP_UINT32("guestdebug", PCIQXLDevice, guestdebug, 0),
DEFINE_PROP_UINT32("cmdlog", PCIQXLDevice, cmdlog, 0),
@@ -1676,7 +1681,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_DEFAULT_REVISION),
DEFINE_PROP_UINT32("debug", PCIQXLDevice, debug, 0),
DEFINE_PROP_UINT32("guestdebug", PCIQXLDevice, guestdebug, 0),
DEFINE_PROP_UINT32("cmdlog", PCIQXLDevice, cmdlog, 0),
diff --git a/hw/qxl.h b/hw/qxl.h
index e361bc6..85d37be 100644
--- a/hw/qxl.h
+++ b/hw/qxl.h
@@ -97,6 +97,12 @@ typedef struct PCIQXLDevice {
} \
} 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 */
void *qxl_phys2virt(PCIQXLDevice *qxl, QXLPHYSICAL phys, int group_id);
void qxl_guest_bug(PCIQXLDevice *qxl, const char *msg, ...);
--
1.7.6
- [Qemu-devel] [PATCHv3] async + suspend reworked, Alon Levy, 2011/07/12
- [Qemu-devel] [PATCHv3] spice: add worker wrapper functions., Alon Levy, 2011/07/12
- [Qemu-devel] [PATCHv3] spice: add qemu_spice_display_init_common, Alon Levy, 2011/07/12
- [Qemu-devel] [PATCHv3] qxl: remove qxl_destroy_primary(), Alon Levy, 2011/07/12
- [Qemu-devel] [PATCHv3] qxl: fix surface tracking & locking, Alon Levy, 2011/07/12
- [Qemu-devel] [PATCHv3] qxl: bump pci rev,
Alon Levy <=
- [Qemu-devel] [PATCHv3] qxl: make qxl_guest_bug take variable arguments, Alon Levy, 2011/07/12
- [Qemu-devel] [PATCHv3] qxl: error handling fixes and cleanups., Alon Levy, 2011/07/12
- [Qemu-devel] [PATCHv3] qxl-render/qxl: split out qxl_save_ppm, Alon Levy, 2011/07/12
- Re: [Qemu-devel] [PATCHv3] qxl-render/qxl: split out qxl_save_ppm, Gerd Hoffmann, 2011/07/13
- Re: [Qemu-devel] [PATCHv3] qxl-render/qxl: split out qxl_save_ppm, Alon Levy, 2011/07/13
- Re: [Qemu-devel] [PATCHv3] qxl-render/qxl: split out qxl_save_ppm, Gerd Hoffmann, 2011/07/13
- Re: [Qemu-devel] [PATCHv3] qxl-render/qxl: split out qxl_save_ppm, Daniel P. Berrange, 2011/07/13
- Re: [Qemu-devel] [PATCHv3] qxl-render/qxl: split out qxl_save_ppm, Alon Levy, 2011/07/13
- Re: [Qemu-devel] [PATCHv3] qxl-render/qxl: split out qxl_save_ppm, Gerd Hoffmann, 2011/07/13
- Re: [Qemu-devel] [PATCHv3] qxl-render/qxl: split out qxl_save_ppm, Luiz Capitulino, 2011/07/13