Patchwork monitor: Fix "info mem" to print the last memory range

login
register
mail settings
Submitter Austin Clements
Date Aug. 15, 2011, 3:22 a.m.
Message ID <1313378524-15690-1-git-send-email-amdragon@mit.edu>
Download mbox | patch
Permalink /patch/109977/
State New
Headers show

Comments

Austin Clements - Aug. 15, 2011, 3:22 a.m.
"info mem" groups its output into contiguous ranges with identical
protection bits, but previously forgot to print the last range.

Signed-off-by: Austin Clements <amdragon@mit.edu>
---
 monitor.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
Blue Swirl - Aug. 21, 2011, 6:27 p.m.
Thanks, applied.

On Mon, Aug 15, 2011 at 3:22 AM, Austin Clements <amdragon@mit.edu> wrote:
> "info mem" groups its output into contiguous ranges with identical
> protection bits, but previously forgot to print the last range.
>
> Signed-off-by: Austin Clements <amdragon@mit.edu>
> ---
>  monitor.c |    6 ++++++
>  1 files changed, 6 insertions(+), 0 deletions(-)
>
> diff --git a/monitor.c b/monitor.c
> index 6a4f8c2..f8ba0ef 100644
> --- a/monitor.c
> +++ b/monitor.c
> @@ -2258,6 +2258,8 @@ static void mem_info_32(Monitor *mon, CPUState *env)
>             mem_print(mon, &start, &last_prot, end, prot);
>         }
>     }
> +    /* Flush last range */
> +    mem_print(mon, &start, &last_prot, (target_phys_addr_t)1 << 32, 0);
>  }
>
>  static void mem_info_pae32(Monitor *mon, CPUState *env)
> @@ -2311,6 +2313,8 @@ static void mem_info_pae32(Monitor *mon, CPUState *env)
>             mem_print(mon, &start, &last_prot, end, prot);
>         }
>     }
> +    /* Flush last range */
> +    mem_print(mon, &start, &last_prot, (target_phys_addr_t)1 << 32, 0);
>  }
>
>
> @@ -2385,6 +2389,8 @@ static void mem_info_64(Monitor *mon, CPUState *env)
>             mem_print(mon, &start, &last_prot, end, prot);
>         }
>     }
> +    /* Flush last range */
> +    mem_print(mon, &start, &last_prot, (target_phys_addr_t)1 << 48, 0);
>  }
>  #endif
>
> --
> 1.7.5.4
>
>
>

Patch

diff --git a/monitor.c b/monitor.c
index 6a4f8c2..f8ba0ef 100644
--- a/monitor.c
+++ b/monitor.c
@@ -2258,6 +2258,8 @@  static void mem_info_32(Monitor *mon, CPUState *env)
             mem_print(mon, &start, &last_prot, end, prot);
         }
     }
+    /* Flush last range */
+    mem_print(mon, &start, &last_prot, (target_phys_addr_t)1 << 32, 0);
 }
 
 static void mem_info_pae32(Monitor *mon, CPUState *env)
@@ -2311,6 +2313,8 @@  static void mem_info_pae32(Monitor *mon, CPUState *env)
             mem_print(mon, &start, &last_prot, end, prot);
         }
     }
+    /* Flush last range */
+    mem_print(mon, &start, &last_prot, (target_phys_addr_t)1 << 32, 0);
 }
 
 
@@ -2385,6 +2389,8 @@  static void mem_info_64(Monitor *mon, CPUState *env)
             mem_print(mon, &start, &last_prot, end, prot);
         }
     }
+    /* Flush last range */
+    mem_print(mon, &start, &last_prot, (target_phys_addr_t)1 << 48, 0);
 }
 #endif