| Message ID | 1457342271-13410-1-git-send-email-famz@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 03/07/16 10:17, Fam Zheng wrote: > Signed-off-by: Fam Zheng <famz@redhat.com> > > --- > > This goes after "[PATCH v2 4/7] memory: Drop MemoryRegion.ram_addr" (or > squashed into it if we want strict synchronization). > --- > scripts/dump-guest-memory.py | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/scripts/dump-guest-memory.py b/scripts/dump-guest-memory.py > index f274bf8..c0a2e99 100644 > --- a/scripts/dump-guest-memory.py > +++ b/scripts/dump-guest-memory.py > @@ -352,7 +352,7 @@ def memory_region_get_ram_ptr(memory_region): > return (memory_region_get_ram_ptr(memory_region["alias"].dereference()) > + memory_region["alias_offset"]) > > - return qemu_get_ram_ptr(memory_region["ram_addr"] & TARGET_PAGE_MASK) > + return qemu_get_ram_ptr(memory_region["ram_block"]["offset"]) > > > def get_guest_phys_blocks(): > I didn't follow your series, and I've by now forgotten most of the dump stuff, but if you tested the above with GDB, I can ack it. Acked-by: Laszlo Ersek <lersek@redhat.com> I hope that Janosch can chime in as well. Thanks Laszlo
On Mon, 03/07 10:37, Laszlo Ersek wrote: > On 03/07/16 10:17, Fam Zheng wrote: > > Signed-off-by: Fam Zheng <famz@redhat.com> > > > > --- > > > > This goes after "[PATCH v2 4/7] memory: Drop MemoryRegion.ram_addr" (or > > squashed into it if we want strict synchronization). > > --- > > scripts/dump-guest-memory.py | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/scripts/dump-guest-memory.py b/scripts/dump-guest-memory.py > > index f274bf8..c0a2e99 100644 > > --- a/scripts/dump-guest-memory.py > > +++ b/scripts/dump-guest-memory.py > > @@ -352,7 +352,7 @@ def memory_region_get_ram_ptr(memory_region): > > return (memory_region_get_ram_ptr(memory_region["alias"].dereference()) > > + memory_region["alias_offset"]) > > > > - return qemu_get_ram_ptr(memory_region["ram_addr"] & TARGET_PAGE_MASK) > > + return qemu_get_ram_ptr(memory_region["ram_block"]["offset"]) > > > > > > def get_guest_phys_blocks(): > > > > I didn't follow your series, and I've by now forgotten most of the dump > stuff, but if you tested the above with GDB, I can ack it. For the record, yes, I've tested it on top of this series and the command works for me. Fam > > Acked-by: Laszlo Ersek <lersek@redhat.com> > > I hope that Janosch can chime in as well. > > Thanks > Laszlo
On 03/07/16 10:45, Fam Zheng wrote: > On Mon, 03/07 10:37, Laszlo Ersek wrote: >> On 03/07/16 10:17, Fam Zheng wrote: >>> Signed-off-by: Fam Zheng <famz@redhat.com> >>> >>> --- >>> >>> This goes after "[PATCH v2 4/7] memory: Drop MemoryRegion.ram_addr" (or >>> squashed into it if we want strict synchronization). >>> --- >>> scripts/dump-guest-memory.py | 2 +- >>> 1 file changed, 1 insertion(+), 1 deletion(-) >>> >>> diff --git a/scripts/dump-guest-memory.py b/scripts/dump-guest-memory.py >>> index f274bf8..c0a2e99 100644 >>> --- a/scripts/dump-guest-memory.py >>> +++ b/scripts/dump-guest-memory.py >>> @@ -352,7 +352,7 @@ def memory_region_get_ram_ptr(memory_region): >>> return (memory_region_get_ram_ptr(memory_region["alias"].dereference()) >>> + memory_region["alias_offset"]) >>> >>> - return qemu_get_ram_ptr(memory_region["ram_addr"] & TARGET_PAGE_MASK) >>> + return qemu_get_ram_ptr(memory_region["ram_block"]["offset"]) >>> >>> >>> def get_guest_phys_blocks(): >>> >> >> I didn't follow your series, and I've by now forgotten most of the dump >> stuff, but if you tested the above with GDB, I can ack it. > > For the record, yes, I've tested it on top of this series and the command works > for me. Fantastic, thanks a lot! Laszlo >> >> Acked-by: Laszlo Ersek <lersek@redhat.com> >> >> I hope that Janosch can chime in as well. >> >> Thanks >> Laszlo
On 07/03/2016 10:17, Fam Zheng wrote: > Signed-off-by: Fam Zheng <famz@redhat.com> > > --- > > This goes after "[PATCH v2 4/7] memory: Drop MemoryRegion.ram_addr" (or > squashed into it if we want strict synchronization). > --- > scripts/dump-guest-memory.py | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/scripts/dump-guest-memory.py b/scripts/dump-guest-memory.py > index f274bf8..c0a2e99 100644 > --- a/scripts/dump-guest-memory.py > +++ b/scripts/dump-guest-memory.py > @@ -352,7 +352,7 @@ def memory_region_get_ram_ptr(memory_region): > return (memory_region_get_ram_ptr(memory_region["alias"].dereference()) > + memory_region["alias_offset"]) > > - return qemu_get_ram_ptr(memory_region["ram_addr"] & TARGET_PAGE_MASK) > + return qemu_get_ram_ptr(memory_region["ram_block"]["offset"]) > > > def get_guest_phys_blocks(): > Great, squashed it with Laszlo's ack. Paolo
On 03/07/2016 10:17 AM, Fam Zheng wrote: > Signed-off-by: Fam Zheng <famz@redhat.com> > > --- > > This goes after "[PATCH v2 4/7] memory: Drop MemoryRegion.ram_addr" (or > squashed into it if we want strict synchronization). > --- > scripts/dump-guest-memory.py | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/scripts/dump-guest-memory.py b/scripts/dump-guest-memory.py > index f274bf8..c0a2e99 100644 > --- a/scripts/dump-guest-memory.py > +++ b/scripts/dump-guest-memory.py > @@ -352,7 +352,7 @@ def memory_region_get_ram_ptr(memory_region): > return (memory_region_get_ram_ptr(memory_region["alias"].dereference()) > + memory_region["alias_offset"]) > > - return qemu_get_ram_ptr(memory_region["ram_addr"] & TARGET_PAGE_MASK) > + return qemu_get_ram_ptr(memory_region["ram_block"]["offset"]) If you get rid of TARGET_PAGE_MASK you might also want to get rid of its definition, we only use it once. I only had a short look, I'll look through your patches tomorrow morning. Cheers > > > def get_guest_phys_blocks(): >
On 03/07/2016 05:35 PM, Janosch Frank wrote: > On 03/07/2016 10:17 AM, Fam Zheng wrote: >> Signed-off-by: Fam Zheng <famz@redhat.com> >> >> --- >> >> This goes after "[PATCH v2 4/7] memory: Drop MemoryRegion.ram_addr" (or >> squashed into it if we want strict synchronization). >> --- >> scripts/dump-guest-memory.py | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/scripts/dump-guest-memory.py b/scripts/dump-guest-memory.py >> index f274bf8..c0a2e99 100644 >> --- a/scripts/dump-guest-memory.py >> +++ b/scripts/dump-guest-memory.py >> @@ -352,7 +352,7 @@ def memory_region_get_ram_ptr(memory_region): >> return (memory_region_get_ram_ptr(memory_region["alias"].dereference()) >> + memory_region["alias_offset"]) >> >> - return qemu_get_ram_ptr(memory_region["ram_addr"] & TARGET_PAGE_MASK) >> + return qemu_get_ram_ptr(memory_region["ram_block"]["offset"]) > > If you get rid of TARGET_PAGE_MASK you might also want to get rid of its > definition, we only use it once. > > I only had a short look, I'll look through your patches tomorrow morning. > > Cheers Didn't see any obvious problems. Thanks for CCing. Cheers >> >> >> def get_guest_phys_blocks(): >> > >
On Tue, 03/08 08:54, Janosch Frank wrote: > On 03/07/2016 05:35 PM, Janosch Frank wrote: > > On 03/07/2016 10:17 AM, Fam Zheng wrote: > >> Signed-off-by: Fam Zheng <famz@redhat.com> > >> > >> --- > >> > >> This goes after "[PATCH v2 4/7] memory: Drop MemoryRegion.ram_addr" (or > >> squashed into it if we want strict synchronization). > >> --- > >> scripts/dump-guest-memory.py | 2 +- > >> 1 file changed, 1 insertion(+), 1 deletion(-) > >> > >> diff --git a/scripts/dump-guest-memory.py b/scripts/dump-guest-memory.py > >> index f274bf8..c0a2e99 100644 > >> --- a/scripts/dump-guest-memory.py > >> +++ b/scripts/dump-guest-memory.py > >> @@ -352,7 +352,7 @@ def memory_region_get_ram_ptr(memory_region): > >> return (memory_region_get_ram_ptr(memory_region["alias"].dereference()) > >> + memory_region["alias_offset"]) > >> > >> - return qemu_get_ram_ptr(memory_region["ram_addr"] & TARGET_PAGE_MASK) > >> + return qemu_get_ram_ptr(memory_region["ram_block"]["offset"]) > > > > If you get rid of TARGET_PAGE_MASK you might also want to get rid of its > > definition, we only use it once. > > > > I only had a short look, I'll look through your patches tomorrow morning. > > > > Cheers > > Didn't see any obvious problems. Great. The patches are merged now, thank you for taking a look at the series! Fam
diff --git a/scripts/dump-guest-memory.py b/scripts/dump-guest-memory.py index f274bf8..c0a2e99 100644 --- a/scripts/dump-guest-memory.py +++ b/scripts/dump-guest-memory.py @@ -352,7 +352,7 @@ def memory_region_get_ram_ptr(memory_region): return (memory_region_get_ram_ptr(memory_region["alias"].dereference()) + memory_region["alias_offset"]) - return qemu_get_ram_ptr(memory_region["ram_addr"] & TARGET_PAGE_MASK) + return qemu_get_ram_ptr(memory_region["ram_block"]["offset"]) def get_guest_phys_blocks():
Signed-off-by: Fam Zheng <famz@redhat.com> --- This goes after "[PATCH v2 4/7] memory: Drop MemoryRegion.ram_addr" (or squashed into it if we want strict synchronization). --- scripts/dump-guest-memory.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)