diff options
| author | Peter Maydell | 2016-07-20 13:48:18 +0200 |
|---|---|---|
| committer | Peter Maydell | 2016-07-20 13:48:18 +0200 |
| commit | 338404d061144956b76f9893ca3434d057dff2d4 (patch) | |
| tree | 10796b44356c75c633750237c74b88a089841e89 /target-arm/machine.c | |
| parent | Merge remote-tracking branch 'remotes/riku/tags/pull-linux-user-20160719-2' i... (diff) | |
| parent | arm_gicv3: Add assert()s to tell Coverity that offsets are aligned (diff) | |
| download | qemu-338404d061144956b76f9893ca3434d057dff2d4.tar.gz qemu-338404d061144956b76f9893ca3434d057dff2d4.tar.xz qemu-338404d061144956b76f9893ca3434d057dff2d4.zip | |
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20160719' into staging
target-arm queue:
* fix two minor Coverity complaints
# gpg: Signature made Tue 19 Jul 2016 18:02:34 BST
# gpg: using RSA key 0x3C2525ED14360CDE
# gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>"
# gpg: aka "Peter Maydell <pmaydell@gmail.com>"
# gpg: aka "Peter Maydell <pmaydell@chiark.greenend.org.uk>"
# Primary key fingerprint: E1A5 C593 CD41 9DE2 8E83 15CF 3C25 25ED 1436 0CDE
* remotes/pmaydell/tags/pull-target-arm-20160719:
arm_gicv3: Add assert()s to tell Coverity that offsets are aligned
target-arm: Fix unreachable code in gicv3_class_name()
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target-arm/machine.c')
| -rw-r--r-- | target-arm/machine.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/target-arm/machine.c b/target-arm/machine.c index 2dbeb826cd..7a6ca31a8e 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); } |