提交 bbda2883 编写于 作者: A Andrea Bolognani

conf: Rename virDomainControllerIsPCIHostBridge() to IsPSeriesPHB()

The original name didn't hint at the fact that PHBs are
a pSeries-specific concept.
Suggested-by: NPeter Krempa <pkrempa@redhat.com>
Signed-off-by: NAndrea Bolognani <abologna@redhat.com>
上级 9b45cd8f
...@@ -1892,7 +1892,7 @@ void virDomainControllerDefFree(virDomainControllerDefPtr def) ...@@ -1892,7 +1892,7 @@ void virDomainControllerDefFree(virDomainControllerDefPtr def)
/** /**
* virDomainControllerIsPCIHostBridge: * virDomainControllerIsPSeriesPHB:
* @cont: controller * @cont: controller
* *
* Checks whether @cont is a PCI Host Bridge (PHB), a specific type * Checks whether @cont is a PCI Host Bridge (PHB), a specific type
...@@ -1901,7 +1901,7 @@ void virDomainControllerDefFree(virDomainControllerDefPtr def) ...@@ -1901,7 +1901,7 @@ void virDomainControllerDefFree(virDomainControllerDefPtr def)
* Returns: true if @cont is a PHB, false otherwise. * Returns: true if @cont is a PHB, false otherwise.
*/ */
bool bool
virDomainControllerIsPCIHostBridge(const virDomainControllerDef *cont) virDomainControllerIsPSeriesPHB(const virDomainControllerDef *cont)
{ {
virDomainControllerPCIModelName name; virDomainControllerPCIModelName name;
......
...@@ -2681,7 +2681,7 @@ virDomainDiskDefPtr virDomainDiskFindByBusAndDst(virDomainDefPtr def, ...@@ -2681,7 +2681,7 @@ virDomainDiskDefPtr virDomainDiskFindByBusAndDst(virDomainDefPtr def,
virDomainControllerDefPtr virDomainControllerDefNew(virDomainControllerType type); virDomainControllerDefPtr virDomainControllerDefNew(virDomainControllerType type);
void virDomainControllerDefFree(virDomainControllerDefPtr def); void virDomainControllerDefFree(virDomainControllerDefPtr def);
bool virDomainControllerIsPCIHostBridge(const virDomainControllerDef *cont); bool virDomainControllerIsPSeriesPHB(const virDomainControllerDef *cont);
virDomainFSDefPtr virDomainFSDefNew(void); virDomainFSDefPtr virDomainFSDefNew(void);
void virDomainFSDefFree(virDomainFSDefPtr def); void virDomainFSDefFree(virDomainFSDefPtr def);
......
...@@ -228,7 +228,7 @@ virDomainControllerFindByType; ...@@ -228,7 +228,7 @@ virDomainControllerFindByType;
virDomainControllerFindUnusedIndex; virDomainControllerFindUnusedIndex;
virDomainControllerInsert; virDomainControllerInsert;
virDomainControllerInsertPreAlloced; virDomainControllerInsertPreAlloced;
virDomainControllerIsPCIHostBridge; virDomainControllerIsPSeriesPHB;
virDomainControllerModelPCITypeToString; virDomainControllerModelPCITypeToString;
virDomainControllerModelSCSITypeFromString; virDomainControllerModelSCSITypeFromString;
virDomainControllerModelSCSITypeToString; virDomainControllerModelSCSITypeToString;
......
...@@ -317,7 +317,7 @@ qemuBuildDeviceAddressStr(virBufferPtr buf, ...@@ -317,7 +317,7 @@ qemuBuildDeviceAddressStr(virBufferPtr buf,
if (cont->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI && if (cont->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI &&
cont->idx == info->addr.pci.bus) { cont->idx == info->addr.pci.bus) {
contAlias = cont->info.alias; contAlias = cont->info.alias;
contIsPHB = virDomainControllerIsPCIHostBridge(cont); contIsPHB = virDomainControllerIsPSeriesPHB(cont);
contTargetIndex = cont->opts.pciopts.targetIndex; contTargetIndex = cont->opts.pciopts.targetIndex;
if (!contAlias) { if (!contAlias) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
......
...@@ -6735,7 +6735,7 @@ qemuDomainGetMemLockLimitBytes(virDomainDefPtr def) ...@@ -6735,7 +6735,7 @@ qemuDomainGetMemLockLimitBytes(virDomainDefPtr def)
for (i = 0; i < def->ncontrollers; i++) { for (i = 0; i < def->ncontrollers; i++) {
virDomainControllerDefPtr cont = def->controllers[i]; virDomainControllerDefPtr cont = def->controllers[i];
if (!virDomainControllerIsPCIHostBridge(cont)) if (!virDomainControllerIsPSeriesPHB(cont))
continue; continue;
nPCIHostBridges++; nPCIHostBridges++;
......
...@@ -2167,7 +2167,7 @@ qemuDomainAddressFindNewTargetIndex(virDomainDefPtr def) ...@@ -2167,7 +2167,7 @@ qemuDomainAddressFindNewTargetIndex(virDomainDefPtr def)
virDomainControllerDefPtr cont = def->controllers[i]; virDomainControllerDefPtr cont = def->controllers[i];
/* Skip everything but PHBs */ /* Skip everything but PHBs */
if (!virDomainControllerIsPCIHostBridge(cont)) if (!virDomainControllerIsPSeriesPHB(cont))
continue; continue;
/* Stop looking as soon as we find a PHB that's /* Stop looking as soon as we find a PHB that's
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册