Browse files

Merge remote-tracking branch 'spice/spice.v55' into staging

* spice/spice.v55:
  qxl: set size of PCI IO BAR correctly (16) for revision 2
  • Loading branch information...
2 parents 82ac96a + 3f6297b commit caa3d6d37b596e5fb59d4f7e845b84fa8f583fe7 Anthony Liguori committed May 14, 2012
Showing with 3 additions and 5 deletions.
  1. +3 −5 hw/qxl.c
View
8 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) {

0 comments on commit caa3d6d

Please sign in to comment.