[src/trunk]: src/sys/arch Also use ACPI shutdown on Xen DOM0

[khorben <khorben%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3f75f751a7cd
branches:  trunk
changeset: 337696:3f75f751a7cd
user:      khorben <khorben%NetBSD.org@localhost>
date:      Fri Apr 24 00:04:04 2015 +0000

description:
Also use ACPI shutdown on Xen DOM0

No objection on port-xen@
ok gdt@

diffstat:

 sys/arch/amd64/amd64/machdep.c |   7 +++----
 sys/arch/i386/i386/machdep.c   |  12 ++++++------
 2 files changed, 9 insertions(+), 10 deletions(-)

diffs (74 lines):

diff -r 30467a43c56b -r 3f75f751a7cd sys/arch/amd64/amd64/machdep.c
--- a/sys/arch/amd64/amd64/machdep.c    Thu Apr 23 23:31:23 2015 +0000
+++ b/sys/arch/amd64/amd64/machdep.c    Fri Apr 24 00:04:04 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.211 2014/05/12 22:50:03 uebayasi Exp $   */
+/*     $NetBSD: machdep.c,v 1.212 2015/04/24 00:04:04 khorben Exp $    */
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2000, 2006, 2007, 2008, 2011
@@ -111,7 +111,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.211 2014/05/12 22:50:03 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.212 2015/04/24 00:04:04 khorben Exp $");
 
 /* #define XENDEBUG_LOW  */
 
@@ -674,14 +674,13 @@
        doshutdownhooks();
 
         if ((howto & RB_POWERDOWN) == RB_POWERDOWN) {
-#ifndef XEN
 #if NACPICA > 0
                if (s != IPL_NONE)
                        splx(s);
 
                acpi_enter_sleep_state(ACPI_STATE_S5);
 #endif
-#else /* XEN */
+#ifdef XEN
                HYPERVISOR_shutdown();
 #endif /* XEN */
        }
diff -r 30467a43c56b -r 3f75f751a7cd sys/arch/i386/i386/machdep.c
--- a/sys/arch/i386/i386/machdep.c      Thu Apr 23 23:31:23 2015 +0000
+++ b/sys/arch/i386/i386/machdep.c      Fri Apr 24 00:04:04 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.753 2015/01/23 02:52:14 christos Exp $   */
+/*     $NetBSD: machdep.c,v 1.754 2015/04/24 00:04:04 khorben Exp $    */
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2000, 2004, 2006, 2008, 2009
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.753 2015/01/23 02:52:14 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.754 2015/04/24 00:04:04 khorben Exp $");
 
 #include "opt_beep.h"
 #include "opt_compat_ibcs2.h"
@@ -760,10 +760,6 @@
        doshutdownhooks();
 
        if ((howto & RB_POWERDOWN) == RB_POWERDOWN) {
-#ifdef XEN
-               HYPERVISOR_shutdown();
-               for (;;);
-#endif
 #if NACPICA > 0
                if (s != IPL_NONE)
                        splx(s);
@@ -772,6 +768,10 @@
 #else
                __USE(s);
 #endif
+#ifdef XEN
+               HYPERVISOR_shutdown();
+               for (;;);
+#endif
        }
 
 #ifdef MULTIPROCESSOR