This commit is contained in:
committed by
Git OBS Bridge
parent
af3c23ccba
commit
2e40c9b50c
@@ -23,13 +23,13 @@ Signed-off-by: Gerd Hoffmann <kraxel@suse.de>
|
||||
tools/xcutils/xc_kexec.c | 503 +++++++++++++++
|
||||
19 files changed, 4988 insertions(+), 2 deletions(-)
|
||||
|
||||
Index: build-32-release304-12901/tools/xcutils/Makefile
|
||||
Index: xen-unstable/tools/xcutils/Makefile
|
||||
===================================================================
|
||||
--- build-32-release304-12901.orig/tools/xcutils/Makefile
|
||||
+++ build-32-release304-12901/tools/xcutils/Makefile
|
||||
--- xen-unstable.orig/tools/xcutils/Makefile
|
||||
+++ xen-unstable/tools/xcutils/Makefile
|
||||
@@ -15,14 +15,14 @@ PROGRAMS_INSTALL_DIR = /usr/$(LIBDIR)/xe
|
||||
|
||||
INCLUDES += -I $(XEN_LIBXC)
|
||||
INCLUDES += -I $(XEN_LIBXC) -I $(XEN_XENSTORE)
|
||||
|
||||
-CFLAGS += -Werror -fno-strict-aliasing
|
||||
+CFLAGS += -g -O0 -Werror -fno-strict-aliasing
|
||||
@@ -39,10 +39,10 @@ Index: build-32-release304-12901/tools/xcutils/Makefile
|
||||
CFLAGS += -Wp,-MD,.$(@F).d
|
||||
PROG_DEP = .*.d
|
||||
|
||||
-PROGRAMS = xc_restore xc_save readnotes
|
||||
-PROGRAMS = xc_restore xc_save readnotes
|
||||
+PROGRAMS = xc_restore xc_save readnotes xc_kexec
|
||||
|
||||
LDLIBS = -L$(XEN_LIBXC) -lxenguest -lxenctrl
|
||||
LDLIBS = -L$(XEN_LIBXC) -L$(XEN_XENSTORE) -lxenguest -lxenctrl -lxenstore
|
||||
|
||||
@@ -35,6 +35,11 @@ build: $(PROGRAMS)
|
||||
$(PROGRAMS): %: %.o
|
||||
@@ -63,10 +63,10 @@ Index: build-32-release304-12901/tools/xcutils/Makefile
|
||||
+ make -C helper clean
|
||||
|
||||
-include $(PROG_DEP)
|
||||
Index: build-32-release304-12901/tools/xcutils/helper/Makefile
|
||||
Index: xen-unstable/tools/xcutils/helper/Makefile
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ build-32-release304-12901/tools/xcutils/helper/Makefile
|
||||
+++ xen-unstable/tools/xcutils/helper/Makefile
|
||||
@@ -0,0 +1,39 @@
|
||||
+
|
||||
+XEN_ROOT = ../../..
|
||||
@@ -107,10 +107,10 @@ Index: build-32-release304-12901/tools/xcutils/helper/Makefile
|
||||
+# dependencies
|
||||
+
|
||||
+$(XEN_TARGET_ARCH)/entry.o: $(XEN_TARGET_ARCH)/entry.S $(XEN_TARGET_ARCH)/offsets.h
|
||||
Index: build-32-release304-12901/tools/xcutils/helper/console.c
|
||||
Index: xen-unstable/tools/xcutils/helper/console.c
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ build-32-release304-12901/tools/xcutils/helper/console.c
|
||||
+++ xen-unstable/tools/xcutils/helper/console.c
|
||||
@@ -0,0 +1,69 @@
|
||||
+#include <inttypes.h>
|
||||
+
|
||||
@@ -181,10 +181,10 @@ Index: build-32-release304-12901/tools/xcutils/helper/console.c
|
||||
+
|
||||
+ return printed_len;
|
||||
+}
|
||||
Index: build-32-release304-12901/tools/xcutils/helper/ctype.c
|
||||
Index: xen-unstable/tools/xcutils/helper/ctype.c
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ build-32-release304-12901/tools/xcutils/helper/ctype.c
|
||||
+++ xen-unstable/tools/xcutils/helper/ctype.c
|
||||
@@ -0,0 +1,35 @@
|
||||
+/*
|
||||
+ * linux/lib/ctype.c
|
||||
@@ -221,10 +221,10 @@ Index: build-32-release304-12901/tools/xcutils/helper/ctype.c
|
||||
+_L,_L,_L,_L,_L,_L,_L,_P,_L,_L,_L,_L,_L,_L,_L,_L}; /* 240-255 */
|
||||
+
|
||||
+EXPORT_SYMBOL(_ctype);
|
||||
Index: build-32-release304-12901/tools/xcutils/helper/ctype.h
|
||||
Index: xen-unstable/tools/xcutils/helper/ctype.h
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ build-32-release304-12901/tools/xcutils/helper/ctype.h
|
||||
+++ xen-unstable/tools/xcutils/helper/ctype.h
|
||||
@@ -0,0 +1,54 @@
|
||||
+#ifndef _LINUX_CTYPE_H
|
||||
+#define _LINUX_CTYPE_H
|
||||
@@ -280,10 +280,10 @@ Index: build-32-release304-12901/tools/xcutils/helper/ctype.h
|
||||
+#define toupper(c) __toupper(c)
|
||||
+
|
||||
+#endif
|
||||
Index: build-32-release304-12901/tools/xcutils/helper/helper.h
|
||||
Index: xen-unstable/tools/xcutils/helper/helper.h
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ build-32-release304-12901/tools/xcutils/helper/helper.h
|
||||
+++ xen-unstable/tools/xcutils/helper/helper.h
|
||||
@@ -0,0 +1,107 @@
|
||||
+#include <stdarg.h>
|
||||
+#include <stddef.h>
|
||||
@@ -392,10 +392,10 @@ Index: build-32-release304-12901/tools/xcutils/helper/helper.h
|
||||
+int sprintf(char * buf, const char *fmt, ...);
|
||||
+int vsscanf(const char * buf, const char * fmt, va_list args);
|
||||
+int sscanf(const char * buf, const char * fmt, ...);
|
||||
Index: build-32-release304-12901/tools/xcutils/helper/main.c
|
||||
Index: xen-unstable/tools/xcutils/helper/main.c
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ build-32-release304-12901/tools/xcutils/helper/main.c
|
||||
+++ xen-unstable/tools/xcutils/helper/main.c
|
||||
@@ -0,0 +1,651 @@
|
||||
+#include <xenctrl.h>
|
||||
+#include "hypercall.h"
|
||||
@@ -1048,10 +1048,10 @@ Index: build-32-release304-12901/tools/xcutils/helper/main.c
|
||||
+ printk("\r\n");
|
||||
+ start_kernel();
|
||||
+}
|
||||
Index: build-32-release304-12901/tools/xcutils/helper/make-offsets.c
|
||||
Index: xen-unstable/tools/xcutils/helper/make-offsets.c
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ build-32-release304-12901/tools/xcutils/helper/make-offsets.c
|
||||
+++ xen-unstable/tools/xcutils/helper/make-offsets.c
|
||||
@@ -0,0 +1,28 @@
|
||||
+#include <stdio.h>
|
||||
+#include <xenctrl.h>
|
||||
@@ -1081,10 +1081,10 @@ Index: build-32-release304-12901/tools/xcutils/helper/make-offsets.c
|
||||
+ vcpu_off("cr3", ctrlreg[3]);
|
||||
+ return 0;
|
||||
+}
|
||||
Index: build-32-release304-12901/tools/xcutils/helper/printk.c
|
||||
Index: xen-unstable/tools/xcutils/helper/printk.c
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ build-32-release304-12901/tools/xcutils/helper/printk.c
|
||||
+++ xen-unstable/tools/xcutils/helper/printk.c
|
||||
@@ -0,0 +1,1051 @@
|
||||
+/*
|
||||
+ * linux/kernel/printk.c
|
||||
@@ -2137,10 +2137,10 @@ Index: build-32-release304-12901/tools/xcutils/helper/printk.c
|
||||
+ printk_ratelimit_burst);
|
||||
+}
|
||||
+EXPORT_SYMBOL(printk_ratelimit);
|
||||
Index: build-32-release304-12901/tools/xcutils/helper/string.c
|
||||
Index: xen-unstable/tools/xcutils/helper/string.c
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ build-32-release304-12901/tools/xcutils/helper/string.c
|
||||
+++ xen-unstable/tools/xcutils/helper/string.c
|
||||
@@ -0,0 +1,601 @@
|
||||
+/*
|
||||
+ * linux/lib/string.c
|
||||
@@ -2743,10 +2743,10 @@ Index: build-32-release304-12901/tools/xcutils/helper/string.c
|
||||
+}
|
||||
+EXPORT_SYMBOL(memchr);
|
||||
+#endif
|
||||
Index: build-32-release304-12901/tools/xcutils/helper/vsprintf.c
|
||||
Index: xen-unstable/tools/xcutils/helper/vsprintf.c
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ build-32-release304-12901/tools/xcutils/helper/vsprintf.c
|
||||
+++ xen-unstable/tools/xcutils/helper/vsprintf.c
|
||||
@@ -0,0 +1,842 @@
|
||||
+/*
|
||||
+ * linux/lib/vsprintf.c
|
||||
@@ -3590,10 +3590,10 @@ Index: build-32-release304-12901/tools/xcutils/helper/vsprintf.c
|
||||
+}
|
||||
+
|
||||
+EXPORT_SYMBOL(sscanf);
|
||||
Index: build-32-release304-12901/tools/xcutils/helper/x86_32/div64.h
|
||||
Index: xen-unstable/tools/xcutils/helper/x86_32/div64.h
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ build-32-release304-12901/tools/xcutils/helper/x86_32/div64.h
|
||||
+++ xen-unstable/tools/xcutils/helper/x86_32/div64.h
|
||||
@@ -0,0 +1,48 @@
|
||||
+#ifndef __I386_DIV64
|
||||
+#define __I386_DIV64
|
||||
@@ -3643,10 +3643,10 @@ Index: build-32-release304-12901/tools/xcutils/helper/x86_32/div64.h
|
||||
+
|
||||
+}
|
||||
+#endif
|
||||
Index: build-32-release304-12901/tools/xcutils/helper/x86_32/entry.S
|
||||
Index: xen-unstable/tools/xcutils/helper/x86_32/entry.S
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ build-32-release304-12901/tools/xcutils/helper/x86_32/entry.S
|
||||
+++ xen-unstable/tools/xcutils/helper/x86_32/entry.S
|
||||
@@ -0,0 +1,49 @@
|
||||
+#include "offsets.h"
|
||||
+
|
||||
@@ -3697,10 +3697,10 @@ Index: build-32-release304-12901/tools/xcutils/helper/x86_32/entry.S
|
||||
+ nop
|
||||
+ .align 4096
|
||||
+hypercall_end:
|
||||
Index: build-32-release304-12901/tools/xcutils/helper/x86_32/hypercall.h
|
||||
Index: xen-unstable/tools/xcutils/helper/x86_32/hypercall.h
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ build-32-release304-12901/tools/xcutils/helper/x86_32/hypercall.h
|
||||
+++ xen-unstable/tools/xcutils/helper/x86_32/hypercall.h
|
||||
@@ -0,0 +1,360 @@
|
||||
+/******************************************************************************
|
||||
+ * hypercall.h
|
||||
@@ -4062,10 +4062,10 @@ Index: build-32-release304-12901/tools/xcutils/helper/x86_32/hypercall.h
|
||||
+
|
||||
+
|
||||
+#endif /* __HYPERCALL_H__ */
|
||||
Index: build-32-release304-12901/tools/xcutils/helper/x86_64/div64.h
|
||||
Index: xen-unstable/tools/xcutils/helper/x86_64/div64.h
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ build-32-release304-12901/tools/xcutils/helper/x86_64/div64.h
|
||||
+++ xen-unstable/tools/xcutils/helper/x86_64/div64.h
|
||||
@@ -0,0 +1,58 @@
|
||||
+#ifndef _ASM_GENERIC_DIV64_H
|
||||
+#define _ASM_GENERIC_DIV64_H
|
||||
@@ -4125,10 +4125,10 @@ Index: build-32-release304-12901/tools/xcutils/helper/x86_64/div64.h
|
||||
+#endif /* BITS_PER_LONG */
|
||||
+
|
||||
+#endif /* _ASM_GENERIC_DIV64_H */
|
||||
Index: build-32-release304-12901/tools/xcutils/helper/x86_64/entry.S
|
||||
Index: xen-unstable/tools/xcutils/helper/x86_64/entry.S
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ build-32-release304-12901/tools/xcutils/helper/x86_64/entry.S
|
||||
+++ xen-unstable/tools/xcutils/helper/x86_64/entry.S
|
||||
@@ -0,0 +1,50 @@
|
||||
+#include "offsets.h"
|
||||
+
|
||||
@@ -4180,10 +4180,10 @@ Index: build-32-release304-12901/tools/xcutils/helper/x86_64/entry.S
|
||||
+ nop
|
||||
+ .align 4096
|
||||
+hypercall_end:
|
||||
Index: build-32-release304-12901/tools/xcutils/helper/x86_64/hypercall.h
|
||||
Index: xen-unstable/tools/xcutils/helper/x86_64/hypercall.h
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ build-32-release304-12901/tools/xcutils/helper/x86_64/hypercall.h
|
||||
+++ xen-unstable/tools/xcutils/helper/x86_64/hypercall.h
|
||||
@@ -0,0 +1,355 @@
|
||||
+/******************************************************************************
|
||||
+ * hypercall.h
|
||||
@@ -4540,10 +4540,10 @@ Index: build-32-release304-12901/tools/xcutils/helper/x86_64/hypercall.h
|
||||
+}
|
||||
+
|
||||
+#endif /* __HYPERCALL_H__ */
|
||||
Index: build-32-release304-12901/tools/xcutils/kexec-syscall.h
|
||||
Index: xen-unstable/tools/xcutils/kexec-syscall.h
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ build-32-release304-12901/tools/xcutils/kexec-syscall.h
|
||||
+++ xen-unstable/tools/xcutils/kexec-syscall.h
|
||||
@@ -0,0 +1,80 @@
|
||||
+#ifndef KEXEC_SYSCALL_H
|
||||
+#define KEXEC_SYSCALL_H
|
||||
@@ -4625,10 +4625,10 @@ Index: build-32-release304-12901/tools/xcutils/kexec-syscall.h
|
||||
+#define KEXEC_MAX_SEGMENTS 16
|
||||
+
|
||||
+#endif /* KEXEC_SYSCALL_H */
|
||||
Index: build-32-release304-12901/tools/xcutils/xc_kexec.c
|
||||
Index: xen-unstable/tools/xcutils/xc_kexec.c
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ build-32-release304-12901/tools/xcutils/xc_kexec.c
|
||||
+++ xen-unstable/tools/xcutils/xc_kexec.c
|
||||
@@ -0,0 +1,503 @@
|
||||
+#include <stdio.h>
|
||||
+#include <stdlib.h>
|
||||
|
Reference in New Issue
Block a user