* [Qemu-devel] [PATCH] memory: Fix zero-sized memory region print
@ 2013-07-19 18:42 Alex Williamson
2013-07-19 20:09 ` Paolo Bonzini
2013-07-23 19:04 ` Anthony Liguori
0 siblings, 2 replies; 3+ messages in thread
From: Alex Williamson @ 2013-07-19 18:42 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini
if mr->size == 0, then
int128_get64(int128_sub(mr->size, int128_make64(1))) => assert(!a.hi)
Also, use int128_one().
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
---
memory.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/memory.c b/memory.c
index c8f9a2b..6e17c21 100644
--- a/memory.c
+++ b/memory.c
@@ -1788,7 +1788,9 @@ static void mtree_print_mr(fprintf_function mon_printf, void *f,
"-" TARGET_FMT_plx "\n",
base + mr->addr,
base + mr->addr
- + (hwaddr)int128_get64(int128_sub(mr->size, int128_make64(1))),
+ + (int128_nz(mr->size) ?
+ (hwaddr)int128_get64(int128_sub(mr->size,
+ int128_one())) : 0),
mr->priority,
mr->romd_mode ? 'R' : '-',
!mr->readonly && !(mr->rom_device && mr->romd_mode) ? 'W'
@@ -1803,7 +1805,9 @@ static void mtree_print_mr(fprintf_function mon_printf, void *f,
TARGET_FMT_plx "-" TARGET_FMT_plx " (prio %d, %c%c): %s\n",
base + mr->addr,
base + mr->addr
- + (hwaddr)int128_get64(int128_sub(mr->size, int128_make64(1))),
+ + (int128_nz(mr->size) ?
+ (hwaddr)int128_get64(int128_sub(mr->size,
+ int128_one())) : 0),
mr->priority,
mr->romd_mode ? 'R' : '-',
!mr->readonly && !(mr->rom_device && mr->romd_mode) ? 'W'
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [Qemu-devel] [PATCH] memory: Fix zero-sized memory region print
2013-07-19 18:42 [Qemu-devel] [PATCH] memory: Fix zero-sized memory region print Alex Williamson
@ 2013-07-19 20:09 ` Paolo Bonzini
2013-07-23 19:04 ` Anthony Liguori
1 sibling, 0 replies; 3+ messages in thread
From: Paolo Bonzini @ 2013-07-19 20:09 UTC (permalink / raw)
To: Alex Williamson; +Cc: qemu-devel
Il 19/07/2013 20:42, Alex Williamson ha scritto:
> if mr->size == 0, then
>
> int128_get64(int128_sub(mr->size, int128_make64(1))) => assert(!a.hi)
>
> Also, use int128_one().
>
> Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> memory.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/memory.c b/memory.c
> index c8f9a2b..6e17c21 100644
> --- a/memory.c
> +++ b/memory.c
> @@ -1788,7 +1788,9 @@ static void mtree_print_mr(fprintf_function mon_printf, void *f,
> "-" TARGET_FMT_plx "\n",
> base + mr->addr,
> base + mr->addr
> - + (hwaddr)int128_get64(int128_sub(mr->size, int128_make64(1))),
> + + (int128_nz(mr->size) ?
> + (hwaddr)int128_get64(int128_sub(mr->size,
> + int128_one())) : 0),
> mr->priority,
> mr->romd_mode ? 'R' : '-',
> !mr->readonly && !(mr->rom_device && mr->romd_mode) ? 'W'
> @@ -1803,7 +1805,9 @@ static void mtree_print_mr(fprintf_function mon_printf, void *f,
> TARGET_FMT_plx "-" TARGET_FMT_plx " (prio %d, %c%c): %s\n",
> base + mr->addr,
> base + mr->addr
> - + (hwaddr)int128_get64(int128_sub(mr->size, int128_make64(1))),
> + + (int128_nz(mr->size) ?
> + (hwaddr)int128_get64(int128_sub(mr->size,
> + int128_one())) : 0),
> mr->priority,
> mr->romd_mode ? 'R' : '-',
> !mr->readonly && !(mr->rom_device && mr->romd_mode) ? 'W'
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH] memory: Fix zero-sized memory region print
2013-07-19 18:42 [Qemu-devel] [PATCH] memory: Fix zero-sized memory region print Alex Williamson
2013-07-19 20:09 ` Paolo Bonzini
@ 2013-07-23 19:04 ` Anthony Liguori
1 sibling, 0 replies; 3+ messages in thread
From: Anthony Liguori @ 2013-07-23 19:04 UTC (permalink / raw)
To: Alex Williamson, qemu-devel; +Cc: pbonzini
Applied. Thanks.
Regards,
Anthony Liguori
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-07-23 19:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-07-19 18:42 [Qemu-devel] [PATCH] memory: Fix zero-sized memory region print Alex Williamson
2013-07-19 20:09 ` Paolo Bonzini
2013-07-23 19:04 ` Anthony Liguori
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).