External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

qemu: Stop checking QEMU_CAPS_OBJECT_GPEX

Browse Source 
For all versions of QEMU that we support, the virt machine type
has a hard dependency on this device, so we can stop checking
whether the capability is present and just use it unconditionally.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Andrea Bolognani 2024-01-16 16:36:46 +01:00
parent b519a4cc9d
commit ac48405fa7
3 changed files with 7 additions and 10 deletions

12
src/qemu/qemu_domain.c

@ -4168,7 +4168,7 @@ qemuDomainDefAddDefaultDevices(virQEMUDriver *driver,
addDefaultUSB = false; addDefaultUSB = false;
addDefaultMemballoon = false; addDefaultMemballoon = false;
if (qemuDomainIsARMVirt(def)) if (qemuDomainIsARMVirt(def))
addPCIeRoot = virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_GPEX); addPCIeRoot = true;
break; break;
case VIR_ARCH_PPC64: case VIR_ARCH_PPC64:
@ -4195,7 +4195,7 @@ qemuDomainDefAddDefaultDevices(virQEMUDriver *driver,
case VIR_ARCH_RISCV64: case VIR_ARCH_RISCV64:
addDefaultUSB = false; addDefaultUSB = false;
if (qemuDomainIsRISCVVirt(def)) if (qemuDomainIsRISCVVirt(def))
addPCIeRoot = virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_GPEX); addPCIeRoot = true;
break; break;
case VIR_ARCH_S390: case VIR_ARCH_S390:
@ -9059,8 +9059,7 @@ qemuDomainNeedsFDC(const virDomainDef *def)
bool bool
qemuDomainSupportsPCI(virDomainDef *def, qemuDomainSupportsPCI(virDomainDef *def)
virQEMUCaps *qemuCaps)
{ {
if (def->os.arch != VIR_ARCH_ARMV6L && if (def->os.arch != VIR_ARCH_ARMV6L &&
def->os.arch != VIR_ARCH_ARMV7L && def->os.arch != VIR_ARCH_ARMV7L &&
@ -9072,9 +9071,8 @@ qemuDomainSupportsPCI(virDomainDef *def,
if (STREQ(def->os.machine, "versatilepb")) if (STREQ(def->os.machine, "versatilepb"))
return true; return true;
if ((qemuDomainIsARMVirt(def) || if (qemuDomainIsARMVirt(def) ||
qemuDomainIsRISCVVirt(def)) && qemuDomainIsRISCVVirt(def)) {
virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_GPEX)) {
return true; return true;
} }

3
src/qemu/qemu_domain.h

@ -834,8 +834,7 @@ bool qemuDomainHasPCIeRoot(const virDomainDef *def);
bool qemuDomainHasBuiltinIDE(const virDomainDef *def); bool qemuDomainHasBuiltinIDE(const virDomainDef *def);
bool qemuDomainHasBuiltinESP(const virDomainDef *def); bool qemuDomainHasBuiltinESP(const virDomainDef *def);
bool qemuDomainNeedsFDC(const virDomainDef *def); bool qemuDomainNeedsFDC(const virDomainDef *def);
bool qemuDomainSupportsPCI(virDomainDef *def, bool qemuDomainSupportsPCI(virDomainDef *def);
virQEMUCaps *qemuCaps);
void qemuDomainUpdateCurrentMemorySize(virDomainObj *vm); void qemuDomainUpdateCurrentMemorySize(virDomainObj *vm);

2
src/qemu/qemu_domain_address.c

@ -2849,7 +2849,7 @@ qemuDomainAssignPCIAddresses(virDomainDef *def,
if (!(addrs = qemuDomainPCIAddressSetCreate(def, qemuCaps, nbuses, false))) if (!(addrs = qemuDomainPCIAddressSetCreate(def, qemuCaps, nbuses, false)))
goto cleanup; goto cleanup;
if (qemuDomainSupportsPCI(def, qemuCaps)) { if (qemuDomainSupportsPCI(def)) {
if (qemuDomainValidateDevicePCISlotsChipsets(def, addrs) < 0) if (qemuDomainValidateDevicePCISlotsChipsets(def, addrs) < 0)
goto cleanup; goto cleanup;