diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 62ce4af916f96fee30ffbf4f3f9b76e75d002feb..02373c7c7c0803631ea1eaf1e67cb19d5b408861 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1892,7 +1892,7 @@ void virDomainControllerDefFree(virDomainControllerDefPtr def) /** - * virDomainControllerIsPCIHostBridge: + * virDomainControllerIsPSeriesPHB: * @cont: controller * * Checks whether @cont is a PCI Host Bridge (PHB), a specific type @@ -1901,7 +1901,7 @@ void virDomainControllerDefFree(virDomainControllerDefPtr def) * Returns: true if @cont is a PHB, false otherwise. */ bool -virDomainControllerIsPCIHostBridge(const virDomainControllerDef *cont) +virDomainControllerIsPSeriesPHB(const virDomainControllerDef *cont) { virDomainControllerPCIModelName name; diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 4fef773efd930cc3d2462414cd31b95c4a4de89a..a2e8f67658c87939171ca7b329316847fb8f8dc3 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2681,7 +2681,7 @@ virDomainDiskDefPtr virDomainDiskFindByBusAndDst(virDomainDefPtr def, virDomainControllerDefPtr virDomainControllerDefNew(virDomainControllerType type); void virDomainControllerDefFree(virDomainControllerDefPtr def); -bool virDomainControllerIsPCIHostBridge(const virDomainControllerDef *cont); +bool virDomainControllerIsPSeriesPHB(const virDomainControllerDef *cont); virDomainFSDefPtr virDomainFSDefNew(void); void virDomainFSDefFree(virDomainFSDefPtr def); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 87753758f9ccf7cc1cafb560e927d107968ca6fc..3cc6f4c6e2b84b99eda9b96e91c20fa7ce6c3a79 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -228,7 +228,7 @@ virDomainControllerFindByType; virDomainControllerFindUnusedIndex; virDomainControllerInsert; virDomainControllerInsertPreAlloced; -virDomainControllerIsPCIHostBridge; +virDomainControllerIsPSeriesPHB; virDomainControllerModelPCITypeToString; virDomainControllerModelSCSITypeFromString; virDomainControllerModelSCSITypeToString; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index d14bb621148d6db1f76616bb78aa1d51c83e89c9..59ad93a4cba3a562facd4bf81ab4ce0a5b06208b 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -317,7 +317,7 @@ qemuBuildDeviceAddressStr(virBufferPtr buf, if (cont->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI && cont->idx == info->addr.pci.bus) { contAlias = cont->info.alias; - contIsPHB = virDomainControllerIsPCIHostBridge(cont); + contIsPHB = virDomainControllerIsPSeriesPHB(cont); contTargetIndex = cont->opts.pciopts.targetIndex; if (!contAlias) { virReportError(VIR_ERR_INTERNAL_ERROR, diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 2c8c9a74542b702fc295d76d754adac4eb7aca40..3d7976543119dc61b258b35f6302630bf128ac26 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -6735,7 +6735,7 @@ qemuDomainGetMemLockLimitBytes(virDomainDefPtr def) for (i = 0; i < def->ncontrollers; i++) { virDomainControllerDefPtr cont = def->controllers[i]; - if (!virDomainControllerIsPCIHostBridge(cont)) + if (!virDomainControllerIsPSeriesPHB(cont)) continue; nPCIHostBridges++; diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index d943c8bcaa3a9e7af6242d89c3019bb816b9cce0..8066ed1233ffc026ff1831b9480a544a23805b15 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -2167,7 +2167,7 @@ qemuDomainAddressFindNewTargetIndex(virDomainDefPtr def) virDomainControllerDefPtr cont = def->controllers[i]; /* Skip everything but PHBs */ - if (!virDomainControllerIsPCIHostBridge(cont)) + if (!virDomainControllerIsPSeriesPHB(cont)) continue; /* Stop looking as soon as we find a PHB that's