From bbda2883c43306874ea22fb48534091ecb6faf7b Mon Sep 17 00:00:00 2001
From: Andrea Bolognani <abologna@redhat.com>
Date: Mon, 24 Jul 2017 13:26:57 +0200
Subject: [PATCH] conf: Rename virDomainControllerIsPCIHostBridge() to
 IsPSeriesPHB()

The original name didn't hint at the fact that PHBs are
a pSeries-specific concept.

Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
---
 src/conf/domain_conf.c         | 4 ++--
 src/conf/domain_conf.h         | 2 +-
 src/libvirt_private.syms       | 2 +-
 src/qemu/qemu_command.c        | 2 +-
 src/qemu/qemu_domain.c         | 2 +-
 src/qemu/qemu_domain_address.c | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 62ce4af916..02373c7c7c 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 4fef773efd..a2e8f67658 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 87753758f9..3cc6f4c6e2 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 d14bb62114..59ad93a4cb 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 2c8c9a7454..3d79765431 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 d943c8bcaa..8066ed1233 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
-- 
GitLab