7:03 a.m.
Since it is an abbreviation, PCI should always be fully
capitalized or full lower case, never Pci.
Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com>
---
src/conf/device_conf.c | 4 ++--
src/conf/device_conf.h | 6 +++---
src/conf/domain_conf.c | 22 +++++++++++-----------
src/conf/domain_conf.h | 20 ++++++++++----------
src/conf/node_device_conf.c | 8 ++++----
src/libvirt_private.syms | 10 +++++-----
src/libxl/libxl_conf.c | 8 ++++----
src/libxl/libxl_conf.h | 2 +-
src/libxl/libxl_driver.c | 4 ++--
src/network/bridge_driver.c | 2 +-
src/qemu/qemu_capabilities.c | 28 ++++++++++++++--------------
src/qemu/qemu_command.c | 4 ++--
src/qemu/qemu_hostdev.c | 2 +-
src/qemu/qemu_hotplug.c | 2 +-
src/qemu/qemu_monitor_text.c | 10 +++++-----
src/util/virhostdev.c | 2 +-
src/xen/xen_driver.c | 10 +++++-----
tests/virpcimock.c | 16 ++++++++--------
18 files changed, 80 insertions(+), 80 deletions(-)
diff --git a/src/conf/device_conf.c b/src/conf/device_conf.c
index f49dc21..94a0df4 100644
--- a/src/conf/device_conf.c
+++ b/src/conf/device_conf.c
@@ -32,7 +32,7 @@
#define VIR_FROM_THIS VIR_FROM_DEVICE
-VIR_ENUM_IMPL(virDeviceAddressPciMulti,
+VIR_ENUM_IMPL(virDeviceAddressPCIMulti,
VIR_DEVICE_ADDRESS_PCI_MULTI_LAST,
"default",
"on",
@@ -91,7 +91,7 @@ virDevicePCIAddressParseXML(xmlNodePtr node,
}
if (multi &&
- ((addr->multi = virDeviceAddressPciMultiTypeFromString(multi)) <= 0)) {
+ ((addr->multi = virDeviceAddressPCIMultiTypeFromString(multi)) <= 0)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("Unknown value '%s' for <address>
'multifunction' attribute"),
multi);
diff --git a/src/conf/device_conf.h b/src/conf/device_conf.h
index 52e4ac5..7986ca6 100644
--- a/src/conf/device_conf.h
+++ b/src/conf/device_conf.h
@@ -32,7 +32,7 @@
# include "virthread.h"
# include "virbuffer.h"
-enum virDeviceAddressPciMulti {
+enum virDeviceAddressPCIMulti {
VIR_DEVICE_ADDRESS_PCI_MULTI_DEFAULT = 0,
VIR_DEVICE_ADDRESS_PCI_MULTI_ON,
VIR_DEVICE_ADDRESS_PCI_MULTI_OFF,
@@ -47,7 +47,7 @@ struct _virDevicePCIAddress {
unsigned int bus;
unsigned int slot;
unsigned int function;
- int multi; /* enum virDomainDeviceAddressPciMulti */
+ int multi; /* enum virDomainDeviceAddressPCIMulti */
};
int virDevicePCIAddressIsValid(virDevicePCIAddressPtr addr);
@@ -63,6 +63,6 @@ bool virDevicePCIAddressEqual(virDevicePCIAddress *addr1,
virDevicePCIAddress *addr2);
-VIR_ENUM_DECL(virDeviceAddressPciMulti)
+VIR_ENUM_DECL(virDeviceAddressPCIMulti)
#endif /* __DEVICE_CONF_H__ */
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index bfdf4cb..629a49f 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -623,7 +623,7 @@ VIR_ENUM_IMPL(virDomainHostdevSubsys,
VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST,
"pci",
"scsi")
-VIR_ENUM_IMPL(virDomainHostdevSubsysPciBackend,
+VIR_ENUM_IMPL(virDomainHostdevSubsysPCIBackend,
VIR_DOMAIN_HOSTDEV_PCI_BACKEND_TYPE_LAST,
"default",
"kvm",
@@ -635,7 +635,7 @@ VIR_ENUM_IMPL(virDomainHostdevCaps,
VIR_DOMAIN_HOSTDEV_CAPS_TYPE_LAST,
"misc",
"net")
-VIR_ENUM_IMPL(virDomainPciRombarMode,
+VIR_ENUM_IMPL(virDomainPCIRombarMode,
VIR_DOMAIN_PCI_ROMBAR_LAST,
"default",
"on",
@@ -3173,7 +3173,7 @@ virDomainDeviceInfoFormat(virBufferPtr buf,
virBufferAddLit(buf, " <rom");
if (info->rombar) {
- const char *rombar = virDomainPciRombarModeTypeToString(info->rombar);
+ const char *rombar = virDomainPCIRombarModeTypeToString(info->rombar);
if (!rombar) {
virReportError(VIR_ERR_INTERNAL_ERROR,
@@ -3205,7 +3205,7 @@ virDomainDeviceInfoFormat(virBufferPtr buf,
info->addr.pci.function);
if (info->addr.pci.multi) {
virBufferAsprintf(buf, " multifunction='%s'",
-
virDeviceAddressPciMultiTypeToString(info->addr.pci.multi));
+
virDeviceAddressPCIMultiTypeToString(info->addr.pci.multi));
}
break;
@@ -3691,7 +3691,7 @@ virDomainDeviceInfoParseXML(xmlNodePtr node,
if (rom) {
char *rombar = virXMLPropString(rom, "bar");
if (rombar &&
- ((info->rombar = virDomainPciRombarModeTypeFromString(rombar)) <= 0))
{
+ ((info->rombar = virDomainPCIRombarModeTypeFromString(rombar)) <= 0))
{
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown rom bar value '%s'"), rombar);
VIR_FREE(rombar);
@@ -3949,7 +3949,7 @@ out:
* </origstates>
*/
static int
-virDomainHostdevSubsysPciOrigStatesDefParseXML(xmlNodePtr node,
+virDomainHostdevSubsysPCIOrigStatesDefParseXML(xmlNodePtr node,
virDomainHostdevOrigStatesPtr def)
{
xmlNodePtr cur;
@@ -3977,7 +3977,7 @@ virDomainHostdevSubsysPciOrigStatesDefParseXML(xmlNodePtr node,
}
static int
-virDomainHostdevSubsysPciDefParseXML(xmlNodePtr node,
+virDomainHostdevSubsysPCIDefParseXML(xmlNodePtr node,
virDomainHostdevDefPtr def,
unsigned int flags)
{
@@ -4010,7 +4010,7 @@ virDomainHostdevSubsysPciDefParseXML(xmlNodePtr node,
} else if ((flags & VIR_DOMAIN_XML_INTERNAL_PCI_ORIG_STATES) &&
xmlStrEqual(cur->name, BAD_CAST "origstates")) {
virDomainHostdevOrigStatesPtr states = &def->origstates;
- if (virDomainHostdevSubsysPciOrigStatesDefParseXML(cur, states) < 0)
+ if (virDomainHostdevSubsysPCIOrigStatesDefParseXML(cur, states) < 0)
goto out;
} else {
virReportError(VIR_ERR_INTERNAL_ERROR,
@@ -4330,12 +4330,12 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node,
switch (def->source.subsys.type) {
case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI:
- if (virDomainHostdevSubsysPciDefParseXML(sourcenode, def, flags) < 0)
+ if (virDomainHostdevSubsysPCIDefParseXML(sourcenode, def, flags) < 0)
goto error;
backend = VIR_DOMAIN_HOSTDEV_PCI_BACKEND_DEFAULT;
if ((backendStr = virXPathString("string(./driver/@name)", ctxt))
&&
- (((backend = virDomainHostdevSubsysPciBackendTypeFromString(backendStr)) <
0) ||
+ (((backend = virDomainHostdevSubsysPCIBackendTypeFromString(backendStr)) <
0) ||
backend == VIR_DOMAIN_HOSTDEV_PCI_BACKEND_DEFAULT)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("Unknown PCI device <driver name='%s'/>
"
@@ -15234,7 +15234,7 @@ virDomainHostdevDefFormatSubsys(virBufferPtr buf,
{
if (def->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI &&
def->source.subsys.u.pci.backend != VIR_DOMAIN_HOSTDEV_PCI_BACKEND_DEFAULT) {
- const char *backend =
virDomainHostdevSubsysPciBackendTypeToString(def->source.subsys.u.pci.backend);
+ const char *backend =
virDomainHostdevSubsysPCIBackendTypeToString(def->source.subsys.u.pci.backend);
if (!backend) {
virReportError(VIR_ERR_INTERNAL_ERROR,
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index ad502f3..accf351 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -217,7 +217,7 @@ enum virDomainDeviceAddressType {
VIR_DOMAIN_DEVICE_ADDRESS_TYPE_LAST
};
-enum virDomainPciRombarMode {
+enum virDomainPCIRombarMode {
VIR_DOMAIN_PCI_ROMBAR_DEFAULT = 0,
VIR_DOMAIN_PCI_ROMBAR_ON,
VIR_DOMAIN_PCI_ROMBAR_OFF,
@@ -321,7 +321,7 @@ struct _virDomainDeviceInfo {
} master;
/* rombar and romfile are only used for pci hostdev and network
* devices. */
- int rombar; /* enum virDomainPciRombarMode */
+ int rombar; /* enum virDomainPCIRombarMode */
char *romfile;
/* bootIndex is only used for disk, network interface, hostdev
* and redirdev devices */
@@ -418,9 +418,9 @@ typedef enum {
VIR_DOMAIN_HOSTDEV_PCI_BACKEND_XEN, /* force legacy xen style, use pciback */
VIR_DOMAIN_HOSTDEV_PCI_BACKEND_TYPE_LAST
-} virDomainHostdevSubsysPciBackendType;
+} virDomainHostdevSubsysPCIBackendType;
-VIR_ENUM_DECL(virDomainHostdevSubsysPciBackend)
+VIR_ENUM_DECL(virDomainHostdevSubsysPCIBackend)
typedef struct _virDomainHostdevSubsys virDomainHostdevSubsys;
typedef virDomainHostdevSubsys *virDomainHostdevSubsysPtr;
@@ -438,7 +438,7 @@ struct _virDomainHostdevSubsys {
} usb;
struct {
virDevicePCIAddress addr; /* host address */
- int backend; /* enum virDomainHostdevSubsysPciBackendType */
+ int backend; /* enum virDomainHostdevSubsysPCIBackendType */
} pci;
struct {
char *adapter;
@@ -835,9 +835,9 @@ struct _virDomainVirtioSerialOpts {
int vectors; /* -1 == undef */
};
-typedef struct _virDomainPciControllerOpts virDomainPciControllerOpts;
-typedef virDomainPciControllerOpts *virDomainPciControllerOptsPtr;
-struct _virDomainPciControllerOpts {
+typedef struct _virDomainPCIControllerOpts virDomainPCIControllerOpts;
+typedef virDomainPCIControllerOpts *virDomainPCIControllerOptsPtr;
+struct _virDomainPCIControllerOpts {
bool pcihole64;
unsigned long pcihole64size;
};
@@ -850,7 +850,7 @@ struct _virDomainControllerDef {
unsigned int queues;
union {
virDomainVirtioSerialOpts vioserial;
- virDomainPciControllerOpts pciopts;
+ virDomainPCIControllerOpts pciopts;
} opts;
virDomainDeviceInfo info;
};
@@ -2716,7 +2716,7 @@ VIR_ENUM_DECL(virDomainVideo)
VIR_ENUM_DECL(virDomainHostdevMode)
VIR_ENUM_DECL(virDomainHostdevSubsys)
VIR_ENUM_DECL(virDomainHostdevCaps)
-VIR_ENUM_DECL(virDomainPciRombarMode)
+VIR_ENUM_DECL(virDomainPCIRombarMode)
VIR_ENUM_DECL(virDomainHub)
VIR_ENUM_DECL(virDomainRedirdevBus)
VIR_ENUM_DECL(virDomainInput)
diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c
index dca69e2..ab153e7 100644
--- a/src/conf/node_device_conf.c
+++ b/src/conf/node_device_conf.c
@@ -971,7 +971,7 @@ out:
}
static int
-virNodeDevCapPciDevIommuGroupParseXML(xmlXPathContextPtr ctxt,
+virNodeDevCapPCIDevIommuGroupParseXML(xmlXPathContextPtr ctxt,
xmlNodePtr iommuGroupNode,
union _virNodeDevCapData *data)
{
@@ -1028,7 +1028,7 @@ cleanup:
static int
-virNodeDevCapPciDevParseXML(xmlXPathContextPtr ctxt,
+virNodeDevCapPCIDevParseXML(xmlXPathContextPtr ctxt,
virNodeDeviceDefPtr def,
xmlNodePtr node,
union _virNodeDevCapData *data)
@@ -1079,7 +1079,7 @@ virNodeDevCapPciDevParseXML(xmlXPathContextPtr ctxt,
data->pci_dev.product_name = virXPathString("string(./product[1])",
ctxt);
if ((iommuGroupNode = virXPathNode("./iommuGroup[1]", ctxt))) {
- if (virNodeDevCapPciDevIommuGroupParseXML(ctxt, iommuGroupNode,
+ if (virNodeDevCapPCIDevIommuGroupParseXML(ctxt, iommuGroupNode,
data) < 0) {
goto out;
}
@@ -1169,7 +1169,7 @@ virNodeDevCapsDefParseXML(xmlXPathContextPtr ctxt,
ret = virNodeDevCapSystemParseXML(ctxt, def, node, &caps->data);
break;
case VIR_NODE_DEV_CAP_PCI_DEV:
- ret = virNodeDevCapPciDevParseXML(ctxt, def, node, &caps->data);
+ ret = virNodeDevCapPCIDevParseXML(ctxt, def, node, &caps->data);
break;
case VIR_NODE_DEV_CAP_USB_DEV:
ret = virNodeDevCapUSBDevParseXML(ctxt, def, node, &caps->data);
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index aaaac2f..2fa8d7a 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -77,8 +77,8 @@ virCPUModeTypeToString;
# conf/device_conf.h
-virDeviceAddressPciMultiTypeFromString;
-virDeviceAddressPciMultiTypeToString;
+virDeviceAddressPCIMultiTypeFromString;
+virDeviceAddressPCIMultiTypeToString;
virDevicePCIAddressEqual;
virDevicePCIAddressFormat;
virDevicePCIAddressIsValid;
@@ -272,7 +272,7 @@ virDomainHostdevFind;
virDomainHostdevInsert;
virDomainHostdevModeTypeToString;
virDomainHostdevRemove;
-virDomainHostdevSubsysPciBackendTypeToString;
+virDomainHostdevSubsysPCIBackendTypeToString;
virDomainHostdevSubsysTypeToString;
virDomainHubTypeFromString;
virDomainHubTypeToString;
@@ -344,8 +344,8 @@ virDomainObjSetState;
virDomainObjTaint;
virDomainPausedReasonTypeFromString;
virDomainPausedReasonTypeToString;
-virDomainPciRombarModeTypeFromString;
-virDomainPciRombarModeTypeToString;
+virDomainPCIRombarModeTypeFromString;
+virDomainPCIRombarModeTypeToString;
virDomainPMStateTypeFromString;
virDomainPMStateTypeToString;
virDomainPMSuspendedReasonTypeFromString;
diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c
index 8ba3ce3..9a94b41 100644
--- a/src/libxl/libxl_conf.c
+++ b/src/libxl/libxl_conf.c
@@ -1148,7 +1148,7 @@ libxlDriverConfigGet(libxlDriverPrivatePtr driver)
}
int
-libxlMakePci(virDomainHostdevDefPtr hostdev, libxl_device_pci *pcidev)
+libxlMakePCI(virDomainHostdevDefPtr hostdev, libxl_device_pci *pcidev)
{
if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS)
return -1;
@@ -1164,7 +1164,7 @@ libxlMakePci(virDomainHostdevDefPtr hostdev, libxl_device_pci
*pcidev)
}
static int
-libxlMakePciList(virDomainDefPtr def, libxl_domain_config *d_config)
+libxlMakePCIList(virDomainDefPtr def, libxl_domain_config *d_config)
{
virDomainHostdevDefPtr *l_hostdevs = def->hostdevs;
size_t nhostdevs = def->nhostdevs;
@@ -1186,7 +1186,7 @@ libxlMakePciList(virDomainDefPtr def, libxl_domain_config
*d_config)
libxl_device_pci_init(&x_pcidevs[j]);
- if (libxlMakePci(l_hostdevs[i], &x_pcidevs[j]) < 0)
+ if (libxlMakePCI(l_hostdevs[i], &x_pcidevs[j]) < 0)
goto error;
npcidevs++;
@@ -1255,7 +1255,7 @@ libxlBuildDomainConfig(libxlDriverPrivatePtr driver,
if (libxlMakeVfbList(driver, def, d_config) < 0)
return -1;
- if (libxlMakePciList(def, d_config) < 0)
+ if (libxlMakePCIList(def, d_config) < 0)
return -1;
d_config->on_reboot = def->onReboot;
diff --git a/src/libxl/libxl_conf.h b/src/libxl/libxl_conf.h
index 4f6f7ce..5a3d457 100644
--- a/src/libxl/libxl_conf.h
+++ b/src/libxl/libxl_conf.h
@@ -152,7 +152,7 @@ libxlMakeVfb(libxlDriverPrivatePtr driver,
virDomainGraphicsDefPtr l_vfb, libxl_device_vfb *x_vfb);
int
-libxlMakePci(virDomainHostdevDefPtr hostdev, libxl_device_pci *pcidev);
+libxlMakePCI(virDomainHostdevDefPtr hostdev, libxl_device_pci *pcidev);
int
libxlBuildDomainConfig(libxlDriverPrivatePtr driver,
diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index ae7342a..d2d9664 100644
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -3349,7 +3349,7 @@ libxlDomainAttachHostPCIDevice(libxlDriverPrivatePtr driver,
&hostdev, 1, 0) < 0)
goto cleanup;
- if (libxlMakePci(hostdev, &pcidev) < 0)
+ if (libxlMakePCI(hostdev, &pcidev) < 0)
goto reattach_hostdev;
if (libxl_device_pci_add(priv->ctx, vm->def->id, &pcidev, 0) < 0) {
@@ -3604,7 +3604,7 @@ libxlDomainDetachHostPCIDevice(libxlDriverPrivatePtr driver,
libxl_device_pci_init(&pcidev);
- if (libxlMakePci(detach, &pcidev) < 0)
+ if (libxlMakePCI(detach, &pcidev) < 0)
goto cleanup;
if (libxl_device_pci_remove(priv->ctx, vm->def->id, &pcidev, 0) < 0)
{
diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index c797f8f..d1d259f 100644
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -3443,7 +3443,7 @@ networkAllocateActualDevice(virDomainDefPtr dom,
} else if (netdef->forward.type == VIR_NETWORK_FORWARD_HOSTDEV) {
- virDomainHostdevSubsysPciBackendType backend;
+ virDomainHostdevSubsysPCIBackendType backend;
iface->data.network.actual->type = actualType =
VIR_DOMAIN_NET_TYPE_HOSTDEV;
if (netdef->forward.npfs > 0 && netdef->forward.nifs <= 0
&&
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 9601063..dcee4ec 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1431,13 +1431,13 @@ static struct virQEMUCapsStringFlags
virQEMUCapsObjectPropsVirtioNet[] = {
{ "event_idx", QEMU_CAPS_VIRTIO_NET_EVENT_IDX },
};
-static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsPciAssign[] = {
+static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsPCIAssign[] = {
{ "rombar", QEMU_CAPS_PCI_ROMBAR },
{ "configfd", QEMU_CAPS_PCI_CONFIGFD },
{ "bootindex", QEMU_CAPS_PCI_BOOTINDEX },
};
-static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVfioPci[] = {
+static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVfioPCI[] = {
{ "bootindex", QEMU_CAPS_VFIO_PCI_BOOTINDEX },
};
@@ -1468,11 +1468,11 @@ static struct virQEMUCapsStringFlags
virQEMUCapsObjectPropsSCSIGeneric[] = {
{ "bootindex", QEMU_CAPS_DEVICE_SCSI_GENERIC_BOOTINDEX },
};
-static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsI440FXPciHost[] = {
+static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsI440FXPCIHost[] = {
{ "pci-hole64-size", QEMU_CAPS_I440FX_PCI_HOLE64_SIZE },
};
-static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsQ35PciHost[] = {
+static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsQ35PCIHost[] = {
{ "pci-hole64-size", QEMU_CAPS_Q35_PCI_HOLE64_SIZE },
};
@@ -1503,12 +1503,12 @@ static struct virQEMUCapsObjectTypeProps virQEMUCapsObjectProps[]
= {
ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioBlk) },
{ "virtio-net-s390", virQEMUCapsObjectPropsVirtioNet,
ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioNet) },
- { "pci-assign", virQEMUCapsObjectPropsPciAssign,
- ARRAY_CARDINALITY(virQEMUCapsObjectPropsPciAssign) },
- { "kvm-pci-assign", virQEMUCapsObjectPropsPciAssign,
- ARRAY_CARDINALITY(virQEMUCapsObjectPropsPciAssign) },
- { "vfio-pci", virQEMUCapsObjectPropsVfioPci,
- ARRAY_CARDINALITY(virQEMUCapsObjectPropsVfioPci) },
+ { "pci-assign", virQEMUCapsObjectPropsPCIAssign,
+ ARRAY_CARDINALITY(virQEMUCapsObjectPropsPCIAssign) },
+ { "kvm-pci-assign", virQEMUCapsObjectPropsPCIAssign,
+ ARRAY_CARDINALITY(virQEMUCapsObjectPropsPCIAssign) },
+ { "vfio-pci", virQEMUCapsObjectPropsVfioPCI,
+ ARRAY_CARDINALITY(virQEMUCapsObjectPropsVfioPCI) },
{ "scsi-disk", virQEMUCapsObjectPropsSCSIDisk,
ARRAY_CARDINALITY(virQEMUCapsObjectPropsSCSIDisk) },
{ "ide-drive", virQEMUCapsObjectPropsIDEDrive,
@@ -1521,10 +1521,10 @@ static struct virQEMUCapsObjectTypeProps virQEMUCapsObjectProps[]
= {
ARRAY_CARDINALITY(virQEMUCapsObjectPropsUSBHost) },
{ "scsi-generic", virQEMUCapsObjectPropsSCSIGeneric,
ARRAY_CARDINALITY(virQEMUCapsObjectPropsSCSIGeneric) },
- { "i440FX-pcihost", virQEMUCapsObjectPropsI440FXPciHost,
- ARRAY_CARDINALITY(virQEMUCapsObjectPropsI440FXPciHost) },
- { "q35-pcihost", virQEMUCapsObjectPropsQ35PciHost,
- ARRAY_CARDINALITY(virQEMUCapsObjectPropsQ35PciHost) },
+ { "i440FX-pcihost", virQEMUCapsObjectPropsI440FXPCIHost,
+ ARRAY_CARDINALITY(virQEMUCapsObjectPropsI440FXPCIHost) },
+ { "q35-pcihost", virQEMUCapsObjectPropsQ35PCIHost,
+ ARRAY_CARDINALITY(virQEMUCapsObjectPropsQ35PCIHost) },
{ "usb-storage", virQEMUCapsObjectPropsUSBStorage,
ARRAY_CARDINALITY(virQEMUCapsObjectPropsUSBStorage) },
{ "kvm-pit", virQEMUCapsObjectPropsKVMPit,
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 2582d7b..1024f01 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -5533,7 +5533,7 @@ qemuBuildPCIHostdevDevStr(virDomainDefPtr def,
int backend = dev->source.subsys.u.pci.backend;
/* caller has to assign proper passthrough backend type */
- switch ((virDomainHostdevSubsysPciBackendType) backend) {
+ switch ((virDomainHostdevSubsysPCIBackendType) backend) {
case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_KVM:
virBufferAddLit(&buf, "pci-assign");
if (configfd && *configfd)
@@ -5547,7 +5547,7 @@ qemuBuildPCIHostdevDevStr(virDomainDefPtr def,
default:
virReportError(VIR_ERR_INTERNAL_ERROR,
_("invalid PCI passthrough type '%s'"),
- virDomainHostdevSubsysPciBackendTypeToString(backend));
+ virDomainHostdevSubsysPCIBackendTypeToString(backend));
break;
}
diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c
index e1ec4e6..c6323fc 100644
--- a/src/qemu/qemu_hostdev.c
+++ b/src/qemu/qemu_hostdev.c
@@ -170,7 +170,7 @@ qemuPrepareHostdevPCICheckSupport(virDomainHostdevDefPtr *hostdevs,
if (hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI)
continue;
- switch ((virDomainHostdevSubsysPciBackendType) *backend) {
+ switch ((virDomainHostdevSubsysPCIBackendType) *backend) {
case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_DEFAULT:
if (supportsPassthroughVFIO &&
virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VFIO_PCI)) {
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 0226e5d..c1ec393 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -1176,7 +1176,7 @@ qemuDomainAttachHostPCIDevice(virQEMUDriverPtr driver,
/* this could have been changed by qemuPrepareHostdevPCIDevices */
backend = hostdev->source.subsys.u.pci.backend;
- switch ((virDomainHostdevSubsysPciBackendType) backend) {
+ switch ((virDomainHostdevSubsysPCIBackendType) backend) {
case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO:
if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE_VFIO_PCI)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c
index f4992f1..024e83a 100644
--- a/src/qemu/qemu_monitor_text.c
+++ b/src/qemu/qemu_monitor_text.c
@@ -1742,7 +1742,7 @@ int qemuMonitorTextAddUSBDeviceMatch(qemuMonitorPtr mon,
static int
-qemuMonitorTextParsePciAddReply(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
+qemuMonitorTextParsePCIAddReply(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
const char *reply,
virDevicePCIAddress *addr)
{
@@ -1829,7 +1829,7 @@ int qemuMonitorTextAddPCIHostDevice(qemuMonitorPtr mon,
goto cleanup;
}
- if (qemuMonitorTextParsePciAddReply(mon, reply, guestAddr) < 0) {
+ if (qemuMonitorTextParsePCIAddReply(mon, reply, guestAddr) < 0) {
virReportError(VIR_ERR_OPERATION_FAILED,
_("parsing pci_add reply failed: %s"), reply);
goto cleanup;
@@ -1867,7 +1867,7 @@ try_command:
if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0)
goto cleanup;
- if (qemuMonitorTextParsePciAddReply(mon, reply, guestAddr) < 0) {
+ if (qemuMonitorTextParsePCIAddReply(mon, reply, guestAddr) < 0) {
if (!tryOldSyntax && strstr(reply, "invalid char in
expression")) {
VIR_FREE(reply);
VIR_FREE(cmd);
@@ -1904,7 +1904,7 @@ int qemuMonitorTextAddPCINetwork(qemuMonitorPtr mon,
if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0)
goto cleanup;
- if (qemuMonitorTextParsePciAddReply(mon, reply, guestAddr) < 0) {
+ if (qemuMonitorTextParsePCIAddReply(mon, reply, guestAddr) < 0) {
virReportError(VIR_ERR_OPERATION_FAILED,
_("parsing pci_add reply failed: %s"), reply);
goto cleanup;
@@ -2241,7 +2241,7 @@ try_command:
if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0)
goto cleanup;
- if (qemuMonitorTextParsePciAddReply(mon, reply, guestAddr) < 0) {
+ if (qemuMonitorTextParsePCIAddReply(mon, reply, guestAddr) < 0) {
if (!tryOldSyntax && strstr(reply, "invalid char in
expression")) {
VIR_FREE(reply);
VIR_FREE(cmd);
diff --git a/src/util/virhostdev.c b/src/util/virhostdev.c
index 9fe1062..ca90dd6 100644
--- a/src/util/virhostdev.c
+++ b/src/util/virhostdev.c
@@ -1544,7 +1544,7 @@ virHostdevPrepareDomainDevices(virHostdevManagerPtr mgr,
}
/* @oldStateDir
- * For upgrade purpose: see virHostdevReAttachPciHostdevs
+ * For upgrade purpose: see virHostdevReAttachPCIHostdevs
*/
void
virHostdevReAttachDomainDevices(virHostdevManagerPtr mgr,
diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c
index 1880b22..efe316f 100644
--- a/src/xen/xen_driver.c
+++ b/src/xen/xen_driver.c
@@ -2418,7 +2418,7 @@ xenUnifiedConnectDomainEventDeregisterAny(virConnectPtr conn,
static int
-xenUnifiedNodeDeviceGetPciInfo(virNodeDevicePtr dev,
+xenUnifiedNodeDeviceGetPCIInfo(virNodeDevicePtr dev,
unsigned *domain,
unsigned *bus,
unsigned *slot,
@@ -2474,7 +2474,7 @@ xenUnifiedNodeDeviceDetachFlags(virNodeDevicePtr dev,
virCheckFlags(0, -1);
- if (xenUnifiedNodeDeviceGetPciInfo(dev, &domain, &bus, &slot,
&function) < 0)
+ if (xenUnifiedNodeDeviceGetPCIInfo(dev, &domain, &bus, &slot,
&function) < 0)
return -1;
pci = virPCIDeviceNew(domain, bus, slot, function);
@@ -2532,7 +2532,7 @@ xenUnifiedNodeDeviceAssignedDomainId(virNodeDevicePtr dev)
}
/* Get pci bdf */
- if (xenUnifiedNodeDeviceGetPciInfo(dev, &domain, &bus, &slot,
&function) < 0)
+ if (xenUnifiedNodeDeviceGetPCIInfo(dev, &domain, &bus, &slot,
&function) < 0)
goto out;
if (virAsprintf(&bdf, "%04x:%02x:%02x.%0x",
@@ -2568,7 +2568,7 @@ xenUnifiedNodeDeviceReAttach(virNodeDevicePtr dev)
int ret = -1;
int domid;
- if (xenUnifiedNodeDeviceGetPciInfo(dev, &domain, &bus, &slot,
&function) < 0)
+ if (xenUnifiedNodeDeviceGetPCIInfo(dev, &domain, &bus, &slot,
&function) < 0)
return -1;
pci = virPCIDeviceNew(domain, bus, slot, function);
@@ -2599,7 +2599,7 @@ xenUnifiedNodeDeviceReset(virNodeDevicePtr dev)
unsigned domain, bus, slot, function;
int ret = -1;
- if (xenUnifiedNodeDeviceGetPciInfo(dev, &domain, &bus, &slot,
&function) < 0)
+ if (xenUnifiedNodeDeviceGetPCIInfo(dev, &domain, &bus, &slot,
&function) < 0)
return -1;
pci = virPCIDeviceNew(domain, bus, slot, function);
diff --git a/tests/virpcimock.c b/tests/virpcimock.c
index b42e8bf..fcfba3d 100644
--- a/tests/virpcimock.c
+++ b/tests/virpcimock.c
@@ -136,10 +136,10 @@ struct fdCallback {
};
struct pciDevice **pciDevices = NULL;
-size_t nPciDevices = 0;
+size_t nPCIDevices = 0;
struct pciDriver **pciDrivers = NULL;
-size_t nPciDrivers = 0;
+size_t nPCIDrivers = 0;
struct fdCallback *callbacks = NULL;
size_t nCallbacks = 0;
@@ -390,7 +390,7 @@ pci_device_new_from_stub(const struct pciDevice *data)
if (pci_device_autobind(dev) < 0)
ABORT("Unable to bind: %s", data->id);
- if (VIR_APPEND_ELEMENT_QUIET(pciDevices, nPciDevices, dev) < 0)
+ if (VIR_APPEND_ELEMENT_QUIET(pciDevices, nPCIDevices, dev) < 0)
ABORT_OOM();
VIR_FREE(devpath);
@@ -401,7 +401,7 @@ static struct pciDevice *
pci_device_find_by_id(const char *id)
{
size_t i;
- for (i = 0; i < nPciDevices; i++) {
+ for (i = 0; i < nPCIDevices; i++) {
struct pciDevice *dev = pciDevices[i];
if (STREQ(dev->id, id))
@@ -479,7 +479,7 @@ pci_driver_new(const char *name, int fail, ...)
make_file(driverpath, "new_id", NULL, -1);
make_file(driverpath, "remove_id", NULL, -1);
- if (VIR_APPEND_ELEMENT_QUIET(pciDrivers, nPciDrivers, driver) < 0)
+ if (VIR_APPEND_ELEMENT_QUIET(pciDrivers, nPCIDrivers, driver) < 0)
ABORT_OOM();
}
@@ -488,7 +488,7 @@ pci_driver_find_by_dev(struct pciDevice *dev)
{
size_t i;
- for (i = 0; i < nPciDrivers; i++) {
+ for (i = 0; i < nPCIDrivers; i++) {
struct pciDriver *driver = pciDrivers[i];
size_t j;
@@ -507,7 +507,7 @@ pci_driver_find_by_path(const char *path)
{
size_t i;
- for (i = 0; i < nPciDrivers; i++) {
+ for (i = 0; i < nPCIDrivers; i++) {
struct pciDriver *driver = pciDrivers[i];
if (strstr(path, driver->name))
@@ -709,7 +709,7 @@ pci_driver_handle_new_id(const char *path)
driver->len++;
}
- for (i = 0; i < nPciDevices; i++) {
+ for (i = 0; i < nPCIDevices; i++) {
struct pciDevice *dev = pciDevices[i];
if (!dev->driver &&
--
1.8.5.3