# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxxxxx>
# Node ID f6993ff5cf49c2e98890ee86a233b95353bee461
# Parent d7f71de58c4b484820c49f45ed40fd577c3368d6
[XEN] Rename machine_shutdown to machine_reboot_kexec to better
reflect its purpose.
Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxxxxx>
---
xen/arch/ia64/xen/machine_kexec.c | 2 +-
xen/arch/powerpc/machine_kexec.c | 2 +-
xen/arch/x86/machine_kexec.c | 8 ++++----
xen/common/kexec.c | 2 +-
xen/include/xen/kexec.h | 4 +++-
5 files changed, 10 insertions(+), 8 deletions(-)
diff -r d7f71de58c4b -r f6993ff5cf49 xen/arch/ia64/xen/machine_kexec.c
--- a/xen/arch/ia64/xen/machine_kexec.c Thu Nov 30 18:21:50 2006 +0000
+++ b/xen/arch/ia64/xen/machine_kexec.c Thu Nov 30 18:44:54 2006 +0000
@@ -18,7 +18,7 @@ void machine_kexec(xen_kexec_image_t *im
printk("STUB: " __FILE__ ": %s: not implemented\n", __FUNCTION__);
}
-void machine_shutdown(xen_kexec_image_t *image)
+void machine_reboot_kexec(xen_kexec_image_t *image)
{
printk("STUB: " __FILE__ ": %s: not implemented\n", __FUNCTION__);
}
diff -r d7f71de58c4b -r f6993ff5cf49 xen/arch/powerpc/machine_kexec.c
--- a/xen/arch/powerpc/machine_kexec.c Thu Nov 30 18:21:50 2006 +0000
+++ b/xen/arch/powerpc/machine_kexec.c Thu Nov 30 18:44:54 2006 +0000
@@ -18,7 +18,7 @@ void machine_kexec(xen_kexec_image_t *im
printk("STUB: " __FILE__ ": %s: not implemented\n", __FUNCTION__);
}
-void machine_shutdown(xen_kexec_image_t *image)
+void machine_reboot_kexec(xen_kexec_image_t *image)
{
printk("STUB: " __FILE__ ": %s: not implemented\n", __FUNCTION__);
}
diff -r d7f71de58c4b -r f6993ff5cf49 xen/arch/x86/machine_kexec.c
--- a/xen/arch/x86/machine_kexec.c Thu Nov 30 18:21:50 2006 +0000
+++ b/xen/arch/x86/machine_kexec.c Thu Nov 30 18:44:54 2006 +0000
@@ -52,7 +52,7 @@ void machine_kexec_unload(int type, int
{
}
-static void __machine_shutdown(void *data)
+static void __machine_reboot_kexec(void *data)
{
xen_kexec_image_t *image = (xen_kexec_image_t *)data;
@@ -69,7 +69,7 @@ static void __machine_shutdown(void *dat
machine_kexec(image);
}
-void machine_shutdown(xen_kexec_image_t *image)
+void machine_reboot_kexec(xen_kexec_image_t *image)
{
int reboot_cpu_id;
cpumask_t reboot_cpu;
@@ -83,13 +83,13 @@ void machine_shutdown(xen_kexec_image_t
{
cpus_clear(reboot_cpu);
cpu_set(reboot_cpu_id, reboot_cpu);
- on_selected_cpus(reboot_cpu, __machine_shutdown, image, 1, 0);
+ on_selected_cpus(reboot_cpu, __machine_reboot_kexec, image, 1, 0);
for (;;)
; /* nothing */
}
else
{
- __machine_shutdown(image);
+ __machine_reboot_kexec(image);
}
BUG();
}
diff -r d7f71de58c4b -r f6993ff5cf49 xen/common/kexec.c
--- a/xen/common/kexec.c Thu Nov 30 18:21:50 2006 +0000
+++ b/xen/common/kexec.c Thu Nov 30 18:44:54 2006 +0000
@@ -306,7 +306,7 @@ static int kexec_exec(XEN_GUEST_HANDLE(v
case KEXEC_TYPE_DEFAULT:
image = &kexec_image[base + pos];
one_cpu_only();
- machine_shutdown(image); /* Does not return */
+ machine_reboot_kexec(image); /* Does not return */
break;
case KEXEC_TYPE_CRASH:
machine_crash_kexec(); /* Does not return */
diff -r d7f71de58c4b -r f6993ff5cf49 xen/include/xen/kexec.h
--- a/xen/include/xen/kexec.h Thu Nov 30 18:21:50 2006 +0000
+++ b/xen/include/xen/kexec.h Thu Nov 30 18:44:54 2006 +0000
@@ -12,6 +12,8 @@ typedef struct xen_kexec_reserve {
unsigned long start;
} xen_kexec_reserve_t;
+extern xen_kexec_reserve_t kexec_crash_area;
+
/* We have space for 4 images to support atomic update
* of images. This is important for CRASH images since
* a panic can happen at any time...
@@ -24,7 +26,7 @@ int machine_kexec_load(int type, int slo
int machine_kexec_load(int type, int slot, xen_kexec_image_t *image);
void machine_kexec_unload(int type, int slot, xen_kexec_image_t *image);
void machine_kexec_reserved(xen_kexec_reserve_t *reservation);
-void machine_shutdown(xen_kexec_image_t *image);
+void machine_reboot_kexec(xen_kexec_image_t *image);
void machine_crash_kexec(void);
void machine_crash_save_cpu(void);
crash_xen_info_t *machine_crash_save_info(void);
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home