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

qemu_domain_address: Drop compatibility with pre-device vga specification for q35

Browse Source 
Remove the slot reservation for the vga card which doesn't make sense
with supported qemus any more for the q35 machine type.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Peter Krempa 2021-03-30 19:02:01 +02:00
parent 7583d6e402
commit ed85cc5c3c
1 changed files with 4 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/qemu/qemu_domain_address.c
View File

@ -1842,12 +1842,10 @@ qemuDomainValidateDevicePCISlotsPIIX3(virDomainDef *def,
static int static int
qemuDomainValidateDevicePCISlotsQ35(virDomainDef *def, qemuDomainValidateDevicePCISlotsQ35(virDomainDef *def,
virQEMUCaps *qemuCaps,
virDomainPCIAddressSet *addrs) virDomainPCIAddressSet *addrs)
{ {
size_t i; size_t i;
virPCIDeviceAddress tmp_addr; virPCIDeviceAddress tmp_addr;
bool qemuDeviceVideoUsable = virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VIDEO_PRIMARY);
g_autofree char *addrStr = NULL; g_autofree char *addrStr = NULL;
virDomainPCIConnectFlags flags = VIR_PCI_CONNECT_TYPE_PCIE_DEVICE; virDomainPCIConnectFlags flags = VIR_PCI_CONNECT_TYPE_PCIE_DEVICE;
@ -1980,45 +1978,15 @@ qemuDomainValidateDevicePCISlotsQ35(virDomainDef *def,
return -1; return -1;
if (virDomainPCIAddressSlotInUse(addrs, &tmp_addr)) { if (virDomainPCIAddressSlotInUse(addrs, &tmp_addr)) {
if (qemuDeviceVideoUsable) { if (qemuDomainPCIAddressReserveNextAddr(addrs,
if (qemuDomainPCIAddressReserveNextAddr(addrs, &primaryVideo->info) < 0)
&primaryVideo->info) < 0)
return -1;
} else {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("PCI address 0:0:1.0 is in use, "
"QEMU needs it for primary video"));
return -1; return -1;
}
} else { } else {
if (virDomainPCIAddressReserveAddr(addrs, &tmp_addr, flags, 0) < 0) if (virDomainPCIAddressReserveAddr(addrs, &tmp_addr, flags, 0) < 0)
return -1; return -1;
primaryVideo->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI; primaryVideo->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI;
primaryVideo->info.addr.pci = tmp_addr; primaryVideo->info.addr.pci = tmp_addr;
} }
} else if (!qemuDeviceVideoUsable) {
if (primaryVideo->info.addr.pci.domain != 0 ||
primaryVideo->info.addr.pci.bus != 0 ||
primaryVideo->info.addr.pci.slot != 1 ||
primaryVideo->info.addr.pci.function != 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Primary video card must have PCI address 0:0:1.0"));
return -1;
}
/* If TYPE == PCI, then qemuDomainCollectPCIAddress() function
* has already reserved the address, so we must skip */
}
} else if (addrs->nbuses && !qemuDeviceVideoUsable) {
memset(&tmp_addr, 0, sizeof(tmp_addr));
tmp_addr.slot = 1;
if (virDomainPCIAddressSlotInUse(addrs, &tmp_addr)) {
VIR_DEBUG("PCI address 0:0:1.0 in use, future addition of a video"
" device will not be possible without manual"
" intervention");
virResetLastError();
} else if (virDomainPCIAddressReserveAddr(addrs, &tmp_addr, flags, 0) < 0) {
return -1;
} }
} }
@ -2053,7 +2021,7 @@ qemuDomainValidateDevicePCISlotsQ35(virDomainDef *def,
static int static int
qemuDomainValidateDevicePCISlotsChipsets(virDomainDef *def, qemuDomainValidateDevicePCISlotsChipsets(virDomainDef *def,
virQEMUCaps *qemuCaps, virQEMUCaps *qemuCaps G_GNUC_UNUSED,
virDomainPCIAddressSet *addrs) virDomainPCIAddressSet *addrs)
{ {
if (qemuDomainIsI440FX(def) && if (qemuDomainIsI440FX(def) &&
@ -2062,7 +2030,7 @@ qemuDomainValidateDevicePCISlotsChipsets(virDomainDef *def,
} }
if (qemuDomainIsQ35(def) && if (qemuDomainIsQ35(def) &&
qemuDomainValidateDevicePCISlotsQ35(def, qemuCaps, addrs) < 0) { qemuDomainValidateDevicePCISlotsQ35(def, addrs) < 0) {
return -1; return -1;
} }