External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-24 22:55:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Remove the slot reservation for the vga card which doesn't make sense
with supported qemus any more for the i440fx 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 e7a2a90c71
commit 7583d6e402
1 changed files with 3 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/qemu/qemu_domain_address.c
View File

@ -1732,12 +1732,10 @@ qemuDomainPCIAddressSetCreate(virDomainDef *def,
static int static int
qemuDomainValidateDevicePCISlotsPIIX3(virDomainDef *def, qemuDomainValidateDevicePCISlotsPIIX3(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_AUTOASSIGN virDomainPCIConnectFlags flags = (VIR_PCI_CONNECT_AUTOASSIGN
| VIR_PCI_CONNECT_TYPE_PCI_DEVICE); | VIR_PCI_CONNECT_TYPE_PCI_DEVICE);
@ -1814,8 +1812,6 @@ qemuDomainValidateDevicePCISlotsPIIX3(virDomainDef *def,
* at slot 2. * at slot 2.
*/ */
virDomainVideoDef *primaryVideo = def->videos[0]; virDomainVideoDef *primaryVideo = def->videos[0];
virPCIDeviceAddress primaryCardAddr = {.domain = 0, .bus = 0,
.slot = 2, .function = 0};
if (virDeviceInfoPCIAddressIsWanted(&primaryVideo->info)) { if (virDeviceInfoPCIAddressIsWanted(&primaryVideo->info)) {
memset(&tmp_addr, 0, sizeof(tmp_addr)); memset(&tmp_addr, 0, sizeof(tmp_addr));
@ -1828,15 +1824,8 @@ qemuDomainValidateDevicePCISlotsPIIX3(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:2.0 is in use, "
"QEMU needs it for primary video"));
return -1; return -1;
} }
} else { } else {
@ -1845,26 +1834,6 @@ qemuDomainValidateDevicePCISlotsPIIX3(virDomainDef *def,
primaryVideo->info.addr.pci = tmp_addr; primaryVideo->info.addr.pci = tmp_addr;
primaryVideo->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI; primaryVideo->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI;
} }
} else if (!qemuDeviceVideoUsable) {
if (!virPCIDeviceAddressEqual(&primaryVideo->info.addr.pci,
&primaryCardAddr)) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Primary video card must have PCI address 0:0:2.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 = 2;
if (virDomainPCIAddressSlotInUse(addrs, &tmp_addr)) {
VIR_DEBUG("PCI address 0:0:2.0 in use, future addition of a video"
" device will not be possible without manual"
" intervention");
} else if (virDomainPCIAddressReserveAddr(addrs, &tmp_addr, flags, 0) < 0) {
return -1;
} }
} }
return 0; return 0;
@ -2088,7 +2057,7 @@ qemuDomainValidateDevicePCISlotsChipsets(virDomainDef *def,
virDomainPCIAddressSet *addrs) virDomainPCIAddressSet *addrs)
{ {
if (qemuDomainIsI440FX(def) && if (qemuDomainIsI440FX(def) &&
qemuDomainValidateDevicePCISlotsPIIX3(def, qemuCaps, addrs) < 0) { qemuDomainValidateDevicePCISlotsPIIX3(def, addrs) < 0) {
return -1; return -1;
} }