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

qemuDomainAssignPCIAddresses: Assign extension addresses when auto-assigning PCI address

Browse Source 
Assigning a PCI address needs to also assign any extension addresses
right away. Otherwise they'd be assigned only after subsequent
format->parse cycle and thus be potentially missing on first run after
defining the VM and thus could change.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2023-12-18 22:23:35 +01:00
parent 7dd3d77940
commit f51c6b5b02
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/qemu/qemu_domain_address.c
View File

@ -2829,10 +2829,16 @@ qemuDomainAssignPCIAddresses(virDomainDef *def,
* controllers don't plug into any other PCI controller, hence * controllers don't plug into any other PCI controller, hence
* they should skip this step */ * they should skip this step */
if (bus->model != VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT && if (bus->model != VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT &&
bus->model != VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT && bus->model != VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT) {
qemuDomainPCIAddressReserveNextAddr(addrs, if (qemuDomainPCIAddressReserveNextAddr(addrs,
&dev.data.controller->info) < 0) { &dev.data.controller->info) < 0)
goto cleanup; goto cleanup;
if (qemuDomainFillDevicePCIExtensionFlagsIter(NULL, &dev, &dev.data.controller->info, qemuCaps) < 0)
goto cleanup;
if (qemuDomainAssignPCIAddressExtension(NULL, NULL, &dev.data.controller->info, addrs) < 0)
goto cleanup;
} }
} }

4
tests/qemuxml2xmloutdata/hostdev-vfio-zpci-boundaries.s390x-latest.xml
View File

@ -21,7 +21,9 @@
<controller type='pci' index='1' model='pci-bridge'> <controller type='pci' index='1' model='pci-bridge'>
<model name='pci-bridge'/> <model name='pci-bridge'/>
<target chassisNr='1'/> <target chassisNr='1'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'>
<zpci uid='0x0002' fid='0x00000001'/>
</address>
</controller> </controller>
<audio id='1' type='none'/> <audio id='1' type='none'/>
<hostdev mode='subsystem' type='pci' managed='no'> <hostdev mode='subsystem' type='pci' managed='no'>