ia64/xen-unstable

changeset 12712:f6993ff5cf49

[XEN] Rename machine_shutdown to machine_reboot_kexec to better
reflect its purpose.

Signed-off-by: Ian Campbell <ian.campbell@xensource.com>
author Ian Campbell <ian.campbell@xensource.com>
date Thu Nov 30 18:44:54 2006 +0000 (2006-11-30)
parents d7f71de58c4b
children 5091a9a55d86
files xen/arch/ia64/xen/machine_kexec.c xen/arch/powerpc/machine_kexec.c xen/arch/x86/machine_kexec.c xen/common/kexec.c xen/include/xen/kexec.h
line diff
     1.1 --- a/xen/arch/ia64/xen/machine_kexec.c	Thu Nov 30 18:21:50 2006 +0000
     1.2 +++ b/xen/arch/ia64/xen/machine_kexec.c	Thu Nov 30 18:44:54 2006 +0000
     1.3 @@ -18,7 +18,7 @@ void machine_kexec(xen_kexec_image_t *im
     1.4      printk("STUB: " __FILE__ ": %s: not implemented\n", __FUNCTION__);
     1.5  }
     1.6  
     1.7 -void machine_shutdown(xen_kexec_image_t *image)
     1.8 +void machine_reboot_kexec(xen_kexec_image_t *image)
     1.9  {
    1.10      printk("STUB: " __FILE__ ": %s: not implemented\n", __FUNCTION__);
    1.11  }
     2.1 --- a/xen/arch/powerpc/machine_kexec.c	Thu Nov 30 18:21:50 2006 +0000
     2.2 +++ b/xen/arch/powerpc/machine_kexec.c	Thu Nov 30 18:44:54 2006 +0000
     2.3 @@ -18,7 +18,7 @@ void machine_kexec(xen_kexec_image_t *im
     2.4      printk("STUB: " __FILE__ ": %s: not implemented\n", __FUNCTION__);
     2.5  }
     2.6  
     2.7 -void machine_shutdown(xen_kexec_image_t *image)
     2.8 +void machine_reboot_kexec(xen_kexec_image_t *image)
     2.9  {
    2.10      printk("STUB: " __FILE__ ": %s: not implemented\n", __FUNCTION__);
    2.11  }
     3.1 --- a/xen/arch/x86/machine_kexec.c	Thu Nov 30 18:21:50 2006 +0000
     3.2 +++ b/xen/arch/x86/machine_kexec.c	Thu Nov 30 18:44:54 2006 +0000
     3.3 @@ -52,7 +52,7 @@ void machine_kexec_unload(int type, int 
     3.4  {
     3.5  }
     3.6  
     3.7 -static void __machine_shutdown(void *data)
     3.8 +static void __machine_reboot_kexec(void *data)
     3.9  {
    3.10      xen_kexec_image_t *image = (xen_kexec_image_t *)data;
    3.11  
    3.12 @@ -69,7 +69,7 @@ static void __machine_shutdown(void *dat
    3.13      machine_kexec(image);
    3.14  }
    3.15  
    3.16 -void machine_shutdown(xen_kexec_image_t *image)
    3.17 +void machine_reboot_kexec(xen_kexec_image_t *image)
    3.18  {
    3.19      int reboot_cpu_id;
    3.20      cpumask_t reboot_cpu;
    3.21 @@ -83,13 +83,13 @@ void machine_shutdown(xen_kexec_image_t 
    3.22      {
    3.23          cpus_clear(reboot_cpu);
    3.24          cpu_set(reboot_cpu_id, reboot_cpu);
    3.25 -        on_selected_cpus(reboot_cpu, __machine_shutdown, image, 1, 0);
    3.26 +        on_selected_cpus(reboot_cpu, __machine_reboot_kexec, image, 1, 0);
    3.27          for (;;)
    3.28                  ; /* nothing */
    3.29      }
    3.30      else
    3.31      {
    3.32 -        __machine_shutdown(image);
    3.33 +        __machine_reboot_kexec(image);
    3.34      }
    3.35      BUG();
    3.36  }
     4.1 --- a/xen/common/kexec.c	Thu Nov 30 18:21:50 2006 +0000
     4.2 +++ b/xen/common/kexec.c	Thu Nov 30 18:44:54 2006 +0000
     4.3 @@ -306,7 +306,7 @@ static int kexec_exec(XEN_GUEST_HANDLE(v
     4.4      case KEXEC_TYPE_DEFAULT:
     4.5          image = &kexec_image[base + pos];
     4.6          one_cpu_only();
     4.7 -        machine_shutdown(image); /* Does not return */
     4.8 +        machine_reboot_kexec(image); /* Does not return */
     4.9          break;
    4.10      case KEXEC_TYPE_CRASH:
    4.11          machine_crash_kexec(); /* Does not return */
     5.1 --- a/xen/include/xen/kexec.h	Thu Nov 30 18:21:50 2006 +0000
     5.2 +++ b/xen/include/xen/kexec.h	Thu Nov 30 18:44:54 2006 +0000
     5.3 @@ -12,6 +12,8 @@ typedef struct xen_kexec_reserve {
     5.4      unsigned long start;
     5.5  } xen_kexec_reserve_t;
     5.6  
     5.7 +extern xen_kexec_reserve_t kexec_crash_area;
     5.8 +
     5.9  /* We have space for 4 images to support atomic update
    5.10   * of images. This is important for CRASH images since
    5.11   * a panic can happen at any time...
    5.12 @@ -24,7 +26,7 @@ typedef struct xen_kexec_reserve {
    5.13  int machine_kexec_load(int type, int slot, xen_kexec_image_t *image);
    5.14  void machine_kexec_unload(int type, int slot, xen_kexec_image_t *image);
    5.15  void machine_kexec_reserved(xen_kexec_reserve_t *reservation);
    5.16 -void machine_shutdown(xen_kexec_image_t *image);
    5.17 +void machine_reboot_kexec(xen_kexec_image_t *image);
    5.18  void machine_crash_kexec(void);
    5.19  void machine_crash_save_cpu(void);
    5.20  crash_xen_info_t *machine_crash_save_info(void);