提交 b66664ff 编写于 作者: P Peter Krempa

qemu: command: Remove unnecessary label in qemuCheckDiskConfig

上级 1f880b5f
...@@ -943,7 +943,7 @@ qemuCheckDiskConfig(virDomainDiskDefPtr disk) ...@@ -943,7 +943,7 @@ qemuCheckDiskConfig(virDomainDiskDefPtr disk)
if (virDiskNameToIndex(disk->dst) < 0) { if (virDiskNameToIndex(disk->dst) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("unsupported disk type '%s'"), disk->dst); _("unsupported disk type '%s'"), disk->dst);
goto error; return -1;
} }
if (disk->wwn) { if (disk->wwn) {
...@@ -951,7 +951,7 @@ qemuCheckDiskConfig(virDomainDiskDefPtr disk) ...@@ -951,7 +951,7 @@ qemuCheckDiskConfig(virDomainDiskDefPtr disk)
(disk->bus != VIR_DOMAIN_DISK_BUS_SCSI)) { (disk->bus != VIR_DOMAIN_DISK_BUS_SCSI)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Only ide and scsi disk support wwn")); _("Only ide and scsi disk support wwn"));
goto error; return -1;
} }
} }
...@@ -959,7 +959,7 @@ qemuCheckDiskConfig(virDomainDiskDefPtr disk) ...@@ -959,7 +959,7 @@ qemuCheckDiskConfig(virDomainDiskDefPtr disk)
disk->bus != VIR_DOMAIN_DISK_BUS_SCSI) { disk->bus != VIR_DOMAIN_DISK_BUS_SCSI) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Only scsi disk supports vendor and product")); _("Only scsi disk supports vendor and product"));
goto error; return -1;
} }
if (disk->device == VIR_DOMAIN_DISK_DEVICE_LUN) { if (disk->device == VIR_DOMAIN_DISK_DEVICE_LUN) {
...@@ -969,7 +969,7 @@ qemuCheckDiskConfig(virDomainDiskDefPtr disk) ...@@ -969,7 +969,7 @@ qemuCheckDiskConfig(virDomainDiskDefPtr disk)
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("disk device='lun' is not supported for bus='%s'"), _("disk device='lun' is not supported for bus='%s'"),
virDomainDiskQEMUBusTypeToString(disk->bus)); virDomainDiskQEMUBusTypeToString(disk->bus));
goto error; return -1;
} }
if (virStorageSourceGetActualType(disk->src) == VIR_STORAGE_TYPE_NETWORK) { if (virStorageSourceGetActualType(disk->src) == VIR_STORAGE_TYPE_NETWORK) {
...@@ -978,30 +978,28 @@ qemuCheckDiskConfig(virDomainDiskDefPtr disk) ...@@ -978,30 +978,28 @@ qemuCheckDiskConfig(virDomainDiskDefPtr disk)
_("disk device='lun' is not supported " _("disk device='lun' is not supported "
"for protocol='%s'"), "for protocol='%s'"),
virStorageNetProtocolTypeToString(disk->src->protocol)); virStorageNetProtocolTypeToString(disk->src->protocol));
goto error; return -1;
} }
} else if (!virStorageSourceIsBlockLocal(disk->src)) { } else if (!virStorageSourceIsBlockLocal(disk->src)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("disk device='lun' is only valid for block " _("disk device='lun' is only valid for block "
"type disk source")); "type disk source"));
goto error; return -1;
} }
if (disk->wwn) { if (disk->wwn) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Setting wwn is not supported for lun device")); _("Setting wwn is not supported for lun device"));
goto error; return -1;
} }
if (disk->vendor || disk->product) { if (disk->vendor || disk->product) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Setting vendor or product is not supported " _("Setting vendor or product is not supported "
"for lun device")); "for lun device"));
goto error; return -1;
} }
} }
return 0; return 0;
error:
return -1;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册