[xen-3.1-testing] x86: Remove bogus variables on construct_dom0()

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[xen-3.1-testing] x86: Remove bogus variables on construct_dom0()

Xen patchbot-3.1-testing
# HG changeset patch
# User Keir Fraser <[hidden email]>
# Date 1196963340 0
# Node ID a1a6fb3c75f041c281226d570da979c67c17ca75
# Parent  60865716545565e719f2874260d2647757750ba6
x86: Remove bogus variables on construct_dom0()

The check for supervisor_mode_kernel feature bit was being done on the
dom0_features_{supported,required} variables, but they are always set
to zero.

The feature bits are stored on elf_dom_parms struct, not on those
variables.

From: Eduardo Habkost <[hidden email]>
Signed-off-by: Keir Fraser <[hidden email]>
xen-unstable changeset:   16553:b240698146a250d7f7cd5309325d743e9ec6f4d8
xen-unstable date:        Thu Dec 06 17:47:53 2007 +0000
---
 xen/arch/x86/domain_build.c |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diff -r 608657165455 -r a1a6fb3c75f0 xen/arch/x86/domain_build.c
--- a/xen/arch/x86/domain_build.c Thu Dec 06 17:45:41 2007 +0000
+++ b/xen/arch/x86/domain_build.c Thu Dec 06 17:49:00 2007 +0000
@@ -251,10 +251,6 @@ int __init construct_dom0(
     /* Machine address of next candidate page-table page. */
     unsigned long mpt_alloc;
 
-    /* Features supported. */
-    uint32_t dom0_features_supported[XENFEAT_NR_SUBMAPS] = { 0 };
-    uint32_t dom0_features_required[XENFEAT_NR_SUBMAPS] = { 0 };
-
     /* Sanity! */
     BUG_ON(d->domain_id != 0);
     BUG_ON(d->vcpu[0] == NULL);
@@ -938,12 +934,12 @@ int __init construct_dom0(
         v->arch.guest_context.user_regs.gs &= ~3;
         printk("Dom0 runs in ring 0 (supervisor mode)\n");
         if ( !test_bit(XENFEAT_supervisor_mode_kernel,
-                       dom0_features_supported) )
+                       parms.f_supported) )
             panic("Dom0 does not support supervisor-mode execution\n");
     }
     else
     {
-        if ( test_bit(XENFEAT_supervisor_mode_kernel, dom0_features_required) )
+        if ( test_bit(XENFEAT_supervisor_mode_kernel, parms.f_required) )
             panic("Dom0 requires supervisor-mode execution\n");
     }
 

_______________________________________________
Xen-changelog mailing list
[hidden email]
http://lists.xensource.com/xen-changelog