From ad9591463812b7a8ccb10048edec47d7aafb6903 Mon Sep 17 00:00:00 2001 From: Luiz Capitulino Date: Thu, 18 Mar 2010 14:43:21 -0300 Subject: [PATCH 02/29] monitor: Don't check for mon_get_cpu() failure RH-Author: Luiz Capitulino Message-id: <1268923406-3785-2-git-send-email-lcapitulino@redhat.com> Patchwork-id: 7884 O-Subject: [PATCH 1/6] monitor: Don't check for mon_get_cpu() failure Bugzilla: 574642 RH-Acked-by: Markus Armbruster RH-Acked-by: Kevin Wolf RH-Acked-by: Juan Quintela From: Markus Armbruster mon_get_cpu() can't return null pointer, because it passes its return value to cpu_synchronize_state() first, which crashes if its argument is null. Remove the (pretty cheesy) handling of this non-existing error. Signed-off-by: Markus Armbruster Signed-off-by: Anthony Liguori (cherry picked from commit 09b9418c6d085a0728372aa760ebd10128a020b1) --- monitor.c | 39 +++------------------------------------ 1 files changed, 3 insertions(+), 36 deletions(-) Signed-off-by: Eduardo Habkost --- monitor.c | 39 +++------------------------------------ 1 files changed, 3 insertions(+), 36 deletions(-) diff --git a/monitor.c b/monitor.c index 42a1303..1a3d76d 100644 --- a/monitor.c +++ b/monitor.c @@ -804,8 +804,6 @@ static void do_info_registers(Monitor *mon) { CPUState *env; env = mon_get_cpu(); - if (!env) - return; #ifdef TARGET_I386 cpu_dump_state(env, (FILE *)mon, monitor_fprintf, X86_DUMP_FPU); @@ -1263,7 +1261,7 @@ static void memory_dump(Monitor *mon, int count, int format, int wsize, int flags; flags = 0; env = mon_get_cpu(); - if (!env && !is_physical) + if (!is_physical) return; #ifdef TARGET_I386 if (wsize == 2) { @@ -1326,8 +1324,6 @@ static void memory_dump(Monitor *mon, int count, int format, int wsize, cpu_physical_memory_rw(addr, buf, l, 0); } else { env = mon_get_cpu(); - if (!env) - break; if (cpu_memory_rw_debug(env, addr, buf, l, 0) < 0) { monitor_printf(mon, " Cannot access memory\n"); break; @@ -1454,8 +1450,6 @@ static void do_memory_save(Monitor *mon, const QDict *qdict, QObject **ret_data) uint8_t buf[1024]; env = mon_get_cpu(); - if (!env) - return; f = fopen(filename, "wb"); if (!f) { @@ -1898,8 +1892,6 @@ static void tlb_info(Monitor *mon) uint32_t pgd, pde, pte; env = mon_get_cpu(); - if (!env) - return; if (!(env->cr[0] & CR0_PG_MASK)) { monitor_printf(mon, "PG disabled\n"); @@ -1956,8 +1948,6 @@ static void mem_info(Monitor *mon) uint32_t pgd, pde, pte, start, end; env = mon_get_cpu(); - if (!env) - return; if (!(env->cr[0] & CR0_PG_MASK)) { monitor_printf(mon, "PG disabled\n"); @@ -2831,8 +2821,6 @@ typedef struct MonitorDef { static target_long monitor_get_pc (const struct MonitorDef *md, int val) { CPUState *env = mon_get_cpu(); - if (!env) - return 0; return env->eip + env->segs[R_CS].base; } #endif @@ -2844,9 +2832,6 @@ static target_long monitor_get_ccr (const struct MonitorDef *md, int val) unsigned int u; int i; - if (!env) - return 0; - u = 0; for (i = 0; i < 8; i++) u |= env->crf[i] << (32 - (4 * i)); @@ -2857,40 +2842,30 @@ static target_long monitor_get_ccr (const struct MonitorDef *md, int val) static target_long monitor_get_msr (const struct MonitorDef *md, int val) { CPUState *env = mon_get_cpu(); - if (!env) - return 0; return env->msr; } static target_long monitor_get_xer (const struct MonitorDef *md, int val) { CPUState *env = mon_get_cpu(); - if (!env) - return 0; return env->xer; } static target_long monitor_get_decr (const struct MonitorDef *md, int val) { CPUState *env = mon_get_cpu(); - if (!env) - return 0; return cpu_ppc_load_decr(env); } static target_long monitor_get_tbu (const struct MonitorDef *md, int val) { CPUState *env = mon_get_cpu(); - if (!env) - return 0; return cpu_ppc_load_tbu(env); } static target_long monitor_get_tbl (const struct MonitorDef *md, int val) { CPUState *env = mon_get_cpu(); - if (!env) - return 0; return cpu_ppc_load_tbl(env); } #endif @@ -2900,8 +2875,6 @@ static target_long monitor_get_tbl (const struct MonitorDef *md, int val) static target_long monitor_get_psr (const struct MonitorDef *md, int val) { CPUState *env = mon_get_cpu(); - if (!env) - return 0; return GET_PSR(env); } #endif @@ -2909,8 +2882,6 @@ static target_long monitor_get_psr (const struct MonitorDef *md, int val) static target_long monitor_get_reg(const struct MonitorDef *md, int val) { CPUState *env = mon_get_cpu(); - if (!env) - return 0; return env->regwptr[val]; } #endif @@ -3162,7 +3133,7 @@ static void expr_error(Monitor *mon, const char *msg) longjmp(expr_env, 1); } -/* return 0 if OK, -1 if not found, -2 if no CPU defined */ +/* return 0 if OK, -1 if not found */ static int get_monitor_def(target_long *pval, const char *name) { const MonitorDef *md; @@ -3174,8 +3145,6 @@ static int get_monitor_def(target_long *pval, const char *name) *pval = md->get_value(md, md->offset); } else { CPUState *env = mon_get_cpu(); - if (!env) - return -2; ptr = (uint8_t *)env + md->offset; switch(md->type) { case MD_I32: @@ -3262,10 +3231,8 @@ static int64_t expr_unary(Monitor *mon) pch++; *q = 0; ret = get_monitor_def(®, buf); - if (ret == -1) + if (ret < 0) expr_error(mon, "unknown register"); - else if (ret == -2) - expr_error(mon, "no cpu defined"); n = reg; } break; -- 1.7.0.3