From patchwork Mon Mar 7 09:17:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fam Zheng X-Patchwork-Id: 8516491 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id CF7C3C0553 for ; Mon, 7 Mar 2016 09:18:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 44F0920125 for ; Mon, 7 Mar 2016 09:18:15 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 90D8C200E9 for ; Mon, 7 Mar 2016 09:18:14 +0000 (UTC) Received: from localhost ([::1]:54573 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1acrIr-0004LT-Ul for patchwork-qemu-devel@patchwork.kernel.org; Mon, 07 Mar 2016 04:18:13 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52942) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1acrIh-0004Ko-Q8 for qemu-devel@nongnu.org; Mon, 07 Mar 2016 04:18:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1acrIc-0007g6-NU for qemu-devel@nongnu.org; Mon, 07 Mar 2016 04:18:03 -0500 Received: from mx1.redhat.com ([209.132.183.28]:33323) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1acrIc-0007g1-Id for qemu-devel@nongnu.org; Mon, 07 Mar 2016 04:17:58 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id 37359BBF76; Mon, 7 Mar 2016 09:17:58 +0000 (UTC) Received: from fam-t430.nay.redhat.com ([10.66.14.255]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u279Hqj1001195; Mon, 7 Mar 2016 04:17:54 -0500 From: Fam Zheng To: qemu-devel@nongnu.org Date: Mon, 7 Mar 2016 17:17:51 +0800 Message-Id: <1457342271-13410-1-git-send-email-famz@redhat.com> In-Reply-To: <1456813104-25902-5-git-send-email-famz@redhat.com> References: <1456813104-25902-5-git-send-email-famz@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Paolo Bonzini , Gonglei , Laszlo Ersek , Peter Xu , Janosch Frank Subject: [Qemu-devel] [PATCH] scripts: Fix dump-guest-memory.py for MemoryRegion.ram_block removal X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Fam Zheng Acked-by: Laszlo Ersek --- 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():