diff mbox

target-arm: Fix unreachable code in gicv3_class_name()

Message ID 1468260552-8400-1-git-send-email-peter.maydell@linaro.org (mailing list archive)
State New, archived
Headers show

Commit Message

Peter Maydell July 11, 2016, 6:09 p.m. UTC 
Coverity complains that the exit() in gicv3_class_name()
can be unreachable, because if TARGET_AARCH64 is defined
then all code paths return before reaching it. Move the
exit() up to the error_report() that it belongs with.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 target-arm/machine.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

Shannon Zhao July 12, 2016, 1:23 a.m. UTC | #1 
On 2016/7/12 2:09, Peter Maydell wrote:
> Coverity complains that the exit() in gicv3_class_name()
> can be unreachable, because if TARGET_AARCH64 is defined
> then all code paths return before reaching it. Move the
> exit() up to the error_report() that it belongs with.
> 
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Shannon Zhao <shannon.zhao@linaro.org>

> ---
>  target-arm/machine.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/target-arm/machine.c b/target-arm/machine.c
> index 2dbeb82..7a6ca31 100644
> --- a/target-arm/machine.c
> +++ b/target-arm/machine.c
> @@ -340,10 +340,9 @@ const char *gicv3_class_name(void)
>  #else
>          error_report("KVM GICv3 acceleration is not supported on this "
>                       "platform");
> +        exit(1);
>  #endif
>      } else {
>          return "arm-gicv3";
>      }
> -
> -    exit(1);
>  }
>
diff mbox

Patch

diff --git a/target-arm/machine.c b/target-arm/machine.c
index 2dbeb82..7a6ca31 100644
--- a/target-arm/machine.c
+++ b/target-arm/machine.c
@@ -340,10 +340,9 @@  const char *gicv3_class_name(void)
 #else
         error_report("KVM GICv3 acceleration is not supported on this "
                      "platform");
+        exit(1);
 #endif
     } else {
         return "arm-gicv3";
     }
-
-    exit(1);
 }