diff options
| -rw-r--r-- | hw/intc/arm_gicv3_redist.c | 4 | ||||
| -rw-r--r-- | target-arm/machine.c | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/hw/intc/arm_gicv3_redist.c b/hw/intc/arm_gicv3_redist.c index 2f60096e6e..77e5cfa327 100644 --- 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 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); } |