Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-2…

…0160719' 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 <[email protected]>" # gpg: aka "Peter Maydell <[email protected]>" # gpg: aka "Peter Maydell <[email protected]>" # 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 <[email protected]>
shreyasbp · Jul 20, 2016 · 338404d · 338404d
2 parents 1ecfb24 + acd8279
commit 338404d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/hw/intc/arm_gicv3_redist.c b/hw/intc/arm_gicv3_redist.c
@@ -420,6 +420,8 @@ MemTxResult gicv3_redist_read(void *opaque, hwaddr offset, uint64_t *data,
     MemTxResult r;
     int cpuidx;
 
+    assert((offset & (size - 1)) == 0);
+
     /* This region covers all the redistributor pages; there are
      * (for GICv3) two 64K pages per CPU. At the moment they are
      * all contiguous (ie in this one region), though we might later
@@ -468,6 +470,8 @@ MemTxResult gicv3_redist_write(void *opaque, hwaddr offset, uint64_t data,
     MemTxResult r;
     int cpuidx;
 
+    assert((offset & (size - 1)) == 0);
+
     /* This region covers all the redistributor pages; there are
      * (for GICv3) two 64K pages per CPU. At the moment they are
      * all contiguous (ie in this one region), though we might later

diff --git 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);
 }