[Xen-changelog] [linux-2.6.18-xen] Move xen-pm options from dom0 cmdline option to start info.

["Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1217241816 -3600
# Node ID 2f1355579c9cd91b237a0851efd3d7f379a6af4c
# Parent  e39575a1d8af24edb65bf84f2112de701ea6b1b4
Move xen-pm options from dom0 cmdline option to start info.

Thus to avoid xen-pm being manually enforced by end user in dom0
cmdline but without enabling them in xen.

Signed-off-by: Wei Gang <gang.wei@xxxxxxxxx>
---
 arch/i386/kernel/acpi/processor_extcntl_xen.c |    9 ++-------
 include/xen/interface/xen.h                   |    1 +
 2 files changed, 3 insertions(+), 7 deletions(-)

diff -r e39575a1d8af -r 2f1355579c9c 
arch/i386/kernel/acpi/processor_extcntl_xen.c
--- a/arch/i386/kernel/acpi/processor_extcntl_xen.c     Mon Jul 28 11:26:33 
2008 +0100
+++ b/arch/i386/kernel/acpi/processor_extcntl_xen.c     Mon Jul 28 11:43:36 
2008 +0100
@@ -33,13 +33,6 @@
 #include <asm/hypercall.h>
 
 static int xen_processor_pmbits;
-static int __init set_xen_processor_pmbits(char *str)
-{
-       get_option(&str, &xen_processor_pmbits);
-
-       return 1;
-}
-__setup("xen_processor_pmbits=", set_xen_processor_pmbits);
 
 static int xen_cx_notifier(struct acpi_processor *pr, int action)
 {
@@ -222,6 +215,8 @@ static struct processor_extcntl_ops xen_
 
 void arch_acpi_processor_init_extcntl(const struct processor_extcntl_ops **ops)
 {
+       xen_processor_pmbits = (xen_start_info->flags & SIF_PM_MASK) >> 8;
+
        if (xen_processor_pmbits & XEN_PROCESSOR_PM_CX)
                xen_extcntl_ops.pm_ops[PM_TYPE_IDLE] = xen_cx_notifier;
        if (xen_processor_pmbits & XEN_PROCESSOR_PM_PX)
diff -r e39575a1d8af -r 2f1355579c9c include/xen/interface/xen.h
--- a/include/xen/interface/xen.h       Mon Jul 28 11:26:33 2008 +0100
+++ b/include/xen/interface/xen.h       Mon Jul 28 11:43:36 2008 +0100
@@ -554,6 +554,7 @@ typedef struct start_info start_info_t;
 /* These flags are passed in the 'flags' field of start_info_t. */
 #define SIF_PRIVILEGED    (1<<0)  /* Is the domain privileged? */
 #define SIF_INITDOMAIN    (1<<1)  /* Is this the initial control domain? */
+#define SIF_PM_MASK       (0xFF<<8) /* reserve 1 byte for xen-pm options */
 
 typedef struct dom0_vga_console_info {
     uint8_t video_type; /* DOM0_VGA_CONSOLE_??? */

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog