| From 58efb548d48964d4ff7bdcebdb97ec10e708e5ed Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com> |
| Date: Wed, 13 Dec 2017 13:39:06 +0100 |
| Subject: [PATCH 35/41] scripts/dump-guest-memory.py: Improve python 3 |
| compatibility |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| RH-Author: Marc-André Lureau <marcandre.lureau@redhat.com> |
| Message-id: <20171213133912.26176-36-marcandre.lureau@redhat.com> |
| Patchwork-id: 78385 |
| O-Subject: [RHEL-7.5 qemu-kvm PATCH v3 35/41] scripts/dump-guest-memory.py: Improve python 3 compatibility |
| Bugzilla: 1411490 |
| RH-Acked-by: Laszlo Ersek <lersek@redhat.com> |
| RH-Acked-by: Michael S. Tsirkin <mst@redhat.com> |
| RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com> |
| |
| From: Janosch Frank <frankja@linux.vnet.ibm.com> |
| |
| 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> |
| |
| (cherry picked from commit 7cb1089d5fbd7b2d9497f111ce948edef41df32d) |
| Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> |
| Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com> |
| |
| scripts/dump-guest-memory.py | 26 +++++++++++++++----------- |
| 1 file changed, 15 insertions(+), 11 deletions(-) |
| |
| diff --git a/scripts/dump-guest-memory.py b/scripts/dump-guest-memory.py |
| index 7d93d86..d44de99 100644 |
| |
| |
| @@ -98,15 +98,19 @@ def memory_region_get_ram_ptr(mr): |
| |
| def get_guest_phys_blocks(): |
| guest_phys_blocks = [] |
| - print "guest RAM blocks:" |
| - print ("target_start target_end host_addr message " |
| - "count") |
| - print ("---------------- ---------------- ---------------- ------- " |
| - "-----") |
| + print("guest RAM blocks:") |
| + print("target_start target_end host_addr message " |
| + "count") |
| + print("---------------- ---------------- ---------------- ------- " |
| + "-----") |
| |
| current_map_p = gdb.parse_and_eval("address_space_memory.current_map") |
| 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() |
| mr = flat_range["mr"].dereference() |
| |
| @@ -149,9 +153,9 @@ def get_guest_phys_blocks(): |
| predecessor["target_end"] = target_end |
| message = "joined" |
| |
| - print ("%016x %016x %016x %-7s %5u" % |
| - (target_start, target_end, host_addr.cast(UINTPTR_T), |
| - message, len(guest_phys_blocks))) |
| + print("%016x %016x %016x %-7s %5u" % |
| + (target_start, target_end, host_addr.cast(UINTPTR_T), |
| + message, len(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: |
| cur = block["host_addr"] |
| left = block["target_end"] - block["target_start"] |
| - print ("dumping range at %016x for length %016x" % |
| - (cur.cast(UINTPTR_T), left)) |
| + print("dumping range at %016x for length %016x" % |
| + (cur.cast(UINTPTR_T), left)) |
| while (left > 0): |
| chunk_size = min(TARGET_PAGE_SIZE, left) |
| chunk = qemu_core.read_memory(cur, chunk_size) |
| -- |
| 1.8.3.1 |
| |