7:03 a.m.
Complete the cleanup of bogus capitalization of Pci/Scsi/Usb
Daniel P. Berrange (4):
Replace Scsi with SCSI throughout
Replace Usb with USB throughout
Replace Pci with PCI throughout
Add syntax check to validate capitalization of abbreviations
cfg.mk | 8 +++++
src/conf/device_conf.c | 4 +--
src/conf/device_conf.h | 6 ++--
src/conf/domain_conf.c | 70 +++++++++++++++++++-------------------
src/conf/domain_conf.h | 30 ++++++++--------
src/conf/node_device_conf.c | 28 +++++++--------
src/conf/node_device_conf.h | 2 +-
src/libvirt_private.syms | 10 +++---
src/libxl/libxl_conf.c | 8 ++---
src/libxl/libxl_conf.h | 2 +-
src/libxl/libxl_driver.c | 4 +--
src/lxc/lxc_cgroup.c | 6 ++--
src/lxc/lxc_cgroup.h | 4 +--
src/lxc/lxc_driver.c | 6 ++--
src/lxc/lxc_hostdev.c | 6 ++--
src/lxc/lxc_hostdev.h | 2 +-
src/lxc/lxc_process.c | 2 +-
src/network/bridge_driver.c | 2 +-
src/node_device/node_device_udev.c | 4 +--
src/qemu/qemu_capabilities.c | 58 +++++++++++++++----------------
src/qemu/qemu_cgroup.c | 10 +++---
src/qemu/qemu_command.c | 30 ++++++++--------
src/qemu/qemu_command.h | 2 +-
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/vmx/vmx.c | 2 +-
src/xen/xen_driver.c | 10 +++---
tests/virpcimock.c | 16 ++++-----
30 files changed, 178 insertions(+), 170 deletions(-)
--
1.8.5.3
7:03 a.m.
New subject: [libvirt] [PATCH 1/4] Replace Scsi with SCSI throughout
Since it is an abbreviation, SCSI should always be fully
capitalized or full lower case, never Scsi.
Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com>
---
src/conf/domain_conf.c | 8 ++++----
src/conf/domain_conf.h | 2 +-
src/conf/node_device_conf.c | 12 ++++++------
src/conf/node_device_conf.h | 2 +-
src/node_device/node_device_udev.c | 4 ++--
src/qemu/qemu_capabilities.c | 12 ++++++------
src/qemu/qemu_cgroup.c | 4 ++--
src/qemu/qemu_command.c | 12 ++++++------
src/vmx/vmx.c | 2 +-
9 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 109705b..c59b4fb 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -4028,7 +4028,7 @@ out:
}
static int
-virDomainHostdevSubsysScsiDefParseXML(xmlNodePtr node,
+virDomainHostdevSubsysSCSIDefParseXML(xmlNodePtr node,
virDomainHostdevDefPtr def)
{
int ret = -1;
@@ -4230,7 +4230,7 @@ virDomainHostdevAssignAddress(virDomainXMLOptionPtr xmlopt,
controller++;
ret = virDomainControllerSCSINextUnit(def,
- xmlopt->config.hasWideScsiBus ?
+ xmlopt->config.hasWideSCSIBus ?
SCSI_WIDE_BUS_MAX_CONT_UNIT :
SCSI_NARROW_BUS_MAX_CONT_UNIT,
def->controllers[i]->idx);
@@ -4352,7 +4352,7 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node,
break;
case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI:
- if (virDomainHostdevSubsysScsiDefParseXML(sourcenode, def) < 0)
+ if (virDomainHostdevSubsysSCSIDefParseXML(sourcenode, def) < 0)
goto error;
break;
@@ -4497,7 +4497,7 @@ virDomainDiskDefAssignAddress(virDomainXMLOptionPtr xmlopt,
case VIR_DOMAIN_DISK_BUS_SCSI:
def->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE;
- if (xmlopt->config.hasWideScsiBus) {
+ if (xmlopt->config.hasWideSCSIBus) {
/* For a wide SCSI bus we define the default mapping to be
* 16 units per bus, 1 bus per controller, many controllers.
* Unit 7 is the SCSI controller itself. Therefore unit 7
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 37191a8..2fd2656 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -2196,7 +2196,7 @@ struct _virDomainDefParserConfig {
virFreeCallback privFree;
/* data */
- bool hasWideScsiBus;
+ bool hasWideSCSIBus;
unsigned char macPrefix[VIR_MAC_PREFIX_BUFLEN];
};
diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c
index d86bbed..9e94092 100644
--- a/src/conf/node_device_conf.c
+++ b/src/conf/node_device_conf.c
@@ -645,7 +645,7 @@ out:
}
static int
-virNodeDevCapScsiParseXML(xmlXPathContextPtr ctxt,
+virNodeDevCapSCSIParseXML(xmlXPathContextPtr ctxt,
virNodeDeviceDefPtr def,
xmlNodePtr node,
union _virNodeDevCapData *data)
@@ -690,7 +690,7 @@ out:
static int
-virNodeDevCapScsiTargetParseXML(xmlXPathContextPtr ctxt,
+virNodeDevCapSCSITargetParseXML(xmlXPathContextPtr ctxt,
virNodeDeviceDefPtr def,
xmlNodePtr node,
union _virNodeDevCapData *data)
@@ -718,7 +718,7 @@ out:
static int
-virNodeDevCapScsiHostParseXML(xmlXPathContextPtr ctxt,
+virNodeDevCapSCSIHostParseXML(xmlXPathContextPtr ctxt,
virNodeDeviceDefPtr def,
xmlNodePtr node,
union _virNodeDevCapData *data,
@@ -1181,16 +1181,16 @@ virNodeDevCapsDefParseXML(xmlXPathContextPtr ctxt,
ret = virNodeDevCapNetParseXML(ctxt, def, node, &caps->data);
break;
case VIR_NODE_DEV_CAP_SCSI_HOST:
- ret = virNodeDevCapScsiHostParseXML(ctxt, def, node,
+ ret = virNodeDevCapSCSIHostParseXML(ctxt, def, node,
&caps->data,
create,
virt_type);
break;
case VIR_NODE_DEV_CAP_SCSI_TARGET:
- ret = virNodeDevCapScsiTargetParseXML(ctxt, def, node, &caps->data);
+ ret = virNodeDevCapSCSITargetParseXML(ctxt, def, node, &caps->data);
break;
case VIR_NODE_DEV_CAP_SCSI:
- ret = virNodeDevCapScsiParseXML(ctxt, def, node, &caps->data);
+ ret = virNodeDevCapSCSIParseXML(ctxt, def, node, &caps->data);
break;
case VIR_NODE_DEV_CAP_STORAGE:
ret = virNodeDevCapStorageParseXML(ctxt, def, node, &caps->data);
diff --git a/src/conf/node_device_conf.h b/src/conf/node_device_conf.h
index 26116a1..9b5d172 100644
--- a/src/conf/node_device_conf.h
+++ b/src/conf/node_device_conf.h
@@ -69,7 +69,7 @@ enum virNodeDevStorageCapFlags {
VIR_NODE_DEV_CAP_STORAGE_HOTPLUGGABLE = (1 << 2),
};
-enum virNodeDevScsiHostCapFlags {
+enum virNodeDevSCSIHostCapFlags {
VIR_NODE_DEV_CAP_FLAG_HBA_FC_HOST = (1 << 0),
VIR_NODE_DEV_CAP_FLAG_HBA_VPORT_OPS = (1 << 1),
};
diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
index 5d49968..8c4eb90 100644
--- a/src/node_device/node_device_udev.c
+++ b/src/node_device/node_device_udev.c
@@ -1141,7 +1141,7 @@ out:
}
static int
-udevProcessScsiGeneric(struct udev_device *dev,
+udevProcessSCSIGeneric(struct udev_device *dev,
virNodeDeviceDefPtr def)
{
if (udevGetStringProperty(dev,
@@ -1256,7 +1256,7 @@ static int udevGetDeviceDetails(struct udev_device *device,
ret = udevProcessStorage(device, def);
break;
case VIR_NODE_DEV_CAP_SCSI_GENERIC:
- ret = udevProcessScsiGeneric(device, def);
+ ret = udevProcessSCSIGeneric(device, def);
break;
default:
VIR_ERROR(_("Unknown device type %d"), def->caps->type);
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index c589a57..66e8448 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1441,7 +1441,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVfioPci[]
= {
{ "bootindex", QEMU_CAPS_VFIO_PCI_BOOTINDEX },
};
-static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsScsiDisk[] = {
+static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsSCSIDisk[] = {
{ "channel", QEMU_CAPS_SCSI_DISK_CHANNEL },
{ "wwn", QEMU_CAPS_SCSI_DISK_WWN },
};
@@ -1464,7 +1464,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsUsbHost[]
= {
{ "bootindex", QEMU_CAPS_USB_HOST_BOOTINDEX },
};
-static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsScsiGeneric[] = {
+static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsSCSIGeneric[] = {
{ "bootindex", QEMU_CAPS_DEVICE_SCSI_GENERIC_BOOTINDEX },
};
@@ -1509,8 +1509,8 @@ static struct virQEMUCapsObjectTypeProps virQEMUCapsObjectProps[] =
{
ARRAY_CARDINALITY(virQEMUCapsObjectPropsPciAssign) },
{ "vfio-pci", virQEMUCapsObjectPropsVfioPci,
ARRAY_CARDINALITY(virQEMUCapsObjectPropsVfioPci) },
- { "scsi-disk", virQEMUCapsObjectPropsScsiDisk,
- ARRAY_CARDINALITY(virQEMUCapsObjectPropsScsiDisk) },
+ { "scsi-disk", virQEMUCapsObjectPropsSCSIDisk,
+ ARRAY_CARDINALITY(virQEMUCapsObjectPropsSCSIDisk) },
{ "ide-drive", virQEMUCapsObjectPropsIDEDrive,
ARRAY_CARDINALITY(virQEMUCapsObjectPropsIDEDrive) },
{ "PIIX4_PM", virQEMUCapsObjectPropsPixx4PM,
@@ -1519,8 +1519,8 @@ static struct virQEMUCapsObjectTypeProps virQEMUCapsObjectProps[] =
{
ARRAY_CARDINALITY(virQEMUCapsObjectPropsUsbRedir) },
{ "usb-host", virQEMUCapsObjectPropsUsbHost,
ARRAY_CARDINALITY(virQEMUCapsObjectPropsUsbHost) },
- { "scsi-generic", virQEMUCapsObjectPropsScsiGeneric,
- ARRAY_CARDINALITY(virQEMUCapsObjectPropsScsiGeneric) },
+ { "scsi-generic", virQEMUCapsObjectPropsSCSIGeneric,
+ ARRAY_CARDINALITY(virQEMUCapsObjectPropsSCSIGeneric) },
{ "i440FX-pcihost", virQEMUCapsObjectPropsI440FXPciHost,
ARRAY_CARDINALITY(virQEMUCapsObjectPropsI440FXPciHost) },
{ "q35-pcihost", virQEMUCapsObjectPropsQ35PciHost,
diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c
index a97f184..48a51f0 100644
--- a/src/qemu/qemu_cgroup.c
+++ b/src/qemu/qemu_cgroup.c
@@ -200,7 +200,7 @@ qemuSetupHostUsbDeviceCgroup(virUSBDevicePtr dev ATTRIBUTE_UNUSED,
}
static int
-qemuSetupHostScsiDeviceCgroup(virSCSIDevicePtr dev ATTRIBUTE_UNUSED,
+qemuSetupHostSCSIDeviceCgroup(virSCSIDevicePtr dev ATTRIBUTE_UNUSED,
const char *path,
void *opaque)
{
@@ -301,7 +301,7 @@ qemuSetupHostdevCGroup(virDomainObjPtr vm,
goto cleanup;
if (virSCSIDeviceFileIterate(scsi,
- qemuSetupHostScsiDeviceCgroup,
+ qemuSetupHostSCSIDeviceCgroup,
vm) < 0)
goto cleanup;
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index aa1a3db..0f546f5 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -688,7 +688,7 @@ static int qemuAssignDeviceDiskAliasFixed(virDomainDiskDefPtr disk)
}
static int
-qemuSetScsiControllerModel(virDomainDefPtr def,
+qemuSetSCSIControllerModel(virDomainDefPtr def,
virQEMUCapsPtr qemuCaps,
int *model)
{
@@ -760,7 +760,7 @@ qemuAssignDeviceDiskAliasCustom(virDomainDefPtr def,
virDomainDeviceFindControllerModel(def, &disk->info,
VIR_DOMAIN_CONTROLLER_TYPE_SCSI);
- if ((qemuSetScsiControllerModel(def, qemuCaps, &controllerModel)) <
0)
+ if ((qemuSetSCSIControllerModel(def, qemuCaps, &controllerModel)) <
0)
return -1;
}
@@ -1422,7 +1422,7 @@ int qemuDomainAssignSpaprVIOAddresses(virDomainDefPtr def,
for (i = 0; i < def->ncontrollers; i++) {
model = def->controllers[i]->model;
if (def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_SCSI) {
- if (qemuSetScsiControllerModel(def, qemuCaps, &model) < 0)
+ if (qemuSetSCSIControllerModel(def, qemuCaps, &model) < 0)
goto cleanup;
}
@@ -4407,7 +4407,7 @@ qemuBuildDriveDevStr(virDomainDefPtr def,
controllerModel =
virDomainDeviceFindControllerModel(def, &disk->info,
VIR_DOMAIN_CONTROLLER_TYPE_SCSI);
- if ((qemuSetScsiControllerModel(def, qemuCaps, &controllerModel)) < 0)
+ if ((qemuSetSCSIControllerModel(def, qemuCaps, &controllerModel)) < 0)
goto error;
if (controllerModel == VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSILOGIC) {
@@ -4812,7 +4812,7 @@ qemuBuildControllerDevStr(virDomainDefPtr domainDef,
switch (def->type) {
case VIR_DOMAIN_CONTROLLER_TYPE_SCSI:
model = def->model;
- if ((qemuSetScsiControllerModel(domainDef, qemuCaps, &model)) < 0)
+ if ((qemuSetSCSIControllerModel(domainDef, qemuCaps, &model)) < 0)
return NULL;
switch (model) {
@@ -5838,7 +5838,7 @@ qemuBuildSCSIHostdevDevStr(virDomainDefPtr def,
model = virDomainDeviceFindControllerModel(def, dev->info,
VIR_DOMAIN_CONTROLLER_TYPE_SCSI);
- if (qemuSetScsiControllerModel(def, qemuCaps, &model) < 0)
+ if (qemuSetSCSIControllerModel(def, qemuCaps, &model) < 0)
goto error;
if (model == VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSILOGIC) {
diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c
index 8fb2a93..7cc135d 100644
--- a/src/vmx/vmx.c
+++ b/src/vmx/vmx.c
@@ -522,7 +522,7 @@ VIR_ENUM_IMPL(virVMXControllerModelSCSI,
VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LAST,
*/
virDomainDefParserConfig virVMXDomainDefParserConfig = {
- .hasWideScsiBus = true,
+ .hasWideSCSIBus = true,
.macPrefix = {0x00, 0x0c, 0x29},
};
--
1.8.5.3
7:03 a.m.
New subject: [libvirt] [PATCH 2/4] Replace Usb with USB throughout
Since it is an abbreviation, USB should always be fully
capitalized or full lower case, never Usb.
Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com>
---
src/conf/domain_conf.c | 40 ++++++++++++++++++++--------------------
src/conf/domain_conf.h | 8 ++++----
src/conf/node_device_conf.c | 8 ++++----
src/lxc/lxc_cgroup.c | 6 +++---
src/lxc/lxc_cgroup.h | 4 ++--
src/lxc/lxc_driver.c | 6 +++---
src/lxc/lxc_hostdev.c | 6 +++---
src/lxc/lxc_hostdev.h | 2 +-
src/lxc/lxc_process.c | 2 +-
src/qemu/qemu_capabilities.c | 18 +++++++++---------
src/qemu/qemu_cgroup.c | 6 +++---
src/qemu/qemu_command.c | 14 +++++++-------
src/qemu/qemu_command.h | 2 +-
13 files changed, 61 insertions(+), 61 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index c59b4fb..bfdf4cb 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -3799,7 +3799,7 @@ virDomainParseLegacyDeviceAddress(char *devaddr,
}
static int
-virDomainHostdevSubsysUsbDefParseXML(xmlNodePtr node,
+virDomainHostdevSubsysUSBDefParseXML(xmlNodePtr node,
virDomainHostdevDefPtr def)
{
@@ -4347,7 +4347,7 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node,
break;
case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB:
- if (virDomainHostdevSubsysUsbDefParseXML(sourcenode, def) < 0)
+ if (virDomainHostdevSubsysUSBDefParseXML(sourcenode, def) < 0)
goto error;
break;
@@ -9576,8 +9576,8 @@ error:
* USB 1.1 as 0x0110 and USB 1.0 as 0x0100.
*/
static int
-virDomainRedirFilterUsbVersionHelper(const char *version,
- virDomainRedirFilterUsbDevDefPtr def)
+virDomainRedirFilterUSBVersionHelper(const char *version,
+ virDomainRedirFilterUSBDevDefPtr def)
{
char *version_copy = NULL;
char *temp = NULL;
@@ -9630,13 +9630,13 @@ cleanup:
return ret;
}
-static virDomainRedirFilterUsbDevDefPtr
-virDomainRedirFilterUsbDevDefParseXML(xmlNodePtr node)
+static virDomainRedirFilterUSBDevDefPtr
+virDomainRedirFilterUSBDevDefParseXML(xmlNodePtr node)
{
char *class;
char *vendor = NULL, *product = NULL;
char *version = NULL, *allow = NULL;
- virDomainRedirFilterUsbDevDefPtr def;
+ virDomainRedirFilterUSBDevDefPtr def;
if (VIR_ALLOC(def) < 0)
return NULL;
@@ -9684,7 +9684,7 @@ virDomainRedirFilterUsbDevDefParseXML(xmlNodePtr node)
if (version) {
if (STREQ(version, "-1"))
def->version = -1;
- else if ((virDomainRedirFilterUsbVersionHelper(version, def)) < 0)
+ else if ((virDomainRedirFilterUSBVersionHelper(version, def)) < 0)
goto error;
} else {
def->version = -1;
@@ -9743,8 +9743,8 @@ virDomainRedirFilterDefParseXML(xmlNodePtr node,
goto error;
for (i = 0; i < n; i++) {
- virDomainRedirFilterUsbDevDefPtr usbdev =
- virDomainRedirFilterUsbDevDefParseXML(nodes[i]);
+ virDomainRedirFilterUSBDevDefPtr usbdev =
+ virDomainRedirFilterUSBDevDefParseXML(nodes[i]);
if (!usbdev)
goto error;
@@ -13732,37 +13732,37 @@
virDomainRedirFilterDefCheckABIStability(virDomainRedirFilterDefPtr src,
}
for (i = 0; i < src->nusbdevs; i++) {
- virDomainRedirFilterUsbDevDefPtr srcUsbDev = src->usbdevs[i];
- virDomainRedirFilterUsbDevDefPtr dstUsbDev = dst->usbdevs[i];
- if (srcUsbDev->usbClass != dstUsbDev->usbClass) {
+ virDomainRedirFilterUSBDevDefPtr srcUSBDev = src->usbdevs[i];
+ virDomainRedirFilterUSBDevDefPtr dstUSBDev = dst->usbdevs[i];
+ if (srcUSBDev->usbClass != dstUSBDev->usbClass) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
"%s", _("Target USB Class code does not match
source"));
return false;
}
- if (srcUsbDev->vendor != dstUsbDev->vendor) {
+ if (srcUSBDev->vendor != dstUSBDev->vendor) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
"%s", _("Target USB vendor ID does not match
source"));
return false;
}
- if (srcUsbDev->product != dstUsbDev->product) {
+ if (srcUSBDev->product != dstUSBDev->product) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
"%s", _("Target USB product ID does not match
source"));
return false;
}
- if (srcUsbDev->version != dstUsbDev->version) {
+ if (srcUSBDev->version != dstUSBDev->version) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
"%s", _("Target USB version does not match
source"));
return false;
}
- if (srcUsbDev->allow != dstUsbDev->allow) {
+ if (srcUSBDev->allow != dstUSBDev->allow) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("Target USB allow '%s' does not match source
'%s'"),
- dstUsbDev->allow ? "yes" : "no",
- srcUsbDev->allow ? "yes" : "no");
+ dstUSBDev->allow ? "yes" : "no",
+ srcUSBDev->allow ? "yes" : "no");
return false;
}
}
@@ -16770,7 +16770,7 @@ virDomainRedirFilterDefFormat(virBufferPtr buf,
virBufferAddLit(buf, " <redirfilter>\n");
for (i = 0; i < filter->nusbdevs; i++) {
- virDomainRedirFilterUsbDevDefPtr usbdev = filter->usbdevs[i];
+ virDomainRedirFilterUSBDevDefPtr usbdev = filter->usbdevs[i];
virBufferAddLit(buf, " <usbdev");
if (usbdev->usbClass >= 0)
virBufferAsprintf(buf, " class='0x%02X'",
usbdev->usbClass);
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 2fd2656..ad502f3 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -93,8 +93,8 @@ typedef virDomainHubDef *virDomainHubDefPtr;
typedef struct _virDomainRedirdevDef virDomainRedirdevDef;
typedef virDomainRedirdevDef *virDomainRedirdevDefPtr;
-typedef struct _virDomainRedirFilterUsbDevDef virDomainRedirFilterUsbDevDef;
-typedef virDomainRedirFilterUsbDevDef *virDomainRedirFilterUsbDevDefPtr;
+typedef struct _virDomainRedirFilterUSBDevDef virDomainRedirFilterUSBDevDef;
+typedef virDomainRedirFilterUSBDevDef *virDomainRedirFilterUSBDevDefPtr;
typedef struct _virDomainRedirFilterDef virDomainRedirFilterDef;
typedef virDomainRedirFilterDef *virDomainRedirFilterDefPtr;
@@ -1572,7 +1572,7 @@ struct _virDomainRedirdevDef {
virDomainDeviceInfo info; /* Guest address */
};
-struct _virDomainRedirFilterUsbDevDef {
+struct _virDomainRedirFilterUSBDevDef {
int usbClass;
int vendor;
int product;
@@ -1582,7 +1582,7 @@ struct _virDomainRedirFilterUsbDevDef {
struct _virDomainRedirFilterDef {
size_t nusbdevs;
- virDomainRedirFilterUsbDevDefPtr *usbdevs;
+ virDomainRedirFilterUSBDevDefPtr *usbdevs;
};
enum virDomainMemDump {
diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c
index 9e94092..dca69e2 100644
--- a/src/conf/node_device_conf.c
+++ b/src/conf/node_device_conf.c
@@ -859,7 +859,7 @@ out:
}
static int
-virNodeDevCapUsbInterfaceParseXML(xmlXPathContextPtr ctxt,
+virNodeDevCapUSBInterfaceParseXML(xmlXPathContextPtr ctxt,
virNodeDeviceDefPtr def,
xmlNodePtr node,
union _virNodeDevCapData *data)
@@ -926,7 +926,7 @@ virNodeDevCapsDefParseHexId(const char *xpath,
}
static int
-virNodeDevCapUsbDevParseXML(xmlXPathContextPtr ctxt,
+virNodeDevCapUSBDevParseXML(xmlXPathContextPtr ctxt,
virNodeDeviceDefPtr def,
xmlNodePtr node,
union _virNodeDevCapData *data)
@@ -1172,10 +1172,10 @@ virNodeDevCapsDefParseXML(xmlXPathContextPtr ctxt,
ret = virNodeDevCapPciDevParseXML(ctxt, def, node, &caps->data);
break;
case VIR_NODE_DEV_CAP_USB_DEV:
- ret = virNodeDevCapUsbDevParseXML(ctxt, def, node, &caps->data);
+ ret = virNodeDevCapUSBDevParseXML(ctxt, def, node, &caps->data);
break;
case VIR_NODE_DEV_CAP_USB_INTERFACE:
- ret = virNodeDevCapUsbInterfaceParseXML(ctxt, def, node, &caps->data);
+ ret = virNodeDevCapUSBInterfaceParseXML(ctxt, def, node, &caps->data);
break;
case VIR_NODE_DEV_CAP_NET:
ret = virNodeDevCapNetParseXML(ctxt, def, node, &caps->data);
diff --git a/src/lxc/lxc_cgroup.c b/src/lxc/lxc_cgroup.c
index 39d955c..144520a 100644
--- a/src/lxc/lxc_cgroup.c
+++ b/src/lxc/lxc_cgroup.c
@@ -308,7 +308,7 @@ struct _virLXCCgroupDevicePolicy {
int
-virLXCSetupHostUsbDeviceCgroup(virUSBDevicePtr dev ATTRIBUTE_UNUSED,
+virLXCSetupHostUSBDeviceCgroup(virUSBDevicePtr dev ATTRIBUTE_UNUSED,
const char *path,
void *opaque)
{
@@ -324,7 +324,7 @@ virLXCSetupHostUsbDeviceCgroup(virUSBDevicePtr dev ATTRIBUTE_UNUSED,
int
-virLXCTeardownHostUsbDeviceCgroup(virUSBDevicePtr dev ATTRIBUTE_UNUSED,
+virLXCTeardownHostUSBDeviceCgroup(virUSBDevicePtr dev ATTRIBUTE_UNUSED,
const char *path,
void *opaque)
{
@@ -412,7 +412,7 @@ static int virLXCCgroupSetupDeviceACL(virDomainDefPtr def,
NULL)) == NULL)
goto cleanup;
- if (virUSBDeviceFileIterate(usb, virLXCSetupHostUsbDeviceCgroup,
+ if (virUSBDeviceFileIterate(usb, virLXCSetupHostUSBDeviceCgroup,
cgroup) < 0) {
virUSBDeviceFree(usb);
goto cleanup;
diff --git a/src/lxc/lxc_cgroup.h b/src/lxc/lxc_cgroup.h
index 25a427c..0e78126 100644
--- a/src/lxc/lxc_cgroup.h
+++ b/src/lxc/lxc_cgroup.h
@@ -36,12 +36,12 @@ int virLXCCgroupSetup(virDomainDefPtr def,
int virLXCCgroupGetMeminfo(virLXCMeminfoPtr meminfo);
int
-virLXCSetupHostUsbDeviceCgroup(virUSBDevicePtr dev,
+virLXCSetupHostUSBDeviceCgroup(virUSBDevicePtr dev,
const char *path,
void *opaque);
int
-virLXCTeardownHostUsbDeviceCgroup(virUSBDevicePtr dev,
+virLXCTeardownHostUSBDeviceCgroup(virUSBDevicePtr dev,
const char *path,
void *opaque);
diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index 0ab1ba2..11c6e7d 100644
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -4280,7 +4280,7 @@ lxcDomainAttachDeviceHostdevSubsysUSBLive(virLXCDriverPtr driver,
goto cleanup;
if (virUSBDeviceFileIterate(usb,
- virLXCSetupHostUsbDeviceCgroup,
+ virLXCSetupHostUSBDeviceCgroup,
priv->cgroup) < 0)
goto cleanup;
@@ -4291,7 +4291,7 @@ lxcDomainAttachDeviceHostdevSubsysUSBLive(virLXCDriverPtr driver,
dev,
src) < 0) {
if (virUSBDeviceFileIterate(usb,
- virLXCTeardownHostUsbDeviceCgroup,
+ virLXCTeardownHostUSBDeviceCgroup,
priv->cgroup) < 0)
VIR_WARN("cannot deny device %s for domain %s",
src, vm->def->name);
@@ -4730,7 +4730,7 @@ lxcDomainDetachDeviceHostdevUSBLive(virLXCDriverPtr driver,
virDomainAuditHostdev(vm, def, "detach", true);
if (virUSBDeviceFileIterate(usb,
- virLXCTeardownHostUsbDeviceCgroup,
+ virLXCTeardownHostUSBDeviceCgroup,
priv->cgroup) < 0)
VIR_WARN("cannot deny device %s for domain %s",
dst, vm->def->name);
diff --git a/src/lxc/lxc_hostdev.c b/src/lxc/lxc_hostdev.c
index d12013c..653a0a9 100644
--- a/src/lxc/lxc_hostdev.c
+++ b/src/lxc/lxc_hostdev.c
@@ -32,7 +32,7 @@
#define VIR_FROM_THIS VIR_FROM_LXC
int
-virLXCUpdateActiveUsbHostdevs(virLXCDriverPtr driver,
+virLXCUpdateActiveUSBHostdevs(virLXCDriverPtr driver,
virDomainDefPtr def)
{
virHostdevManagerPtr hostdev_mgr = driver->hostdevMgr;
@@ -116,7 +116,7 @@ int virLXCPrepareHostDevices(virLXCDriverPtr driver,
static void
-virLXCDomainReAttachHostUsbDevices(virLXCDriverPtr driver,
+virLXCDomainReAttachHostUSBDevices(virLXCDriverPtr driver,
const char *name,
virDomainHostdevDefPtr *hostdevs,
int nhostdevs)
@@ -133,6 +133,6 @@ void virLXCDomainReAttachHostDevices(virLXCDriverPtr driver,
if (!def->nhostdevs)
return;
- virLXCDomainReAttachHostUsbDevices(driver, def->name, def->hostdevs,
+ virLXCDomainReAttachHostUSBDevices(driver, def->name, def->hostdevs,
def->nhostdevs);
}
diff --git a/src/lxc/lxc_hostdev.h b/src/lxc/lxc_hostdev.h
index cf89a99..b3bc45e 100644
--- a/src/lxc/lxc_hostdev.h
+++ b/src/lxc/lxc_hostdev.h
@@ -27,7 +27,7 @@
# include "lxc_conf.h"
# include "domain_conf.h"
-int virLXCUpdateActiveUsbHostdevs(virLXCDriverPtr driver,
+int virLXCUpdateActiveUSBHostdevs(virLXCDriverPtr driver,
virDomainDefPtr def);
int virLXCFindHostdevUSBDevice(virDomainHostdevDefPtr hostdev,
bool mandatory,
diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c
index fcdcb2d..d278abc 100644
--- a/src/lxc/lxc_process.c
+++ b/src/lxc/lxc_process.c
@@ -1499,7 +1499,7 @@ virLXCProcessReconnectDomain(virDomainObjPtr vm,
goto error;
}
- if (virLXCUpdateActiveUsbHostdevs(driver, vm->def) < 0)
+ if (virLXCUpdateActiveUSBHostdevs(driver, vm->def) < 0)
goto error;
if (virSecurityManagerReserveLabel(driver->securityManager,
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 66e8448..9601063 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1455,12 +1455,12 @@ static struct virQEMUCapsStringFlags
virQEMUCapsObjectPropsPixx4PM[] = {
{ "disable_s4", QEMU_CAPS_DISABLE_S4 },
};
-static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsUsbRedir[] = {
+static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsUSBRedir[] = {
{ "filter", QEMU_CAPS_USB_REDIR_FILTER },
{ "bootindex", QEMU_CAPS_USB_REDIR_BOOTINDEX },
};
-static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsUsbHost[] = {
+static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsUSBHost[] = {
{ "bootindex", QEMU_CAPS_USB_HOST_BOOTINDEX },
};
@@ -1476,7 +1476,7 @@ static struct virQEMUCapsStringFlags
virQEMUCapsObjectPropsQ35PciHost[] = {
{ "pci-hole64-size", QEMU_CAPS_Q35_PCI_HOLE64_SIZE },
};
-static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsUsbStorage[] = {
+static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsUSBStorage[] = {
{ "removable", QEMU_CAPS_USB_STORAGE_REMOVABLE },
};
@@ -1515,18 +1515,18 @@ static struct virQEMUCapsObjectTypeProps virQEMUCapsObjectProps[]
= {
ARRAY_CARDINALITY(virQEMUCapsObjectPropsIDEDrive) },
{ "PIIX4_PM", virQEMUCapsObjectPropsPixx4PM,
ARRAY_CARDINALITY(virQEMUCapsObjectPropsPixx4PM) },
- { "usb-redir", virQEMUCapsObjectPropsUsbRedir,
- ARRAY_CARDINALITY(virQEMUCapsObjectPropsUsbRedir) },
- { "usb-host", virQEMUCapsObjectPropsUsbHost,
- ARRAY_CARDINALITY(virQEMUCapsObjectPropsUsbHost) },
+ { "usb-redir", virQEMUCapsObjectPropsUSBRedir,
+ ARRAY_CARDINALITY(virQEMUCapsObjectPropsUSBRedir) },
+ { "usb-host", virQEMUCapsObjectPropsUSBHost,
+ ARRAY_CARDINALITY(virQEMUCapsObjectPropsUSBHost) },
{ "scsi-generic", virQEMUCapsObjectPropsSCSIGeneric,
ARRAY_CARDINALITY(virQEMUCapsObjectPropsSCSIGeneric) },
{ "i440FX-pcihost", virQEMUCapsObjectPropsI440FXPciHost,
ARRAY_CARDINALITY(virQEMUCapsObjectPropsI440FXPciHost) },
{ "q35-pcihost", virQEMUCapsObjectPropsQ35PciHost,
ARRAY_CARDINALITY(virQEMUCapsObjectPropsQ35PciHost) },
- { "usb-storage", virQEMUCapsObjectPropsUsbStorage,
- ARRAY_CARDINALITY(virQEMUCapsObjectPropsUsbStorage) },
+ { "usb-storage", virQEMUCapsObjectPropsUSBStorage,
+ ARRAY_CARDINALITY(virQEMUCapsObjectPropsUSBStorage) },
{ "kvm-pit", virQEMUCapsObjectPropsKVMPit,
ARRAY_CARDINALITY(virQEMUCapsObjectPropsKVMPit) },
};
diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c
index 48a51f0..a65325b 100644
--- a/src/qemu/qemu_cgroup.c
+++ b/src/qemu/qemu_cgroup.c
@@ -183,7 +183,7 @@ qemuSetupTPMCgroup(virDomainDefPtr def,
static int
-qemuSetupHostUsbDeviceCgroup(virUSBDevicePtr dev ATTRIBUTE_UNUSED,
+qemuSetupHostUSBDeviceCgroup(virUSBDevicePtr dev ATTRIBUTE_UNUSED,
const char *path,
void *opaque)
{
@@ -281,10 +281,10 @@ qemuSetupHostdevCGroup(virDomainObjPtr vm,
goto cleanup;
}
- /* oddly, qemuSetupHostUsbDeviceCgroup doesn't ever
+ /* oddly, qemuSetupHostUSBDeviceCgroup doesn't ever
* reference the usb object we just created
*/
- if (virUSBDeviceFileIterate(usb, qemuSetupHostUsbDeviceCgroup,
+ if (virUSBDeviceFileIterate(usb, qemuSetupHostUSBDeviceCgroup,
vm) < 0) {
goto cleanup;
}
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 0f546f5..2582d7b 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -2997,7 +2997,7 @@ error:
}
static void
-qemuUsbId(virBufferPtr buf, int idx)
+qemuUSBId(virBufferPtr buf, int idx)
{
if (idx == 0)
virBufferAddLit(buf, "usb");
@@ -3094,7 +3094,7 @@ qemuBuildDeviceAddressStr(virBufferPtr buf,
virBufferAsprintf(buf, ".0x%x", info->addr.pci.function);
} else if (info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_USB) {
virBufferAddLit(buf, ",bus=");
- qemuUsbId(buf, info->addr.usb.bus);
+ qemuUSBId(buf, info->addr.usb.bus);
virBufferAsprintf(buf, ".0,port=%s", info->addr.usb.port);
} else if (info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO) {
if (info->addr.spaprvio.has_reg)
@@ -4782,11 +4782,11 @@ qemuBuildUSBControllerDevStr(virDomainDefPtr domainDef,
if (def->info.mastertype == VIR_DOMAIN_CONTROLLER_MASTER_USB) {
virBufferAddLit(buf, ",masterbus=");
- qemuUsbId(buf, def->idx);
+ qemuUSBId(buf, def->idx);
virBufferAsprintf(buf, ".0,firstport=%d",
def->info.master.usb.startport);
} else {
virBufferAddLit(buf, ",id=");
- qemuUsbId(buf, def->idx);
+ qemuUSBId(buf, def->idx);
}
return 0;
@@ -5627,7 +5627,7 @@ qemuBuildRedirdevDevStr(virDomainDefPtr def,
virBufferAddLit(&buf, ",filter=");
for (i = 0; i < redirfilter->nusbdevs; i++) {
- virDomainRedirFilterUsbDevDefPtr usbdev = redirfilter->usbdevs[i];
+ virDomainRedirFilterUSBDevDefPtr usbdev = redirfilter->usbdevs[i];
if (usbdev->usbClass >= 0)
virBufferAsprintf(&buf, "0x%02X:", usbdev->usbClass);
else
@@ -5759,7 +5759,7 @@ error:
char *
-qemuBuildUSBHostdevUsbDevStr(virDomainHostdevDefPtr dev)
+qemuBuildUSBHostdevUSBDevStr(virDomainHostdevDefPtr dev)
{
char *ret = NULL;
@@ -9455,7 +9455,7 @@ qemuBuildCommandLine(virConnectPtr conn,
VIR_FREE(devstr);
} else {
virCommandAddArg(cmd, "-usbdevice");
- if (!(devstr = qemuBuildUSBHostdevUsbDevStr(hostdev)))
+ if (!(devstr = qemuBuildUSBHostdevUSBDevStr(hostdev)))
goto error;
virCommandAddArg(cmd, devstr);
VIR_FREE(devstr);
diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h
index ebb0b1d..d7ce574 100644
--- a/src/qemu/qemu_command.h
+++ b/src/qemu/qemu_command.h
@@ -161,7 +161,7 @@ char * qemuBuildPCIHostdevDevStr(virDomainDefPtr def,
int qemuOpenPCIConfig(virDomainHostdevDefPtr dev);
/* Legacy, pre device support */
-char * qemuBuildUSBHostdevUsbDevStr(virDomainHostdevDefPtr dev);
+char * qemuBuildUSBHostdevUSBDevStr(virDomainHostdevDefPtr dev);
/* Current, best practice */
char * qemuBuildUSBHostdevDevStr(virDomainDefPtr def,
virDomainHostdevDefPtr dev,
--
1.8.5.3
7:03 a.m.
New subject: [libvirt] [PATCH 3/4] Replace Pci with PCI throughout
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
7:03 a.m.
New subject: [libvirt] [PATCH 4/4] Add syntax check to validate capitalization of abbreviations
Use a syntax-check rule to force PCI, USB and SCSI instead
of Pci, Usb and Scsi.
Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com>
---
cfg.mk | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/cfg.mk b/cfg.mk
index 9ad8cf7..f61ccfc 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -887,6 +887,11 @@ sc_prohibit_wrong_filename_in_comment:
'actual file name' 1>&2; exit 1; } \
fi;
+sc_prohibit_mixed_case_abbreviations:
+ @prohibit='Pci|Usb|Scsi' \
+ in_vc_files='\.[ch]$$' \
+ halt='Use PCI, USB, SCSI, not Pci, Usb, Scsi' \
+ $(_sc_search_regexp)
# We don't use this feature of maint.mk.
prev_version_file = /dev/null
@@ -1057,3 +1062,6 @@ exclude_file_name_regexp--sc_prohibit_int_ijk = \
exclude_file_name_regexp--sc_prohibit_getenv = \
^tests/.*\.[ch]$$
+
+exclude_file_name_regexp--sc_prohibit_mixed_case_abbreviations = \
+ ^src/(vbox/vbox_CAPI.*.h|esx/esx_vi.(c|h)|esx/esx_storage_backend_iscsi.c)$$
--
1.8.5.3
7:09 a.m.
On 03/13/2014 06:03 AM, Daniel P. Berrange wrote:
Complete the cleanup of bogus capitalization of Pci/Scsi/Usb
Daniel P. Berrange (4):
Replace Scsi with SCSI throughout
Replace Usb with USB throughout
Replace Pci with PCI throughout
Add syntax check to validate capitalization of abbreviations
ACK series.
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
3910
days inactive
3910
days old
5 comments
2 participants
participants (2)
-
Daniel P. Berrange -
Eric Blake