From nobody Wed May 7 04:13:39 2025
Delivered-To: importer@patchew.org
Received-SPF: temperror (zoho.com: Error in retrieving data from DNS)
client-ip=208.118.235.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Authentication-Results: mx.zohomail.com;
spf=temperror (zoho.com: Error in retrieving data from DNS)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=fail(p=none dis=none) header.from=linaro.org
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by
mx.zohomail.com
with SMTPS id 1521484592701690.4752991069988;
Mon, 19 Mar 2018 11:36:32 -0700 (PDT)
Received: from localhost ([::1]:43365 helo=lists.gnu.org)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from <qemu-devel-bounces+importer=patchew.org@nongnu.org>)
id 1exze2-0003bX-IV
for importer@patchew.org; Mon, 19 Mar 2018 14:36:30 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:49687)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from <pm215@archaic.org.uk>) id 1exzbx-0002JX-Ou
for qemu-devel@nongnu.org; Mon, 19 Mar 2018 14:34:22 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from <pm215@archaic.org.uk>) id 1exzbw-0007dp-TV
for qemu-devel@nongnu.org; Mon, 19 Mar 2018 14:34:21 -0400
Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:40454)
by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)
(Exim 4.71) (envelope-from <pm215@archaic.org.uk>)
id 1exzbw-0007bM-LP
for qemu-devel@nongnu.org; Mon, 19 Mar 2018 14:34:20 -0400
Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89)
(envelope-from <pm215@archaic.org.uk>) id 1exzbu-0002zP-Sz
for qemu-devel@nongnu.org; Mon, 19 Mar 2018 18:34:18 +0000
From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-devel@nongnu.org
Date: Mon, 19 Mar 2018 18:34:04 +0000
Message-Id: <20180319183415.1976-3-peter.maydell@linaro.org>
X-Mailer: git-send-email 2.16.2
In-Reply-To: <20180319183415.1976-1-peter.maydell@linaro.org>
References: <20180319183415.1976-1-peter.maydell@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: Genre and OS details not
recognized.
X-Received-From: 2001:8b0:1d0::2
Subject: [Qemu-devel] [PULL 02/13] dump: Update correct kdump phys_base
field for AArch64
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+importer=patchew.org@nongnu.org>
X-ZohoMail: RSF_6 Z_629925259 SPT_0
From: Wei Huang <wei@redhat.com>
For guest kernel that supports KASLR, the load address can change every
time when guest VM runs. To find the physical base address correctly,
current QEMU dump searches VMCOREINFO for the string "NUMBER(phys_base)=3D".
However this string pattern is only available on x86_64. AArch64 uses a
different field, called "NUMBER(PHYS_OFFSET)=3D". This patch makes sure
QEMU dump uses the correct string on AArch64.
Signed-off-by: Wei Huang <wei@redhat.com>
Reviewed-by: Marc-Andr=C3=A9 Lureau <marcandre.lureau@redhat.com>
Message-id: 1520615003-20869-1-git-send-email-wei@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
dump.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/dump.c b/dump.c
index 097e60b2b3..6bdb0dbe23 100644
--- a/dump.c
+++ b/dump.c
@@ -1609,10 +1609,18 @@ static void vmcoreinfo_update_phys_base(DumpState *=
s)
=20
lines =3D g_strsplit((char *)vmci, "\n", -1);
for (i =3D 0; lines[i]; i++) {
- if (g_str_has_prefix(lines[i], "NUMBER(phys_base)=3D")) {
- if (qemu_strtou64(lines[i] + 18, NULL, 16,
+ const char *prefix =3D NULL;
+
+ if (s->dump_info.d_machine =3D=3D EM_X86_64) {
+ prefix =3D "NUMBER(phys_base)=3D";
+ } else if (s->dump_info.d_machine =3D=3D EM_AARCH64) {
+ prefix =3D "NUMBER(PHYS_OFFSET)=3D";
+ }
+
+ if (prefix && g_str_has_prefix(lines[i], prefix)) {
+ if (qemu_strtou64(lines[i] + strlen(prefix), NULL, 16,
&phys_base) < 0) {
- warn_report("Failed to read NUMBER(phys_base)=3D");
+ warn_report("Failed to read %s", prefix);
} else {
s->dump_info.phys_base =3D phys_base;
}
--=20
2.16.2