[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCHv5 12/12] qxl: use QXL_REVISION_*
From: |
Alon Levy |
Subject: |
[Qemu-devel] [PATCHv5 12/12] qxl: use QXL_REVISION_* |
Date: |
Thu, 14 Jul 2011 22:13:21 +0300 |
Signed-off-by: Alon Levy <address@hidden>
---
hw/qxl.c | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/hw/qxl.c b/hw/qxl.c
index 5052206..b9d27b9 100644
--- a/hw/qxl.c
+++ b/hw/qxl.c
@@ -1579,7 +1579,6 @@ static DisplayChangeListener display_listener = {
static int qxl_init_common(PCIQXLDevice *qxl)
{
uint8_t* config = qxl->pci.config;
- uint32_t pci_device_rev;
uint32_t io_size;
qxl->mode = QXL_MODE_UNDEFINED;
@@ -1587,23 +1586,25 @@ static int qxl_init_common(PCIQXLDevice *qxl)
qxl->num_memslots = NUM_MEMSLOTS;
qxl->num_surfaces = NUM_SURFACES;
qemu_mutex_init(&qxl->track_lock);
-
+#if SPICE_INTERFACE_QXL_MINOR >= 1
+ qemu_mutex_init(&qxl->async_lock);
+ qxl->current_async = QXL_UNDEFINED_IO;
+#endif
switch (qxl->revision) {
- case 1: /* spice 0.4 -- qxl-1 */
- pci_device_rev = QXL_REVISION_STABLE_V04;
- break;
- case 2: /* spice 0.6 -- qxl-2 */
- pci_device_rev = QXL_REVISION_STABLE_V06;
- break;
+ case QXL_REVISION_STABLE_V04: /* spice 0.4 -- qxl-1 */
+ case QXL_REVISION_STABLE_V06: /* spice 0.6 -- qxl-2 */
#if SPICE_INTERFACE_QXL_MINOR >= 1
- case 3: /* qxl-3 */
+ case QXL_REVISION_STABLE_V10: /* spice 0.10? -- qxl-3 */
+ break;
#endif
default:
- pci_device_rev = QXL_DEFAULT_REVISION;
+ fprintf(stderr, "invalid revision %d, resetting to %d\n",
qxl->revision,
+ QXL_DEFAULT_REVISION);
+ qxl->revision = QXL_DEFAULT_REVISION;
break;
}
- pci_set_byte(&config[PCI_REVISION_ID], pci_device_rev);
+ pci_set_byte(&config[PCI_REVISION_ID], qxl->revision);
pci_set_byte(&config[PCI_INTERRUPT_PIN], 1);
qxl->rom_size = qxl_rom_size();
@@ -1614,14 +1615,14 @@ static int qxl_init_common(PCIQXLDevice *qxl)
if (qxl->vram_size < 16 * 1024 * 1024) {
qxl->vram_size = 16 * 1024 * 1024;
}
- if (qxl->revision == 1) {
+ if (qxl->revision == QXL_REVISION_STABLE_V04) {
qxl->vram_size = 4096;
}
qxl->vram_size = msb_mask(qxl->vram_size * 2 - 1);
qxl->vram_offset = qemu_ram_alloc(&qxl->pci.qdev, "qxl.vram",
qxl->vram_size);
io_size = msb_mask(QXL_IO_RANGE_SIZE * 2 - 1);
- if (qxl->revision == 1) {
+ if (qxl->revision == QXL_REVISION_STABLE_V04) {
io_size = 8;
}
--
1.7.6
- Re: [Qemu-devel] [PATCHv5 09/12] qxl: async io support using new spice api, (continued)
Re: [Qemu-devel] [PATCHv5 09/12] qxl: async io support using new spice api, Gerd Hoffmann, 2011/07/15
[Qemu-devel] [PATCHv5 11/12] qxl: bump pci rev, Alon Levy, 2011/07/14
[Qemu-devel] [PATCHv5 10/12] qxl: add QXL_IO_FLUSH_{SURFACES, RELEASE} for guest S3&S4 support, Alon Levy, 2011/07/14
[Qemu-devel] [PATCHv5 12/12] qxl: use QXL_REVISION_*,
Alon Levy <=