[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH 6/8] qemu: command: Remove unnecessary label in qemuCheckDiskConfig



---
 src/qemu/qemu_command.c | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 110ee19..0f0427f 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -879,7 +879,7 @@ qemuCheckDiskConfig(virDomainDiskDefPtr disk)
     if (virDiskNameToIndex(disk->dst) < 0) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        _("unsupported disk type '%s'"), disk->dst);
-        goto error;
+        return -1;
     }

     if (disk->wwn) {
@@ -887,7 +887,7 @@ qemuCheckDiskConfig(virDomainDiskDefPtr disk)
             (disk->bus != VIR_DOMAIN_DISK_BUS_SCSI)) {
             virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
                            _("Only ide and scsi disk support wwn"));
-            goto error;
+            return -1;
         }
     }

@@ -895,7 +895,7 @@ qemuCheckDiskConfig(virDomainDiskDefPtr disk)
         disk->bus != VIR_DOMAIN_DISK_BUS_SCSI) {
             virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
                            _("Only scsi disk supports vendor and product"));
-            goto error;
+            return -1;
     }

     if (disk->device == VIR_DOMAIN_DISK_DEVICE_LUN) {
@@ -905,7 +905,7 @@ qemuCheckDiskConfig(virDomainDiskDefPtr disk)
             virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                            _("disk device='lun' is not supported for bus='%s'"),
                            virDomainDiskQEMUBusTypeToString(disk->bus));
-            goto error;
+            return -1;
         }

         if (virStorageSourceGetActualType(disk->src) == VIR_STORAGE_TYPE_NETWORK) {
@@ -914,30 +914,28 @@ qemuCheckDiskConfig(virDomainDiskDefPtr disk)
                                _("disk device='lun' is not supported "
                                  "for protocol='%s'"),
                                virStorageNetProtocolTypeToString(disk->src->protocol));
-                goto error;
+                return -1;
             }
         } else if (!virStorageSourceIsBlockLocal(disk->src)) {
             virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
                            _("disk device='lun' is only valid for block "
                              "type disk source"));
-            goto error;
+            return -1;
         }

         if (disk->wwn) {
             virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
                            _("Setting wwn is not supported for lun device"));
-            goto error;
+            return -1;
         }
         if (disk->vendor || disk->product) {
             virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
                            _("Setting vendor or product is not supported "
                              "for lun device"));
-            goto error;
+            return -1;
         }
     }
     return 0;
- error:
-    return -1;
 }


-- 
2.8.1


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]