mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-10-05 22:05:47 +00:00
src: Drop needless typecast to virDomainDiskBus
The 'bus' member of _virDomainDiskDef is already declared of virDomainDiskModel type. Hence, there is no need to typecast the variable when passing to switch() statements. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
parent
0041723233
commit
f7534c2573
@ -244,7 +244,7 @@ qemuAssignDeviceDiskAlias(virDomainDef *def,
|
|||||||
* need the full path into /machine/peripheral as a historical artifact.
|
* need the full path into /machine/peripheral as a historical artifact.
|
||||||
*/
|
*/
|
||||||
if (!diskPriv->qomName) {
|
if (!diskPriv->qomName) {
|
||||||
switch ((virDomainDiskBus) disk->bus) {
|
switch (disk->bus) {
|
||||||
case VIR_DOMAIN_DISK_BUS_FDC:
|
case VIR_DOMAIN_DISK_BUS_FDC:
|
||||||
case VIR_DOMAIN_DISK_BUS_IDE:
|
case VIR_DOMAIN_DISK_BUS_IDE:
|
||||||
case VIR_DOMAIN_DISK_BUS_SATA:
|
case VIR_DOMAIN_DISK_BUS_SATA:
|
||||||
|
@ -409,7 +409,7 @@ qemuBuildDeviceAddresDriveProps(virJSONValue *props,
|
|||||||
virDomainControllerDef *controller = NULL;
|
virDomainControllerDef *controller = NULL;
|
||||||
const char *controllerAlias = NULL;
|
const char *controllerAlias = NULL;
|
||||||
|
|
||||||
switch ((virDomainDiskBus) info->addr.drive.diskbus) {
|
switch (info->addr.drive.diskbus) {
|
||||||
case VIR_DOMAIN_DISK_BUS_IDE:
|
case VIR_DOMAIN_DISK_BUS_IDE:
|
||||||
/* When domain has builtin IDE controller we don't put it onto cmd
|
/* When domain has builtin IDE controller we don't put it onto cmd
|
||||||
* line. Therefore we can't set its alias. In that case, use the
|
* line. Therefore we can't set its alias. In that case, use the
|
||||||
@ -1770,7 +1770,7 @@ qemuBuildDiskDeviceProps(const virDomainDef *def,
|
|||||||
const char *wpolicy = NULL;
|
const char *wpolicy = NULL;
|
||||||
const char *rpolicy = NULL;
|
const char *rpolicy = NULL;
|
||||||
|
|
||||||
switch ((virDomainDiskBus) disk->bus) {
|
switch (disk->bus) {
|
||||||
case VIR_DOMAIN_DISK_BUS_IDE:
|
case VIR_DOMAIN_DISK_BUS_IDE:
|
||||||
case VIR_DOMAIN_DISK_BUS_SATA:
|
case VIR_DOMAIN_DISK_BUS_SATA:
|
||||||
if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM)
|
if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM)
|
||||||
|
@ -790,7 +790,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDef *dev,
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case VIR_DOMAIN_DEVICE_DISK:
|
case VIR_DOMAIN_DEVICE_DISK:
|
||||||
switch ((virDomainDiskBus) dev->data.disk->bus) {
|
switch (dev->data.disk->bus) {
|
||||||
case VIR_DOMAIN_DISK_BUS_VIRTIO:
|
case VIR_DOMAIN_DISK_BUS_VIRTIO:
|
||||||
/* only virtio disks use PCI */
|
/* only virtio disks use PCI */
|
||||||
switch (dev->data.disk->model) {
|
switch (dev->data.disk->model) {
|
||||||
|
@ -926,7 +926,7 @@ qemuDomainAttachDeviceDiskLiveInternal(virQEMUDriver *driver,
|
|||||||
goto cleanup;
|
goto cleanup;
|
||||||
}
|
}
|
||||||
|
|
||||||
switch ((virDomainDiskBus) disk->bus) {
|
switch (disk->bus) {
|
||||||
case VIR_DOMAIN_DISK_BUS_USB:
|
case VIR_DOMAIN_DISK_BUS_USB:
|
||||||
if (disk->device == VIR_DOMAIN_DISK_DEVICE_LUN) {
|
if (disk->device == VIR_DOMAIN_DISK_DEVICE_LUN) {
|
||||||
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
|
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
|
||||||
@ -5468,7 +5468,7 @@ qemuDomainDetachPrepDisk(virDomainObj *vm,
|
|||||||
case VIR_DOMAIN_DISK_DEVICE_DISK:
|
case VIR_DOMAIN_DISK_DEVICE_DISK:
|
||||||
case VIR_DOMAIN_DISK_DEVICE_LUN:
|
case VIR_DOMAIN_DISK_DEVICE_LUN:
|
||||||
|
|
||||||
switch ((virDomainDiskBus) disk->bus) {
|
switch (disk->bus) {
|
||||||
case VIR_DOMAIN_DISK_BUS_VIRTIO:
|
case VIR_DOMAIN_DISK_BUS_VIRTIO:
|
||||||
case VIR_DOMAIN_DISK_BUS_USB:
|
case VIR_DOMAIN_DISK_BUS_USB:
|
||||||
case VIR_DOMAIN_DISK_BUS_SCSI:
|
case VIR_DOMAIN_DISK_BUS_SCSI:
|
||||||
|
@ -1371,7 +1371,7 @@ qemuValidateDomainDeviceDefAddressDrive(virDomainDeviceInfo *info,
|
|||||||
{
|
{
|
||||||
virDomainControllerDef *controller = NULL;
|
virDomainControllerDef *controller = NULL;
|
||||||
|
|
||||||
switch ((virDomainDiskBus) info->addr.drive.diskbus) {
|
switch (info->addr.drive.diskbus) {
|
||||||
case VIR_DOMAIN_DISK_BUS_SCSI:
|
case VIR_DOMAIN_DISK_BUS_SCSI:
|
||||||
/* Setting bus= attr for SCSI drives, causes a controller
|
/* Setting bus= attr for SCSI drives, causes a controller
|
||||||
* to be created. Yes this is slightly odd. It is not possible
|
* to be created. Yes this is slightly odd. It is not possible
|
||||||
@ -2673,7 +2673,7 @@ static bool
|
|||||||
qemuValidateDomainDeviceDefDiskIOThreads(const virDomainDef *def,
|
qemuValidateDomainDeviceDefDiskIOThreads(const virDomainDef *def,
|
||||||
const virDomainDiskDef *disk)
|
const virDomainDiskDef *disk)
|
||||||
{
|
{
|
||||||
switch ((virDomainDiskBus)disk->bus) {
|
switch (disk->bus) {
|
||||||
case VIR_DOMAIN_DISK_BUS_VIRTIO:
|
case VIR_DOMAIN_DISK_BUS_VIRTIO:
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -1206,7 +1206,7 @@ vboxAttachDrives(virDomainDef *def, struct _vboxDriver *data, IMachine *machine)
|
|||||||
goto cleanup;
|
goto cleanup;
|
||||||
}
|
}
|
||||||
|
|
||||||
switch ((virDomainDiskBus) disk->bus) {
|
switch (disk->bus) {
|
||||||
case VIR_DOMAIN_DISK_BUS_IDE:
|
case VIR_DOMAIN_DISK_BUS_IDE:
|
||||||
VBOX_UTF8_TO_UTF16(VBOX_CONTROLLER_IDE_NAME, &storageCtlName);
|
VBOX_UTF8_TO_UTF16(VBOX_CONTROLLER_IDE_NAME, &storageCtlName);
|
||||||
devicePort = def->disks[i]->info.addr.drive.bus;
|
devicePort = def->disks[i]->info.addr.drive.bus;
|
||||||
|
Loading…
Reference in New Issue
Block a user