socsvn commit: r289884 - soc2013/def/crashdump-head/sys/ddb
def at FreeBSD.org
def at FreeBSD.org
Tue Aug 18 15:39:26 UTC 2015
Author: def
Date: Tue Aug 18 15:39:25 2015
New Revision: 289884
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=289884
Log:
Use TEXTDUMP_BLOCKSIZE macro. Set kernel dump key size to zero.
Modified:
soc2013/def/crashdump-head/sys/ddb/db_textdump.c
Modified: soc2013/def/crashdump-head/sys/ddb/db_textdump.c
==============================================================================
--- soc2013/def/crashdump-head/sys/ddb/db_textdump.c Tue Aug 18 15:26:09 2015 (r289883)
+++ soc2013/def/crashdump-head/sys/ddb/db_textdump.c Tue Aug 18 15:39:25 2015 (r289884)
@@ -113,7 +113,7 @@
* Various size assertions -- pretty much everything must be one block in
* size.
*/
-CTASSERT(sizeof(struct kerneldumpheader) == 512);
+CTASSERT(sizeof(struct kerneldumpheader) == TEXTDUMP_BLOCKSIZE);
CTASSERT(sizeof(struct ustar_header) == TEXTDUMP_BLOCKSIZE);
/*
@@ -463,8 +463,8 @@
*/
textdump_offset = di->mediasize - sizeof(kdh);
textdump_saveoff(&trailer_offset);
- mkdumpheader(&kdh, TEXTDUMPMAGIC, KERNELDUMP_TEXT_VERSION, 0,
- kerneldumpkey_size(di->kdk), TEXTDUMP_BLOCKSIZE);
+ mkdumpheader(&kdh, TEXTDUMPMAGIC, KERNELDUMP_TEXT_VERSION, 0, 0,
+ TEXTDUMP_BLOCKSIZE);
(void)textdump_writenextblock(di, (char *)&kdh);
/*
@@ -489,8 +489,8 @@
* size.
*/
dumplen = trailer_offset - (textdump_offset + TEXTDUMP_BLOCKSIZE);
- mkdumpheader(&kdh, TEXTDUMPMAGIC, KERNELDUMP_TEXT_VERSION, dumplen,
- kerneldumpkey_size(di->kdk), TEXTDUMP_BLOCKSIZE);
+ mkdumpheader(&kdh, TEXTDUMPMAGIC, KERNELDUMP_TEXT_VERSION, dumplen, 0,
+ TEXTDUMP_BLOCKSIZE);
(void)textdump_writenextblock(di, (char *)&kdh);
textdump_restoreoff(trailer_offset);
(void)textdump_writenextblock(di, (char *)&kdh);
More information about the svn-soc-all
mailing list