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>

diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c
index 161d30cf72b52fc11ed7821a4661b255f9ed20fd..e58c488f8ac9e2105f6396a8fa6700e99e46a52b 100644 (file)
--- a/src/qemu/qemu_alias.c
+++ b/src/qemu/qemu_alias.c
@@ -244,7 +244,7 @@ qemuAssignDeviceDiskAlias(virDomainDef *def,
      * need the full path into /machine/peripheral as a historical artifact.
      */
     if (!diskPriv->qomName) {
-        switch ((virDomainDiskBus) disk->bus) {
+        switch (disk->bus) {
         case VIR_DOMAIN_DISK_BUS_FDC:
         case VIR_DOMAIN_DISK_BUS_IDE:
         case VIR_DOMAIN_DISK_BUS_SATA:

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 6de0bdf977355951df99c7ee08cd8541a01b02ee..be5814663c254ced6b20472aaba5f2d48dc45b77 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -409,7 +409,7 @@ qemuBuildDeviceAddresDriveProps(virJSONValue *props,
     virDomainControllerDef *controller = NULL;
     const char *controllerAlias = NULL;
 
-    switch ((virDomainDiskBus) info->addr.drive.diskbus) {
+    switch (info->addr.drive.diskbus) {
     case VIR_DOMAIN_DISK_BUS_IDE:
         /* 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
@@ -1770,7 +1770,7 @@ qemuBuildDiskDeviceProps(const virDomainDef *def,
     const char *wpolicy = NULL;
     const char *rpolicy = NULL;
 
-    switch ((virDomainDiskBus) disk->bus) {
+    switch (disk->bus) {
     case VIR_DOMAIN_DISK_BUS_IDE:
     case VIR_DOMAIN_DISK_BUS_SATA:
         if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM)

diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c
index 0875ed0401a314421788a459c16d398b3a5560ca..00742d3c0e060c6fa5eaa878ed1893387bcb159a 100644 (file)
--- a/src/qemu/qemu_domain_address.c
+++ b/src/qemu/qemu_domain_address.c
@@ -790,7 +790,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDef *dev,
         break;
 
     case VIR_DOMAIN_DEVICE_DISK:
-        switch ((virDomainDiskBus) dev->data.disk->bus) {
+        switch (dev->data.disk->bus) {
         case VIR_DOMAIN_DISK_BUS_VIRTIO:
             /* only virtio disks use PCI */
             switch (dev->data.disk->model) {

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 0d5f253bb9ce72f9e1c5f14e2e7c9c4bffacd3ac..d4f01cfd937b7acbc7010eebffbf8af2de2b18cd 100644 (file)
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -926,7 +926,7 @@ qemuDomainAttachDeviceDiskLiveInternal(virQEMUDriver *driver,
             goto cleanup;
     }
 
-    switch ((virDomainDiskBus) disk->bus) {
+    switch (disk->bus) {
     case VIR_DOMAIN_DISK_BUS_USB:
         if (disk->device == VIR_DOMAIN_DISK_DEVICE_LUN) {
             virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
@@ -5468,7 +5468,7 @@ qemuDomainDetachPrepDisk(virDomainObj *vm,
     case VIR_DOMAIN_DISK_DEVICE_DISK:
     case VIR_DOMAIN_DISK_DEVICE_LUN:
 
-        switch ((virDomainDiskBus) disk->bus) {
+        switch (disk->bus) {
         case VIR_DOMAIN_DISK_BUS_VIRTIO:
         case VIR_DOMAIN_DISK_BUS_USB:
         case VIR_DOMAIN_DISK_BUS_SCSI:

diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
index 3b57fa3c21edee8ae3f8a1944cec1a0a5a102ed5..18d34e7f59e1bb27dc4e30657398ac1d4cd7aaa5 100644 (file)
--- a/src/qemu/qemu_validate.c
+++ b/src/qemu/qemu_validate.c
@@ -1371,7 +1371,7 @@ qemuValidateDomainDeviceDefAddressDrive(virDomainDeviceInfo *info,
 {
     virDomainControllerDef *controller = NULL;
 
-    switch ((virDomainDiskBus) info->addr.drive.diskbus) {
+    switch (info->addr.drive.diskbus) {
     case VIR_DOMAIN_DISK_BUS_SCSI:
         /* Setting bus= attr for SCSI drives, causes a controller
          * to be created. Yes this is slightly odd. It is not possible
@@ -2673,7 +2673,7 @@ static bool
 qemuValidateDomainDeviceDefDiskIOThreads(const virDomainDef *def,
                                          const virDomainDiskDef *disk)
 {
-    switch ((virDomainDiskBus)disk->bus) {
+    switch (disk->bus) {
     case VIR_DOMAIN_DISK_BUS_VIRTIO:
         break;
 

diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c
index dba4af1a448a42a8824ce0efd2888d983c575110..490f337a56ee804c90381eccd485a332e390ed59 100644 (file)
--- a/src/vbox/vbox_common.c
+++ b/src/vbox/vbox_common.c
@@ -1206,7 +1206,7 @@ vboxAttachDrives(virDomainDef *def, struct _vboxDriver *data, IMachine *machine)
             goto cleanup;
         }
 
-        switch ((virDomainDiskBus) disk->bus) {
+        switch (disk->bus) {
         case VIR_DOMAIN_DISK_BUS_IDE:
             VBOX_UTF8_TO_UTF16(VBOX_CONTROLLER_IDE_NAME, &storageCtlName);
             devicePort = def->disks[i]->info.addr.drive.bus;