From nobody Mon Feb 9 20:12:58 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1496322670774595.4967348159358; Thu, 1 Jun 2017 06:11:10 -0700 (PDT) Received: from localhost ([::1]:44301 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dGPsZ-0003eD-Lb for importer@patchew.org; Thu, 01 Jun 2017 09:11:07 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38433) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dGPle-0006Al-Qy for qemu-devel@nongnu.org; Thu, 01 Jun 2017 09:04:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dGPlc-0004Hq-Q3 for qemu-devel@nongnu.org; Thu, 01 Jun 2017 09:03:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36474) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dGPlc-0004Hi-I8 for qemu-devel@nongnu.org; Thu, 01 Jun 2017 09:03:56 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9179419C655; Thu, 1 Jun 2017 13:03:55 +0000 (UTC) Received: from localhost (ovpn-112-37.ams2.redhat.com [10.36.112.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7D7CF53C23; Thu, 1 Jun 2017 13:03:52 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 9179419C655 Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=marcandre.lureau@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 9179419C655 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Thu, 1 Jun 2017 17:03:24 +0400 Message-Id: <20170601130325.6433-4-marcandre.lureau@redhat.com> In-Reply-To: <20170601130325.6433-1-marcandre.lureau@redhat.com> References: <20170601130325.6433-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Thu, 01 Jun 2017 13:03:55 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 3/4] kdump: add vmcoreinfo X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: anderson@redhat.com, qiaonuohan@cn.fujitsu.com, lersek@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" kdump header provides offset and size of the vmcoreinfo note, append it if available. Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Andrew Jones --- dump.c | 48 ++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 44 insertions(+), 4 deletions(-) diff --git a/dump.c b/dump.c index 6911ffad8b..ba7676a514 100644 --- a/dump.c +++ b/dump.c @@ -791,8 +791,9 @@ static void create_header32(DumpState *s, Error **errp) uint32_t sub_hdr_size; uint32_t bitmap_blocks; uint32_t status =3D 0; - uint64_t offset_note; + uint64_t offset_note, offset_vmcoreinfo, size_vmcoreinfo =3D 0; Error *local_err =3D NULL; + uint8_t *vmcoreinfo =3D NULL; =20 /* write common header, the version of kdump-compressed format is 6th = */ size =3D sizeof(DiskDumpHeader32); @@ -841,7 +842,18 @@ static void create_header32(DumpState *s, Error **errp) kh->phys_base =3D cpu_to_dump32(s, s->dump_info.phys_base); kh->dump_level =3D cpu_to_dump32(s, DUMP_LEVEL); =20 - offset_note =3D DISKDUMP_HEADER_BLOCKS * block_size + size; + offset_vmcoreinfo =3D DISKDUMP_HEADER_BLOCKS * block_size + size; + if (s->vmcoreinfo) { + uint64_t hsize, name_size; + + get_note_sizes(s, s->vmcoreinfo, &hsize, &name_size, &size_vmcorei= nfo); + vmcoreinfo =3D + s->vmcoreinfo + ((hsize + 3) / 4 + (name_size + 3) / 4) * 4; + kh->offset_vmcoreinfo =3D cpu_to_dump64(s, offset_vmcoreinfo); + kh->size_vmcoreinfo =3D cpu_to_dump32(s, size_vmcoreinfo); + } + + offset_note =3D offset_vmcoreinfo + size_vmcoreinfo; kh->offset_note =3D cpu_to_dump64(s, offset_note); kh->note_size =3D cpu_to_dump32(s, s->note_size); =20 @@ -851,6 +863,14 @@ static void create_header32(DumpState *s, Error **errp) goto out; } =20 + if (vmcoreinfo) { + if (write_buffer(s->fd, offset_vmcoreinfo, vmcoreinfo, + size_vmcoreinfo) < 0) { + error_setg(errp, "dump: failed to vmcoreinfo"); + goto out; + } + } + /* write note */ s->note_buf =3D g_malloc0(s->note_size); s->note_buf_offset =3D 0; @@ -891,8 +911,9 @@ static void create_header64(DumpState *s, Error **errp) uint32_t sub_hdr_size; uint32_t bitmap_blocks; uint32_t status =3D 0; - uint64_t offset_note; + uint64_t offset_note, offset_vmcoreinfo, size_vmcoreinfo =3D 0; Error *local_err =3D NULL; + uint8_t *vmcoreinfo =3D NULL; =20 /* write common header, the version of kdump-compressed format is 6th = */ size =3D sizeof(DiskDumpHeader64); @@ -941,7 +962,18 @@ static void create_header64(DumpState *s, Error **errp) kh->phys_base =3D cpu_to_dump64(s, s->dump_info.phys_base); kh->dump_level =3D cpu_to_dump32(s, DUMP_LEVEL); =20 - offset_note =3D DISKDUMP_HEADER_BLOCKS * block_size + size; + offset_vmcoreinfo =3D DISKDUMP_HEADER_BLOCKS * block_size + size; + if (s->vmcoreinfo) { + uint64_t hsize, name_size; + + get_note_sizes(s, s->vmcoreinfo, &hsize, &name_size, &size_vmcorei= nfo); + vmcoreinfo =3D + s->vmcoreinfo + ((hsize + 3) / 4 + (name_size + 3) / 4) * 4; + kh->offset_vmcoreinfo =3D cpu_to_dump64(s, offset_vmcoreinfo); + kh->size_vmcoreinfo =3D cpu_to_dump64(s, size_vmcoreinfo); + } + + offset_note =3D offset_vmcoreinfo + size_vmcoreinfo; kh->offset_note =3D cpu_to_dump64(s, offset_note); kh->note_size =3D cpu_to_dump64(s, s->note_size); =20 @@ -951,6 +983,14 @@ static void create_header64(DumpState *s, Error **errp) goto out; } =20 + if (vmcoreinfo) { + if (write_buffer(s->fd, offset_vmcoreinfo, vmcoreinfo, + size_vmcoreinfo) < 0) { + error_setg(errp, "dump: failed to vmcoreinfo"); + goto out; + } + } + /* write note */ s->note_buf =3D g_malloc0(s->note_size); s->note_buf_offset =3D 0; --=20 2.13.0.91.g00982b8dd