ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

* spice/spice.v55:
  qxl: set size of PCI IO BAR correctly (16) for revision 2
This commit is contained in:
Anthony Liguori 2012-05-14 10:07:06 -05:00
parent 82ac96a72b 3f6297b922
commit caa3d6d37b
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/qxl.c
View File

@ -1746,13 +1746,16 @@ static int qxl_init_common(PCIQXLDevice *qxl)
switch (qxl->revision) { switch (qxl->revision) {
case 1: /* spice 0.4 -- qxl-1 */ case 1: /* spice 0.4 -- qxl-1 */
pci_device_rev = QXL_REVISION_STABLE_V04; pci_device_rev = QXL_REVISION_STABLE_V04;
io_size = 8;
break; break;
case 2: /* spice 0.6 -- qxl-2 */ case 2: /* spice 0.6 -- qxl-2 */
pci_device_rev = QXL_REVISION_STABLE_V06; pci_device_rev = QXL_REVISION_STABLE_V06;
io_size = 16;
break; break;
case 3: /* qxl-3 */ case 3: /* qxl-3 */
default: default:
pci_device_rev = QXL_DEFAULT_REVISION; pci_device_rev = QXL_DEFAULT_REVISION;
io_size = msb_mask(QXL_IO_RANGE_SIZE * 2 - 1);
break; break;
} }
@ -1770,11 +1773,6 @@ static int qxl_init_common(PCIQXLDevice *qxl)
memory_region_init_alias(&qxl->vram32_bar, "qxl.vram32", &qxl->vram_bar, memory_region_init_alias(&qxl->vram32_bar, "qxl.vram32", &qxl->vram_bar,
0, qxl->vram32_size); 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, memory_region_init_io(&qxl->io_bar, &qxl_io_ops, qxl,
"qxl-ioports", io_size); "qxl-ioports", io_size);
if (qxl->id == 0) { if (qxl->id == 0) {