aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2012-05-14 10:07:06 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2012-05-14 10:07:06 -0500
commitcaa3d6d37b596e5fb59d4f7e845b84fa8f583fe7 (patch)
tree3aacbeb47c3b8a613eb62f0332e9d91319c27d71
parent82ac96a72b860f6a4f125edd12f85cb21b3d66bf (diff)
parent3f6297b922622236f7d7a6c0ff85169e95cb6138 (diff)
Merge remote-tracking branch 'spice/spice.v55' into staging
* spice/spice.v55: qxl: set size of PCI IO BAR correctly (16) for revision 2
-rw-r--r--hw/qxl.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/hw/qxl.c b/hw/qxl.c
index 6c11e70049..3da3399934 100644
--- a/hw/qxl.c
+++ b/hw/qxl.c
@@ -1746,13 +1746,16 @@ static int qxl_init_common(PCIQXLDevice *qxl)
switch (qxl->revision) {
case 1: /* spice 0.4 -- qxl-1 */
pci_device_rev = QXL_REVISION_STABLE_V04;
+ io_size = 8;
break;
case 2: /* spice 0.6 -- qxl-2 */
pci_device_rev = QXL_REVISION_STABLE_V06;
+ io_size = 16;
break;
case 3: /* qxl-3 */
default:
pci_device_rev = QXL_DEFAULT_REVISION;
+ io_size = msb_mask(QXL_IO_RANGE_SIZE * 2 - 1);
break;
}
@@ -1770,11 +1773,6 @@ static int qxl_init_common(PCIQXLDevice *qxl)
memory_region_init_alias(&qxl->vram32_bar, "qxl.vram32", &qxl->vram_bar,
0, qxl->vram32_size);
- io_size = msb_mask(QXL_IO_RANGE_SIZE * 2 - 1);
- if (qxl->revision == 1) {
- io_size = 8;
- }
-
memory_region_init_io(&qxl->io_bar, &qxl_io_ops, qxl,
"qxl-ioports", io_size);
if (qxl->id == 0) {