[libvirt] [PATCH v2 3/3] qemuBuildDeviceAddressStr: Prefer default alias for PCI bus
https://bugzilla.redhat.com/show_bug.cgi?id=1434451
Just like in 9324f67a572f9b32 we need to put default pci-root
alias onto the command line instead of the one provided by user.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
src/qemu/qemu_command.c | 30 ++++++++++++++++------
.../qemuxml2argvdata/qemuxml2argv-user-aliases.xml | 4 ++-
2 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 4eda12179..84aa1b933 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -318,16 +318,30 @@ qemuBuildDeviceAddressStr(virBufferPtr buf,
if (cont->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI &&
cont->idx == info->addr.pci.bus) {
- contAlias = cont->info.alias;
contIsPHB = virDomainControllerIsPSeriesPHB(cont);
contTargetIndex = cont->opts.pciopts.targetIndex;
- if (!contAlias) {
- virReportError(VIR_ERR_INTERNAL_ERROR,
- _("Device alias was not set for PCI "
- "controller with index %u required "
- "for device at address %s"),
- info->addr.pci.bus, devStr);
- goto cleanup;
+
+ /* When domain has builtin pci-root controller we don't put it
+ * onto cmd line. Therefore we can't set its alias. In that
+ * case, use the default one. */
+ if (!qemuDomainIsPSeries(domainDef) &&
+ cont->model == VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT) {
+ if (virQEMUCapsHasPCIMultiBus(qemuCaps, domainDef))
+ contAlias = "pci.0";
+ else
+ contAlias = "pci";
+ } else if (cont->model == VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT) {
+ contAlias = "pcie.0";
+ } else {
+ contAlias = cont->info.alias;
+ if (!contAlias) {
+ virReportError(VIR_ERR_INTERNAL_ERROR,
+ _("Device alias was not set for PCI "
+ "controller with index %u required "
+ "for device at address %s"),
+ info->addr.pci.bus, devStr);
+ goto cleanup;
+ }
}
break;
}
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-user-aliases.xml
b/tests/qemuxml2argvdata/qemuxml2argv-user-aliases.xml
index d1cb8fea6..c760098fe 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-user-aliases.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-user-aliases.xml
@@ -74,7 +74,9 @@
<alias name='ua-SomeWeirdController'/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
- <controller type='pci' index='0' model='pci-root'/>
+ <controller type='pci' index='0' model='pci-root'>
+ <alias name='ua-MyPCIRootController'/>
+ </controller>
<controller type='ide' index='0'>
<alias name='ua-DoesAnybodyStillUseIDE'/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x1'/>
--
2.13.6