External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-21 20:15:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: always assume QEMU_CAPS_*_HOLE64_SIZE

Browse Source 
Introduced back in 2013 by QEMU commit:
  commit 398489018183d613306ab022653552247d93919f

      pc: limit 64 bit hole to 2G by default

Released in 1.6.0

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Ján Tomko 2022-08-11 19:08:35 +02:00
parent ec73ad2ea5
commit 6b4c1e010e
6 changed files with 5 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/qemu/qemu_validate.c
View File

@ -3984,13 +3984,6 @@ qemuValidateDomainDeviceDefControllerPCI(const virDomainControllerDef *cont,
"supported for machine '%s'"), def->os.machine);
return -1;
}
if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_I440FX_PCI_HOLE64_SIZE)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("64-bit PCI hole size setting is not supported "
"with this QEMU binary"));
return -1;
}
}
break;
@ -4002,13 +3995,6 @@ qemuValidateDomainDeviceDefControllerPCI(const virDomainControllerDef *cont,
"supported for machine '%s'"), def->os.machine);
return -1;
}
if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_Q35_PCI_HOLE64_SIZE)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("64-bit PCI hole size setting is not supported "
"with this QEMU binary"));
return -1;
}
}
break;

1
tests/qemuxml2argvdata/pcihole64-none.err
View File

@ -1 +0,0 @@
unsupported configuration: 64-bit PCI hole size setting is not supported with this QEMU binary

25
tests/qemuxml2argvdata/pcihole64-none.xml
View File

@ -1,25 +0,0 @@
<domain type='qemu'>
<name>foo</name>
<uuid>c84fc647-6198-4ff9-bf81-d65a1f8f5ec0</uuid>
<memory unit='KiB'>2097152</memory>
<currentMemory unit='KiB'>2097152</currentMemory>
<vcpu placement='static' cpuset='0-1'>2</vcpu>
<os>
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='pci' index='0' model='pci-root'>
<pcihole64 unit='KiB'>0</pcihole64>
</controller>
<controller type='usb' index='0'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<memballoon model='virtio'/>
</devices>
</domain>

6
tests/qemuxml2argvtest.c
View File

@ -2798,13 +2798,11 @@ mymain(void)
DO_TEST("hotplug-base",
QEMU_CAPS_KVM, QEMU_CAPS_VIRTIO_SCSI);
DO_TEST("pcihole64", QEMU_CAPS_I440FX_PCI_HOLE64_SIZE);
DO_TEST_PARSE_ERROR_NOCAPS("pcihole64-none");
DO_TEST_NOCAPS("pcihole64");
DO_TEST("pcihole64-q35",
QEMU_CAPS_DEVICE_IOH3420,
QEMU_CAPS_ICH9_AHCI,
QEMU_CAPS_DEVICE_QXL,
QEMU_CAPS_Q35_PCI_HOLE64_SIZE);
QEMU_CAPS_DEVICE_QXL);
DO_TEST_NOCAPS("arm-vexpressa9-nodevs");
DO_TEST_NOCAPS("arm-vexpressa9-basic");

30
tests/qemuxml2xmloutdata/pcihole64-none.xml
View File

@ -1,30 +0,0 @@
<domain type='qemu'>
<name>foo</name>
<uuid>c84fc647-6198-4ff9-bf81-d65a1f8f5ec0</uuid>
<memory unit='KiB'>2097152</memory>
<currentMemory unit='KiB'>2097152</currentMemory>
<vcpu placement='static' cpuset='0-1'>2</vcpu>
<os>
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='pci' index='0' model='pci-root'>
<pcihole64 unit='KiB'>0</pcihole64>
</controller>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
</controller>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>

8
tests/qemuxml2xmltest.c
View File

@ -1027,14 +1027,12 @@ mymain(void)
DO_TEST("s390-serial-2", QEMU_CAPS_CCW);
DO_TEST("s390-serial-console", QEMU_CAPS_CCW);
DO_TEST("pcihole64", QEMU_CAPS_I440FX_PCI_HOLE64_SIZE);
DO_TEST("pcihole64-gib", QEMU_CAPS_I440FX_PCI_HOLE64_SIZE);
DO_TEST("pcihole64-none", QEMU_CAPS_I440FX_PCI_HOLE64_SIZE);
DO_TEST_NOCAPS("pcihole64");
DO_TEST_NOCAPS("pcihole64-gib");
DO_TEST("pcihole64-q35",
QEMU_CAPS_DEVICE_IOH3420,
QEMU_CAPS_ICH9_AHCI,
QEMU_CAPS_DEVICE_QXL,
QEMU_CAPS_Q35_PCI_HOLE64_SIZE);
QEMU_CAPS_DEVICE_QXL);
DO_TEST("panic", QEMU_CAPS_DEVICE_PANIC);
DO_TEST("panic-double", QEMU_CAPS_DEVICE_PANIC);