socsvn commit: r254761 - in soc2013/def/crashdump-head: sbin/savecore sys/sys

def at FreeBSD.org def at FreeBSD.org
Sat Jul 13 18:02:07 UTC 2013


Author: def
Date: Sat Jul 13 18:02:07 2013
New Revision: 254761
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=254761

Log:
  Fix savecore's Makefile. Change savecore to display sizes of a key and a tweak. Don't compile savecore with the key and the tweak.

Modified:
  soc2013/def/crashdump-head/sbin/savecore/Makefile
  soc2013/def/crashdump-head/sbin/savecore/savecore.c
  soc2013/def/crashdump-head/sys/sys/kerneldump.h

Modified: soc2013/def/crashdump-head/sbin/savecore/Makefile
==============================================================================
--- soc2013/def/crashdump-head/sbin/savecore/Makefile	Sat Jul 13 17:48:29 2013	(r254760)
+++ soc2013/def/crashdump-head/sbin/savecore/Makefile	Sat Jul 13 18:02:07 2013	(r254761)
@@ -4,6 +4,5 @@
 DPADD=	${LIBZ}
 LDADD=	-lz
 MAN=	savecore.8
-CFLAGS+=-I/home/def/soc13/vm/usr/include
 
 .include <bsd.prog.mk>

Modified: soc2013/def/crashdump-head/sbin/savecore/savecore.c
==============================================================================
--- soc2013/def/crashdump-head/sbin/savecore/savecore.c	Sat Jul 13 17:48:29 2013	(r254760)
+++ soc2013/def/crashdump-head/sbin/savecore/savecore.c	Sat Jul 13 18:02:07 2013	(r254761)
@@ -121,7 +121,8 @@
 	fprintf(f, "  Panic String: %s\n", h->panicstring);
 	fprintf(f, "  Dump Parity: %u\n", h->parity);
 	fprintf(f, "  Bounds: %d\n", bounds);
-	fprintf(f, "  Key length: %d bits\n", h->keyLen);
+	fprintf(f, "  Key length: %d bits\n", h->keysize << 3);
+	fprintf(f, "  Tweak length: %d bits\n", h->tweaksize << 3);
 
 	switch(status) {
 	case STATUS_BAD:

Modified: soc2013/def/crashdump-head/sys/sys/kerneldump.h
==============================================================================
--- soc2013/def/crashdump-head/sys/sys/kerneldump.h	Sat Jul 13 17:48:29 2013	(r254760)
+++ soc2013/def/crashdump-head/sys/sys/kerneldump.h	Sat Jul 13 18:02:07 2013	(r254761)
@@ -91,17 +91,6 @@
 };
 
 /*
- * Constant key for kernel crash dumps.
- */
-static const char kerneldumpkey[32] = {
-	0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0x41,
-	0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0x41,
-	0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0x41
-};
-
-static char kerneldumptweak[KERNELDUMP_TWEAK_SIZE];
-
-/*
  * Parity calculation is endian insensitive.
  */
 static __inline u_int32_t
@@ -118,6 +107,17 @@
 }
 
 #ifdef _KERNEL
+/*
+ * Constant key for kernel crash dumps.
+ */
+static const char kerneldumpkey[32] = {
+	0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0x41,
+	0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0x41,
+	0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0x41
+};
+
+static char kerneldumptweak[KERNELDUMP_TWEAK_SIZE];
+
 void kerneldump_crypto_init(struct dumperinfo *di);
 
 void mkdumpheader(struct kerneldumpheader *kdh, char *magic, uint32_t archver,


More information about the svn-soc-all mailing list