From owner-svn-src-head@freebsd.org Fri Jun 15 19:02:54 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6C4C91018AC7; Fri, 15 Jun 2018 19:02:54 +0000 (UTC) (envelope-from cem@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 239397E70B; Fri, 15 Jun 2018 19:02:54 +0000 (UTC) (envelope-from cem@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 064851B85C; Fri, 15 Jun 2018 19:02:54 +0000 (UTC) (envelope-from cem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5FJ2rQS095858; Fri, 15 Jun 2018 19:02:53 GMT (envelope-from cem@FreeBSD.org) Received: (from cem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5FJ2r1c095857; Fri, 15 Jun 2018 19:02:53 GMT (envelope-from cem@FreeBSD.org) Message-Id: <201806151902.w5FJ2r1c095857@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cem set sender to cem@FreeBSD.org using -f From: Conrad Meyer Date: Fri, 15 Jun 2018 19:02:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r335227 - head/sys/sys X-SVN-Group: head X-SVN-Commit-Author: cem X-SVN-Commit-Paths: head/sys/sys X-SVN-Commit-Revision: 335227 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Jun 2018 19:02:54 -0000 Author: cem Date: Fri Jun 15 19:02:53 2018 New Revision: 335227 URL: https://svnweb.freebsd.org/changeset/base/335227 Log: Retain offset compatibility with pre-12.0 dumps As a follow-up to r324965, which adds support for compressed kernel dumps, readjust dump header members slightly to mostly preserve ABI with earlier (11.x and older) dumps. Reviewed by: markj X-MFC-With: r324965 Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D15829 Modified: head/sys/sys/kerneldump.h Modified: head/sys/sys/kerneldump.h ============================================================================== --- head/sys/sys/kerneldump.h Fri Jun 15 18:55:02 2018 (r335226) +++ head/sys/sys/kerneldump.h Fri Jun 15 19:02:53 2018 (r335227) @@ -81,8 +81,8 @@ struct kerneldumpheader { #define KERNELDUMPMAGIC_CLEARED "Cleared Kernel Dump" char architecture[12]; uint32_t version; -#define KERNELDUMPVERSION 3 -#define KERNELDUMP_TEXT_VERSION 3 +#define KERNELDUMPVERSION 4 +#define KERNELDUMP_TEXT_VERSION 4 uint32_t architectureversion; #define KERNELDUMP_AARCH64_VERSION 1 #define KERNELDUMP_AMD64_VERSION 2 @@ -93,14 +93,15 @@ struct kerneldumpheader { #define KERNELDUMP_RISCV_VERSION 1 #define KERNELDUMP_SPARC64_VERSION 1 uint64_t dumplength; /* excl headers */ - uint64_t dumpextent; uint64_t dumptime; uint32_t dumpkeysize; uint32_t blocksize; - uint8_t compression; char hostname[64]; char versionstring[192]; - char panicstring[179]; + char panicstring[175]; + uint8_t compression; + uint64_t dumpextent; + char unused[4]; uint32_t parity; };