diff options
author | Aurelien Jarno <aurelien@aurel32.net> | 2013-07-29 09:03:23 +0200 |
---|---|---|
committer | Aurelien Jarno <aurelien@aurel32.net> | 2013-07-29 09:03:23 +0200 |
commit | 461bdb3414c40d6806194bf68c91521496b1042d (patch) | |
tree | 8351478144c07306f24923791b1e4cd988770513 /target-arm/helper.c | |
parent | b6a9f4682e62c686995cc1a1fe2ef4a57a92020b (diff) | |
parent | 6c86f405efd6532b58ad1b607cc9f11e856ef5ca (diff) |
Merge branch 'trivial-patches' of git://git.corpit.ru/qemu
* 'trivial-patches' of git://git.corpit.ru/qemu:
target-mips: Remove assignment to a variable which is never used
misc: Use g_assert_not_reached for code which is expected to be unreachable
qemu-options: mention C-a h in the -nographic doc
misc: Fix new typos in comments and strings
linux-user: correct argument number for sys_mremap and sys_splice
PPC: dbdma: macio: Fix format specifiers (build regression)
watchdog: Remove break after exit
exec: Remove env from list of poisoned names
hw/9pfs: Fix potential memory leak and avoid reuse of freed memory
timer: make timers_state static
aes: Remove unused code (NDEBUG, u16)
Diffstat (limited to 'target-arm/helper.c')
-rw-r--r-- | target-arm/helper.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target-arm/helper.c b/target-arm/helper.c index b0c3ca1fbe..4968391b83 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -1653,7 +1653,7 @@ void define_one_arm_cp_reg_with_opaque(ARMCPU *cpu, "was %s, now %s\n", r2->cp, 32 + 32 * is64, r2->crn, r2->crm, r2->opc1, r2->opc2, oldreg->name, r2->name); - assert(0); + g_assert_not_reached(); } } g_hash_table_insert(cpu->cp_regs, key, r2); |