[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCHv3] qxl: update revision to QXL_REVISION_STABLE_V10
From: |
Alon Levy |
Subject: |
[Qemu-devel] [PATCHv3] qxl: update revision to QXL_REVISION_STABLE_V10 |
Date: |
Wed, 29 Jun 2011 13:57:17 +0200 |
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 | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/hw/qxl.c b/hw/qxl.c
index 0ab8074..29425a5 100644
--- a/hw/qxl.c
+++ b/hw/qxl.c
@@ -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);
--
1.7.5.4
- Re: [Qemu-devel] [PATCHv3] qxl: abort on panic instead of exit, (continued)
- [Qemu-devel] [PATCHv3] qxl: add dev id to guest prints, Alon Levy, 2011/06/29
- [Qemu-devel] [PATCHv3] qxl: add io_port_to_string, Alon Levy, 2011/06/29
- [Qemu-devel] [PATCHv3] qxl: update revision to QXL_REVISION_STABLE_V10,
Alon Levy <=
- [Qemu-devel] [PATCHv3] qxl: add QXL_IO_FLUSH_{SURFACES, RELEASE} for guest S3&S4 support, Alon Levy, 2011/06/29
- Re: [Qemu-devel] [PATCHv3] qxl: add QXL_IO_FLUSH_{SURFACES, RELEASE} for guest S3&S4 support, Alon Levy, 2011/06/29
[Qemu-devel] [PATCHv3] qxl: move to UNDEFINED on DESTROY_ALL_SURFACES{, _ASYNC}, Alon Levy, 2011/06/29