Remove unreachable breaks right after return

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>

diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c
index f3c85d65e81e219caa3f71eaee2b76e9a03e9eb3..48af467bf96712707f4ff28317912454a9c90945 100644 (file)
--- a/src/qemu/qemu_cgroup.c
+++ b/src/qemu/qemu_cgroup.c
@@ -436,7 +436,6 @@ qemuSetupInputCgroup(virDomainObj *vm,
     case VIR_DOMAIN_INPUT_TYPE_EVDEV:
         return qemuCgroupAllowDevicePath(vm, dev->source.evdev,
                                          VIR_CGROUP_DEVICE_RW, false);
-        break;
     }
 
     return ret;
@@ -457,7 +456,6 @@ qemuTeardownInputCgroup(virDomainObj *vm,
     case VIR_DOMAIN_INPUT_TYPE_EVDEV:
         return qemuCgroupDenyDevicePath(vm, dev->source.evdev,
                                         VIR_CGROUP_DEVICE_RWM, false);
-        break;
     }
 
     return 0;

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index aefc62bbf32b809412c23bbdd737605992df86ae..ead2307ed77f8efde6b86bcf466d85bb09acf629 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -9704,13 +9704,13 @@ qemuBuildSecCommandLine(virDomainObj *vm, virCommand *cmd,
     switch (sec->sectype) {
     case VIR_DOMAIN_LAUNCH_SECURITY_SEV:
         return qemuBuildSEVCommandLine(vm, cmd, &sec->data.sev);
-        break;
+
     case VIR_DOMAIN_LAUNCH_SECURITY_SEV_SNP:
         return qemuBuildSEVSNPCommandLine(cmd, &sec->data.sev_snp);
-        break;
+
     case VIR_DOMAIN_LAUNCH_SECURITY_PV:
         return qemuBuildPVCommandLine(cmd);
-        break;
+
     case VIR_DOMAIN_LAUNCH_SECURITY_NONE:
     case VIR_DOMAIN_LAUNCH_SECURITY_LAST:
         virReportEnumRangeError(virDomainLaunchSecurity, sec->sectype);

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index af5445f78df6fa9abcbb278af5d8b8a57bc21728..f0e9681161018194612bc12d9b491e260b9d7c9a 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -11990,7 +11990,6 @@ qemuDomainGetJobInfoDumpStats(virDomainObj *vm,
                        _("dump query failed, status=%1$d"),
                        privJob->stats.dump.status);
         return -1;
-        break;
 
     case QEMU_MONITOR_DUMP_STATUS_ACTIVE:
         jobData->status = VIR_DOMAIN_JOB_STATUS_ACTIVE;

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 28ca321c5c194678d25d67aa02ec82c13175f4f5..b6ef10edf97a7396ae21878f9d2ef8bbe97f1005 100644 (file)
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -7268,7 +7268,6 @@ qemuDomainChangeMemoryLiveValidateChange(const virDomainMemoryDef *oldDef,
                        _("cannot modify memory of model '%1$s'"),
                        virDomainMemoryModelTypeToString(oldDef->model));
         return false;
-        break;
     }
 
     if (oldDef->model != newDef->model) {

diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 3caeb39a1bd9ec20705b9ceec9512264422291f3..9c60807926619b4fe0f24324976bb891429118ab 100644 (file)
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -5601,7 +5601,6 @@ int qemuMonitorJSONGetObjectProperty(qemuMonitor *mon,
                        _("qom-get invalid object property type %1$d"),
                        prop->type);
         return -1;
-        break;
     }
 
     if (ret == -1) {

diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c
index 91c51f6395e41ef6dcd7acbf2d326e7dd7ecd023..68ac39611f2fcdca064c5231edf9b412389acf63 100644 (file)
--- a/src/security/security_apparmor.c
+++ b/src/security/security_apparmor.c
@@ -681,7 +681,6 @@ AppArmorSetInputLabel(virSecurityManager *mgr,
             return -1;
         }
         return reload_profile(mgr, def, input->source.evdev, true);
-        break;
 
     case VIR_DOMAIN_INPUT_TYPE_MOUSE:
     case VIR_DOMAIN_INPUT_TYPE_TABLET:

diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c
index 8d10b6e9e8abd72eaae66bb8272ec33f0f1c6b07..0dd03c1a88e7d076d3b12eb29fadcb5c09d56625 100644 (file)
--- a/src/vmx/vmx.c
+++ b/src/vmx/vmx.c
@@ -2250,13 +2250,11 @@ virVMXGenerateDiskTarget(virDomainDiskDef *def,
                        virDomainDiskBusTypeToString(def->bus),
                        virDomainDiskDeviceTypeToString(def->device));
         return -1;
-        break;
 
     case VIR_DOMAIN_DISK_BUS_NONE:
     case VIR_DOMAIN_DISK_BUS_LAST:
         virReportEnumRangeError(virDomainDiskBus, def->bus);
         return -1;
-        break;
     }
 
     def->dst = virIndexToDiskName(idx, prefix);

diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index 93c34c497133339c4220a03403faaf962573ba94..7624cb90fe7604e552128516586aa12e8f0c894c 100644 (file)
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -1070,7 +1070,6 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd)
         vshError(ctl, _("No support for %1$s in command 'attach-interface'"),
                  type);
         return false;
-        break;
     }
 
     if (target != NULL)

diff --git a/tools/virsh-host.c b/tools/virsh-host.c
index 9e8f542c96770dadf624f4c5b97be31c8babdb89..8a92e15b21cdfc1f05ab1474719991f10a0990d3 100644 (file)
--- a/tools/virsh-host.c
+++ b/tools/virsh-host.c
@@ -1217,7 +1217,6 @@ cmdCPUCompare(vshControl *ctl, const vshCmd *cmd)
         vshPrint(ctl, _("CPU described in %1$s is incompatible with host CPU\n"),
                  from);
         return false;
-        break;
 
     case VIR_CPU_COMPARE_IDENTICAL:
         vshPrint(ctl, _("CPU described in %1$s is identical to host CPU\n"),
@@ -1632,7 +1631,6 @@ cmdHypervisorCPUCompare(vshControl *ctl,
                  _("CPU described in %1$s is incompatible with the CPU provided by hypervisor on the host\n"),
                  from);
         return false;
-        break;
 
     case VIR_CPU_COMPARE_IDENTICAL:
         vshPrint(ctl,

diff --git a/tools/vsh.c b/tools/vsh.c
index fd6156ea76d0471289a9cfc43344ad236bfd5559..b42e2f0c5046d62867614bd11c79265e7a8cd776 100644 (file)
--- a/tools/vsh.c
+++ b/tools/vsh.c
@@ -1922,31 +1922,24 @@ vshGetTypedParamValue(vshControl *ctl, virTypedParameterPtr item)
     switch (item->type) {
     case VIR_TYPED_PARAM_INT:
         return g_strdup_printf("%d", item->value.i);
-        break;
 
     case VIR_TYPED_PARAM_UINT:
         return g_strdup_printf("%u", item->value.ui);
-        break;
 
     case VIR_TYPED_PARAM_LLONG:
         return g_strdup_printf("%lld", item->value.l);
-        break;
 
     case VIR_TYPED_PARAM_ULLONG:
         return g_strdup_printf("%llu", item->value.ul);
-        break;
 
     case VIR_TYPED_PARAM_DOUBLE:
         return g_strdup_printf("%f", item->value.d);
-        break;
 
     case VIR_TYPED_PARAM_BOOLEAN:
         return g_strdup(item->value.b ? _("yes") : _("no"));
-        break;
 
     case VIR_TYPED_PARAM_STRING:
         return g_strdup(item->value.s);
-        break;
 
     default:
         vshError(ctl, _("unimplemented parameter type %1$d"), item->type);