From nobody Thu Nov 6 16:24:23 2025 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 1489239125807983.3169757893525; Sat, 11 Mar 2017 05:32:05 -0800 (PST) Received: from localhost ([::1]:43431 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cmh7s-00009g-FM for importer@patchew.org; Sat, 11 Mar 2017 08:32:04 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58950) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cmh0K-0002jv-W3 for qemu-devel@nongnu.org; Sat, 11 Mar 2017 08:24:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cmh0J-0002mS-AT for qemu-devel@nongnu.org; Sat, 11 Mar 2017 08:24:17 -0500 Received: from mx1.redhat.com ([209.132.183.28]:54256) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cmh0J-0002mM-2B for qemu-devel@nongnu.org; Sat, 11 Mar 2017 08:24:15 -0500 Received: from smtp.corp.redhat.com (int-mx16.intmail.prod.int.phx2.redhat.com [10.5.11.28]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3EB0685542; Sat, 11 Mar 2017 13:24:15 +0000 (UTC) Received: from localhost (ovpn-116-13.phx2.redhat.com [10.3.116.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 42F442D655; Sat, 11 Mar 2017 13:24:13 +0000 (UTC) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Sat, 11 Mar 2017 17:22:54 +0400 Message-Id: <20170311132256.22951-20-marcandre.lureau@redhat.com> In-Reply-To: <20170311132256.22951-1-marcandre.lureau@redhat.com> References: <20170311132256.22951-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.74 on 10.5.11.28 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Sat, 11 Mar 2017 13:24:15 +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 19/21] kdump: write vmcoreinfo in header 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: mdroth@linux.vnet.ibm.com, armbru@redhat.com, anderson@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , pbonzini@redhat.com, lersek@redhat.com 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" Signed-off-by: Marc-Andr=C3=A9 Lureau --- dump.c | 48 ++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 44 insertions(+), 4 deletions(-) diff --git a/dump.c b/dump.c index 0ebfb5471a..bf88cb362b 100644 --- a/dump.c +++ b/dump.c @@ -785,8 +785,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); @@ -835,7 +836,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 @@ -845,6 +857,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; @@ -885,8 +905,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); @@ -935,7 +956,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 @@ -945,6 +977,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.12.0.191.gc5d8de91d