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@redhat.com>

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 26202572356da0af872beecc43026bdcc67b8864..488856aa09d5272dc17a8577f8d5723f808e2db6 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -4018,7 +4018,7 @@ virDomainHostdevSubsysPciDefParseXML(xmlNodePtr node,
 }
 
 static int
-virDomainHostdevSubsysScsiDefParseXML(xmlNodePtr node,
+virDomainHostdevSubsysSCSIDefParseXML(xmlNodePtr node,
                                       virDomainHostdevDefPtr def)
 {
     int ret = -1;
@@ -4220,7 +4220,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);
@@ -4342,7 +4342,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;
 
@@ -4487,7 +4487,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 c01f482e30978e7126cf8a38a78f5f0d015df753..fb872beb1402e13e1e62d89aa7b85e35a563b877 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -2075,7 +2075,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 bcf57d9e79cdd4fb2ef4389f2ce722d95131e15b..7fd5e5371e2b25c672b0530316ab0a0f7bd4f48f 100644 (file)
--- a/src/conf/node_device_conf.c
+++ b/src/conf/node_device_conf.c
@@ -662,7 +662,7 @@ virNodeDevCapStorageParseXML(xmlXPathContextPtr ctxt,
 }
 
 static int
-virNodeDevCapScsiParseXML(xmlXPathContextPtr ctxt,
+virNodeDevCapSCSIParseXML(xmlXPathContextPtr ctxt,
                           virNodeDeviceDefPtr def,
                           xmlNodePtr node,
                           union _virNodeDevCapData *data)
@@ -707,7 +707,7 @@ virNodeDevCapScsiParseXML(xmlXPathContextPtr ctxt,
 
 
 static int
-virNodeDevCapScsiTargetParseXML(xmlXPathContextPtr ctxt,
+virNodeDevCapSCSITargetParseXML(xmlXPathContextPtr ctxt,
                                 virNodeDeviceDefPtr def,
                                 xmlNodePtr node,
                                 union _virNodeDevCapData *data)
@@ -735,7 +735,7 @@ virNodeDevCapScsiTargetParseXML(xmlXPathContextPtr ctxt,
 
 
 static int
-virNodeDevCapScsiHostParseXML(xmlXPathContextPtr ctxt,
+virNodeDevCapSCSIHostParseXML(xmlXPathContextPtr ctxt,
                               virNodeDeviceDefPtr def,
                               xmlNodePtr node,
                               union _virNodeDevCapData *data,
@@ -1198,16 +1198,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 26116a1cd1f07939090b8263a8f6b85918cb03c1..9b5d17281789c00cfc3bc726a6555dcc5f686fdc 100644 (file)
--- 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 cf7803e57f1297d197f359f711e4bea7cb4c87aa..71b3c79c20e504b93a469fd9ea8e2add9f2b9d67 100644 (file)
--- a/src/node_device/node_device_udev.c
+++ b/src/node_device/node_device_udev.c
@@ -1143,7 +1143,7 @@ static int udevProcessStorage(struct udev_device *device,
 }
 
 static int
-udevProcessScsiGeneric(struct udev_device *dev,
+udevProcessSCSIGeneric(struct udev_device *dev,
                        virNodeDeviceDefPtr def)
 {
     if (udevGetStringProperty(dev,
@@ -1258,7 +1258,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 2c8ec101c74b745ae5849727fca588d4ff268012..2c02fbaefe1f4e685d21f3d3734d6bcd5006d12d 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1466,7 +1466,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 },
 };
@@ -1489,7 +1489,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 },
 };
 
@@ -1534,8 +1534,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,
@@ -1544,8 +1544,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 ce1639388f8bdf232a6cd655f237fabc831b34b4..b71a28ee2f8f2a90eeadf762495b0d557416a4f9 100644 (file)
--- a/src/qemu/qemu_cgroup.c
+++ b/src/qemu/qemu_cgroup.c
@@ -202,7 +202,7 @@ qemuSetupHostUsbDeviceCgroup(virUSBDevicePtr dev ATTRIBUTE_UNUSED,
 }
 
 static int
-qemuSetupHostScsiDeviceCgroup(virSCSIDevicePtr dev ATTRIBUTE_UNUSED,
+qemuSetupHostSCSIDeviceCgroup(virSCSIDevicePtr dev ATTRIBUTE_UNUSED,
                               const char *path,
                               void *opaque)
 {
@@ -303,7 +303,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 7b1e9c082f752771860ad08ccec989dd81e035d1..5e0230a0241fd397c3b808520e76dcc59d56aa76 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -690,7 +690,7 @@ static int qemuAssignDeviceDiskAliasFixed(virDomainDiskDefPtr disk)
 }
 
 static int
-qemuSetScsiControllerModel(virDomainDefPtr def,
+qemuSetSCSIControllerModel(virDomainDefPtr def,
                            virQEMUCapsPtr qemuCaps,
                            int *model)
 {
@@ -762,7 +762,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;
         }
 
@@ -1418,7 +1418,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;
         }
 
@@ -4406,7 +4406,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) {
@@ -4811,7 +4811,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) {
@@ -5837,7 +5837,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 ebd3f29d0e1cf68ba608792b4f8ae3d869903381..169440c79e415b769c4eb6d509aeac9f54922b3d 100644 (file)
--- a/src/vmx/vmx.c
+++ b/src/vmx/vmx.c
@@ -525,7 +525,7 @@ VIR_ENUM_IMPL(virVMXControllerModelSCSI, VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LAST,
  */
 
 virDomainDefParserConfig virVMXDomainDefParserConfig = {
-    .hasWideScsiBus = true,
+    .hasWideSCSIBus = true,
     .macPrefix = {0x00, 0x0c, 0x29},
 };