motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-09-09 00:07:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

scripts/dump-guest-memory.py: Improve python 3 compatibility

Browse source 
This commit does not make the script python 3 compatible, it is a
preparation that fixes the easy and common incompatibilities.

Print is a function in python 3 and therefore needs braces around its
arguments.

Range does not cast a gdb.Value object to int in python 3, we have to
do it ourselves.

Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Janosch Frank <frankja@linux.vnet.ibm.com>
Message-Id: <1453464520-3882-4-git-send-email-frankja@linux.vnet.ibm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Janosch Frank 2016-01-22 13:08:37 +01:00 • committed by Paolo Bonzini
parent 4789020384
commit 7cb1089d5f
1 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

26
scripts/dump-guest-memory.py
View file

@ -98,15 +98,19 @@ def memory_region_get_ram_ptr(mr):
def get_guest_phys_blocks(): def get_guest_phys_blocks():
guest_phys_blocks = [] guest_phys_blocks = []
print "guest RAM blocks:" print("guest RAM blocks:")
print ("target_start target_end host_addr message " print("target_start target_end host_addr message "
"count") "count")
print ("---------------- ---------------- ---------------- ------- " print("---------------- ---------------- ---------------- ------- "
"-----") "-----")
current_map_p = gdb.parse_and_eval("address_space_memory.current_map") current_map_p = gdb.parse_and_eval("address_space_memory.current_map")
current_map = current_map_p.dereference() current_map = current_map_p.dereference()
for cur in range(current_map["nr"]):
# Conversion to int is needed for python 3
# compatibility. Otherwise range doesn't cast the value itself and
# breaks.
for cur in range(int(current_map["nr"])):
flat_range = (current_map["ranges"] + cur).dereference() flat_range = (current_map["ranges"] + cur).dereference()
mr = flat_range["mr"].dereference() mr = flat_range["mr"].dereference()
@ -149,9 +153,9 @@ def get_guest_phys_blocks():
predecessor["target_end"] = target_end predecessor["target_end"] = target_end
message = "joined" message = "joined"
print ("%016x %016x %016x %-7s %5u" % print("%016x %016x %016x %-7s %5u" %
(target_start, target_end, host_addr.cast(UINTPTR_T), (target_start, target_end, host_addr.cast(UINTPTR_T),
message, len(guest_phys_blocks))) message, len(guest_phys_blocks)))
return guest_phys_blocks return guest_phys_blocks
@ -311,8 +315,8 @@ shape and this command should mostly work."""
for block in self.guest_phys_blocks: for block in self.guest_phys_blocks:
cur = block["host_addr"] cur = block["host_addr"]
left = block["target_end"] - block["target_start"] left = block["target_end"] - block["target_start"]
print ("dumping range at %016x for length %016x" % print("dumping range at %016x for length %016x" %
(cur.cast(UINTPTR_T), left)) (cur.cast(UINTPTR_T), left))
while (left > 0): while (left > 0):
chunk_size = min(TARGET_PAGE_SIZE, left) chunk_size = min(TARGET_PAGE_SIZE, left)
chunk = qemu_core.read_memory(cur, chunk_size) chunk = qemu_core.read_memory(cur, chunk_size)