mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-03-07 17:28:15 +00:00
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>
This commit is contained in:
parent
4607168e77
commit
21a2446d92
@ -4018,7 +4018,7 @@ virDomainHostdevSubsysPciDefParseXML(xmlNodePtr node,
|
|||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
virDomainHostdevSubsysScsiDefParseXML(xmlNodePtr node,
|
virDomainHostdevSubsysSCSIDefParseXML(xmlNodePtr node,
|
||||||
virDomainHostdevDefPtr def)
|
virDomainHostdevDefPtr def)
|
||||||
{
|
{
|
||||||
int ret = -1;
|
int ret = -1;
|
||||||
@ -4220,7 +4220,7 @@ virDomainHostdevAssignAddress(virDomainXMLOptionPtr xmlopt,
|
|||||||
|
|
||||||
controller++;
|
controller++;
|
||||||
ret = virDomainControllerSCSINextUnit(def,
|
ret = virDomainControllerSCSINextUnit(def,
|
||||||
xmlopt->config.hasWideScsiBus ?
|
xmlopt->config.hasWideSCSIBus ?
|
||||||
SCSI_WIDE_BUS_MAX_CONT_UNIT :
|
SCSI_WIDE_BUS_MAX_CONT_UNIT :
|
||||||
SCSI_NARROW_BUS_MAX_CONT_UNIT,
|
SCSI_NARROW_BUS_MAX_CONT_UNIT,
|
||||||
def->controllers[i]->idx);
|
def->controllers[i]->idx);
|
||||||
@ -4342,7 +4342,7 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node,
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI:
|
case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI:
|
||||||
if (virDomainHostdevSubsysScsiDefParseXML(sourcenode, def) < 0)
|
if (virDomainHostdevSubsysSCSIDefParseXML(sourcenode, def) < 0)
|
||||||
goto error;
|
goto error;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
@ -4487,7 +4487,7 @@ virDomainDiskDefAssignAddress(virDomainXMLOptionPtr xmlopt,
|
|||||||
case VIR_DOMAIN_DISK_BUS_SCSI:
|
case VIR_DOMAIN_DISK_BUS_SCSI:
|
||||||
def->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE;
|
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
|
/* For a wide SCSI bus we define the default mapping to be
|
||||||
* 16 units per bus, 1 bus per controller, many controllers.
|
* 16 units per bus, 1 bus per controller, many controllers.
|
||||||
* Unit 7 is the SCSI controller itself. Therefore unit 7
|
* Unit 7 is the SCSI controller itself. Therefore unit 7
|
||||||
|
@ -2075,7 +2075,7 @@ struct _virDomainDefParserConfig {
|
|||||||
virFreeCallback privFree;
|
virFreeCallback privFree;
|
||||||
|
|
||||||
/* data */
|
/* data */
|
||||||
bool hasWideScsiBus;
|
bool hasWideSCSIBus;
|
||||||
unsigned char macPrefix[VIR_MAC_PREFIX_BUFLEN];
|
unsigned char macPrefix[VIR_MAC_PREFIX_BUFLEN];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -662,7 +662,7 @@ virNodeDevCapStorageParseXML(xmlXPathContextPtr ctxt,
|
|||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
virNodeDevCapScsiParseXML(xmlXPathContextPtr ctxt,
|
virNodeDevCapSCSIParseXML(xmlXPathContextPtr ctxt,
|
||||||
virNodeDeviceDefPtr def,
|
virNodeDeviceDefPtr def,
|
||||||
xmlNodePtr node,
|
xmlNodePtr node,
|
||||||
union _virNodeDevCapData *data)
|
union _virNodeDevCapData *data)
|
||||||
@ -707,7 +707,7 @@ virNodeDevCapScsiParseXML(xmlXPathContextPtr ctxt,
|
|||||||
|
|
||||||
|
|
||||||
static int
|
static int
|
||||||
virNodeDevCapScsiTargetParseXML(xmlXPathContextPtr ctxt,
|
virNodeDevCapSCSITargetParseXML(xmlXPathContextPtr ctxt,
|
||||||
virNodeDeviceDefPtr def,
|
virNodeDeviceDefPtr def,
|
||||||
xmlNodePtr node,
|
xmlNodePtr node,
|
||||||
union _virNodeDevCapData *data)
|
union _virNodeDevCapData *data)
|
||||||
@ -735,7 +735,7 @@ virNodeDevCapScsiTargetParseXML(xmlXPathContextPtr ctxt,
|
|||||||
|
|
||||||
|
|
||||||
static int
|
static int
|
||||||
virNodeDevCapScsiHostParseXML(xmlXPathContextPtr ctxt,
|
virNodeDevCapSCSIHostParseXML(xmlXPathContextPtr ctxt,
|
||||||
virNodeDeviceDefPtr def,
|
virNodeDeviceDefPtr def,
|
||||||
xmlNodePtr node,
|
xmlNodePtr node,
|
||||||
union _virNodeDevCapData *data,
|
union _virNodeDevCapData *data,
|
||||||
@ -1198,16 +1198,16 @@ virNodeDevCapsDefParseXML(xmlXPathContextPtr ctxt,
|
|||||||
ret = virNodeDevCapNetParseXML(ctxt, def, node, &caps->data);
|
ret = virNodeDevCapNetParseXML(ctxt, def, node, &caps->data);
|
||||||
break;
|
break;
|
||||||
case VIR_NODE_DEV_CAP_SCSI_HOST:
|
case VIR_NODE_DEV_CAP_SCSI_HOST:
|
||||||
ret = virNodeDevCapScsiHostParseXML(ctxt, def, node,
|
ret = virNodeDevCapSCSIHostParseXML(ctxt, def, node,
|
||||||
&caps->data,
|
&caps->data,
|
||||||
create,
|
create,
|
||||||
virt_type);
|
virt_type);
|
||||||
break;
|
break;
|
||||||
case VIR_NODE_DEV_CAP_SCSI_TARGET:
|
case VIR_NODE_DEV_CAP_SCSI_TARGET:
|
||||||
ret = virNodeDevCapScsiTargetParseXML(ctxt, def, node, &caps->data);
|
ret = virNodeDevCapSCSITargetParseXML(ctxt, def, node, &caps->data);
|
||||||
break;
|
break;
|
||||||
case VIR_NODE_DEV_CAP_SCSI:
|
case VIR_NODE_DEV_CAP_SCSI:
|
||||||
ret = virNodeDevCapScsiParseXML(ctxt, def, node, &caps->data);
|
ret = virNodeDevCapSCSIParseXML(ctxt, def, node, &caps->data);
|
||||||
break;
|
break;
|
||||||
case VIR_NODE_DEV_CAP_STORAGE:
|
case VIR_NODE_DEV_CAP_STORAGE:
|
||||||
ret = virNodeDevCapStorageParseXML(ctxt, def, node, &caps->data);
|
ret = virNodeDevCapStorageParseXML(ctxt, def, node, &caps->data);
|
||||||
|
@ -69,7 +69,7 @@ enum virNodeDevStorageCapFlags {
|
|||||||
VIR_NODE_DEV_CAP_STORAGE_HOTPLUGGABLE = (1 << 2),
|
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_FC_HOST = (1 << 0),
|
||||||
VIR_NODE_DEV_CAP_FLAG_HBA_VPORT_OPS = (1 << 1),
|
VIR_NODE_DEV_CAP_FLAG_HBA_VPORT_OPS = (1 << 1),
|
||||||
};
|
};
|
||||||
|
@ -1143,7 +1143,7 @@ static int udevProcessStorage(struct udev_device *device,
|
|||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
udevProcessScsiGeneric(struct udev_device *dev,
|
udevProcessSCSIGeneric(struct udev_device *dev,
|
||||||
virNodeDeviceDefPtr def)
|
virNodeDeviceDefPtr def)
|
||||||
{
|
{
|
||||||
if (udevGetStringProperty(dev,
|
if (udevGetStringProperty(dev,
|
||||||
@ -1258,7 +1258,7 @@ static int udevGetDeviceDetails(struct udev_device *device,
|
|||||||
ret = udevProcessStorage(device, def);
|
ret = udevProcessStorage(device, def);
|
||||||
break;
|
break;
|
||||||
case VIR_NODE_DEV_CAP_SCSI_GENERIC:
|
case VIR_NODE_DEV_CAP_SCSI_GENERIC:
|
||||||
ret = udevProcessScsiGeneric(device, def);
|
ret = udevProcessSCSIGeneric(device, def);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
VIR_ERROR(_("Unknown device type %d"), def->caps->type);
|
VIR_ERROR(_("Unknown device type %d"), def->caps->type);
|
||||||
|
@ -1466,7 +1466,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVfioPci[] = {
|
|||||||
{ "bootindex", QEMU_CAPS_VFIO_PCI_BOOTINDEX },
|
{ "bootindex", QEMU_CAPS_VFIO_PCI_BOOTINDEX },
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsScsiDisk[] = {
|
static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsSCSIDisk[] = {
|
||||||
{ "channel", QEMU_CAPS_SCSI_DISK_CHANNEL },
|
{ "channel", QEMU_CAPS_SCSI_DISK_CHANNEL },
|
||||||
{ "wwn", QEMU_CAPS_SCSI_DISK_WWN },
|
{ "wwn", QEMU_CAPS_SCSI_DISK_WWN },
|
||||||
};
|
};
|
||||||
@ -1489,7 +1489,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsUsbHost[] = {
|
|||||||
{ "bootindex", QEMU_CAPS_USB_HOST_BOOTINDEX },
|
{ "bootindex", QEMU_CAPS_USB_HOST_BOOTINDEX },
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsScsiGeneric[] = {
|
static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsSCSIGeneric[] = {
|
||||||
{ "bootindex", QEMU_CAPS_DEVICE_SCSI_GENERIC_BOOTINDEX },
|
{ "bootindex", QEMU_CAPS_DEVICE_SCSI_GENERIC_BOOTINDEX },
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -1534,8 +1534,8 @@ static struct virQEMUCapsObjectTypeProps virQEMUCapsObjectProps[] = {
|
|||||||
ARRAY_CARDINALITY(virQEMUCapsObjectPropsPciAssign) },
|
ARRAY_CARDINALITY(virQEMUCapsObjectPropsPciAssign) },
|
||||||
{ "vfio-pci", virQEMUCapsObjectPropsVfioPci,
|
{ "vfio-pci", virQEMUCapsObjectPropsVfioPci,
|
||||||
ARRAY_CARDINALITY(virQEMUCapsObjectPropsVfioPci) },
|
ARRAY_CARDINALITY(virQEMUCapsObjectPropsVfioPci) },
|
||||||
{ "scsi-disk", virQEMUCapsObjectPropsScsiDisk,
|
{ "scsi-disk", virQEMUCapsObjectPropsSCSIDisk,
|
||||||
ARRAY_CARDINALITY(virQEMUCapsObjectPropsScsiDisk) },
|
ARRAY_CARDINALITY(virQEMUCapsObjectPropsSCSIDisk) },
|
||||||
{ "ide-drive", virQEMUCapsObjectPropsIDEDrive,
|
{ "ide-drive", virQEMUCapsObjectPropsIDEDrive,
|
||||||
ARRAY_CARDINALITY(virQEMUCapsObjectPropsIDEDrive) },
|
ARRAY_CARDINALITY(virQEMUCapsObjectPropsIDEDrive) },
|
||||||
{ "PIIX4_PM", virQEMUCapsObjectPropsPixx4PM,
|
{ "PIIX4_PM", virQEMUCapsObjectPropsPixx4PM,
|
||||||
@ -1544,8 +1544,8 @@ static struct virQEMUCapsObjectTypeProps virQEMUCapsObjectProps[] = {
|
|||||||
ARRAY_CARDINALITY(virQEMUCapsObjectPropsUsbRedir) },
|
ARRAY_CARDINALITY(virQEMUCapsObjectPropsUsbRedir) },
|
||||||
{ "usb-host", virQEMUCapsObjectPropsUsbHost,
|
{ "usb-host", virQEMUCapsObjectPropsUsbHost,
|
||||||
ARRAY_CARDINALITY(virQEMUCapsObjectPropsUsbHost) },
|
ARRAY_CARDINALITY(virQEMUCapsObjectPropsUsbHost) },
|
||||||
{ "scsi-generic", virQEMUCapsObjectPropsScsiGeneric,
|
{ "scsi-generic", virQEMUCapsObjectPropsSCSIGeneric,
|
||||||
ARRAY_CARDINALITY(virQEMUCapsObjectPropsScsiGeneric) },
|
ARRAY_CARDINALITY(virQEMUCapsObjectPropsSCSIGeneric) },
|
||||||
{ "i440FX-pcihost", virQEMUCapsObjectPropsI440FXPciHost,
|
{ "i440FX-pcihost", virQEMUCapsObjectPropsI440FXPciHost,
|
||||||
ARRAY_CARDINALITY(virQEMUCapsObjectPropsI440FXPciHost) },
|
ARRAY_CARDINALITY(virQEMUCapsObjectPropsI440FXPciHost) },
|
||||||
{ "q35-pcihost", virQEMUCapsObjectPropsQ35PciHost,
|
{ "q35-pcihost", virQEMUCapsObjectPropsQ35PciHost,
|
||||||
|
@ -202,7 +202,7 @@ qemuSetupHostUsbDeviceCgroup(virUSBDevicePtr dev ATTRIBUTE_UNUSED,
|
|||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
qemuSetupHostScsiDeviceCgroup(virSCSIDevicePtr dev ATTRIBUTE_UNUSED,
|
qemuSetupHostSCSIDeviceCgroup(virSCSIDevicePtr dev ATTRIBUTE_UNUSED,
|
||||||
const char *path,
|
const char *path,
|
||||||
void *opaque)
|
void *opaque)
|
||||||
{
|
{
|
||||||
@ -303,7 +303,7 @@ qemuSetupHostdevCGroup(virDomainObjPtr vm,
|
|||||||
goto cleanup;
|
goto cleanup;
|
||||||
|
|
||||||
if (virSCSIDeviceFileIterate(scsi,
|
if (virSCSIDeviceFileIterate(scsi,
|
||||||
qemuSetupHostScsiDeviceCgroup,
|
qemuSetupHostSCSIDeviceCgroup,
|
||||||
vm) < 0)
|
vm) < 0)
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
|
|
||||||
|
@ -690,7 +690,7 @@ static int qemuAssignDeviceDiskAliasFixed(virDomainDiskDefPtr disk)
|
|||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
qemuSetScsiControllerModel(virDomainDefPtr def,
|
qemuSetSCSIControllerModel(virDomainDefPtr def,
|
||||||
virQEMUCapsPtr qemuCaps,
|
virQEMUCapsPtr qemuCaps,
|
||||||
int *model)
|
int *model)
|
||||||
{
|
{
|
||||||
@ -762,7 +762,7 @@ qemuAssignDeviceDiskAliasCustom(virDomainDefPtr def,
|
|||||||
virDomainDeviceFindControllerModel(def, &disk->info,
|
virDomainDeviceFindControllerModel(def, &disk->info,
|
||||||
VIR_DOMAIN_CONTROLLER_TYPE_SCSI);
|
VIR_DOMAIN_CONTROLLER_TYPE_SCSI);
|
||||||
|
|
||||||
if ((qemuSetScsiControllerModel(def, qemuCaps, &controllerModel)) < 0)
|
if ((qemuSetSCSIControllerModel(def, qemuCaps, &controllerModel)) < 0)
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1418,7 +1418,7 @@ int qemuDomainAssignSpaprVIOAddresses(virDomainDefPtr def,
|
|||||||
for (i = 0; i < def->ncontrollers; i++) {
|
for (i = 0; i < def->ncontrollers; i++) {
|
||||||
model = def->controllers[i]->model;
|
model = def->controllers[i]->model;
|
||||||
if (def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_SCSI) {
|
if (def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_SCSI) {
|
||||||
if (qemuSetScsiControllerModel(def, qemuCaps, &model) < 0)
|
if (qemuSetSCSIControllerModel(def, qemuCaps, &model) < 0)
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -4406,7 +4406,7 @@ qemuBuildDriveDevStr(virDomainDefPtr def,
|
|||||||
controllerModel =
|
controllerModel =
|
||||||
virDomainDeviceFindControllerModel(def, &disk->info,
|
virDomainDeviceFindControllerModel(def, &disk->info,
|
||||||
VIR_DOMAIN_CONTROLLER_TYPE_SCSI);
|
VIR_DOMAIN_CONTROLLER_TYPE_SCSI);
|
||||||
if ((qemuSetScsiControllerModel(def, qemuCaps, &controllerModel)) < 0)
|
if ((qemuSetSCSIControllerModel(def, qemuCaps, &controllerModel)) < 0)
|
||||||
goto error;
|
goto error;
|
||||||
|
|
||||||
if (controllerModel == VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSILOGIC) {
|
if (controllerModel == VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSILOGIC) {
|
||||||
@ -4811,7 +4811,7 @@ qemuBuildControllerDevStr(virDomainDefPtr domainDef,
|
|||||||
switch (def->type) {
|
switch (def->type) {
|
||||||
case VIR_DOMAIN_CONTROLLER_TYPE_SCSI:
|
case VIR_DOMAIN_CONTROLLER_TYPE_SCSI:
|
||||||
model = def->model;
|
model = def->model;
|
||||||
if ((qemuSetScsiControllerModel(domainDef, qemuCaps, &model)) < 0)
|
if ((qemuSetSCSIControllerModel(domainDef, qemuCaps, &model)) < 0)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
switch (model) {
|
switch (model) {
|
||||||
@ -5837,7 +5837,7 @@ qemuBuildSCSIHostdevDevStr(virDomainDefPtr def,
|
|||||||
model = virDomainDeviceFindControllerModel(def, dev->info,
|
model = virDomainDeviceFindControllerModel(def, dev->info,
|
||||||
VIR_DOMAIN_CONTROLLER_TYPE_SCSI);
|
VIR_DOMAIN_CONTROLLER_TYPE_SCSI);
|
||||||
|
|
||||||
if (qemuSetScsiControllerModel(def, qemuCaps, &model) < 0)
|
if (qemuSetSCSIControllerModel(def, qemuCaps, &model) < 0)
|
||||||
goto error;
|
goto error;
|
||||||
|
|
||||||
if (model == VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSILOGIC) {
|
if (model == VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSILOGIC) {
|
||||||
|
@ -525,7 +525,7 @@ VIR_ENUM_IMPL(virVMXControllerModelSCSI, VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LAST,
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
virDomainDefParserConfig virVMXDomainDefParserConfig = {
|
virDomainDefParserConfig virVMXDomainDefParserConfig = {
|
||||||
.hasWideScsiBus = true,
|
.hasWideSCSIBus = true,
|
||||||
.macPrefix = {0x00, 0x0c, 0x29},
|
.macPrefix = {0x00, 0x0c, 0x29},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user