Patchwork [v2,1/6] monitor: Don't check for mon_get_cpu() failure

login
register
mail settings
Submitter Markus Armbruster
Date Jan. 20, 2010, 12:07 p.m.
Message ID <1263989255-13755-2-git-send-email-armbru@redhat.com>
Download mbox | patch
Permalink /patch/43272/
State New
Headers show

Comments

Markus Armbruster - Jan. 20, 2010, 12:07 p.m.
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 <armbru@redhat.com>
---
 monitor.c |   39 +++------------------------------------
 1 files changed, 3 insertions(+), 36 deletions(-)
Anthony Liguori - Jan. 26, 2010, 9:34 p.m.
On 01/20/2010 06:07 AM, Markus Armbruster wrote:
> 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<armbru@redhat.com>
>    

Applied all.  Thanks.

Regards,

Anthony Liguori

> ---
>   monitor.c |   39 +++------------------------------------
>   1 files changed, 3 insertions(+), 36 deletions(-)
>
> diff --git a/monitor.c b/monitor.c
> index 938eb3b..c22901f 100644
> --- a/monitor.c
> +++ b/monitor.c
> @@ -693,8 +693,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);
> @@ -1128,7 +1126,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) {
> @@ -1190,8 +1188,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;
> @@ -1318,8 +1314,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) {
> @@ -1754,8 +1748,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");
> @@ -1812,8 +1804,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");
> @@ -2659,8 +2649,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
> @@ -2672,9 +2660,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));
> @@ -2685,40 +2670,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
> @@ -2728,8 +2703,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
> @@ -2737,8 +2710,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
> @@ -2990,7 +2961,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;
> @@ -3002,8 +2973,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:
> @@ -3090,10 +3059,8 @@ static int64_t expr_unary(Monitor *mon)
>                   pch++;
>               *q = 0;
>               ret = get_monitor_def(&reg, 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;
>

Patch

diff --git a/monitor.c b/monitor.c
index 938eb3b..c22901f 100644
--- a/monitor.c
+++ b/monitor.c
@@ -693,8 +693,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);
@@ -1128,7 +1126,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) {
@@ -1190,8 +1188,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;
@@ -1318,8 +1314,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) {
@@ -1754,8 +1748,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");
@@ -1812,8 +1804,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");
@@ -2659,8 +2649,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
@@ -2672,9 +2660,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));
@@ -2685,40 +2670,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
@@ -2728,8 +2703,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
@@ -2737,8 +2710,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
@@ -2990,7 +2961,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;
@@ -3002,8 +2973,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:
@@ -3090,10 +3059,8 @@  static int64_t expr_unary(Monitor *mon)
                 pch++;
             *q = 0;
             ret = get_monitor_def(&reg, 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;