ia64/xen-unstable

changeset 16553:b240698146a2

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 <ehabkost@redhat.com>
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
author Keir Fraser <keir.fraser@citrix.com>
date Thu Dec 06 17:47:53 2007 +0000 (2007-12-06)
parents 4dd302c8d59c
children ec61ca6cd55b
files xen/arch/x86/domain_build.c
line diff
     1.1 --- a/xen/arch/x86/domain_build.c	Thu Dec 06 17:10:26 2007 +0000
     1.2 +++ b/xen/arch/x86/domain_build.c	Thu Dec 06 17:47:53 2007 +0000
     1.3 @@ -252,10 +252,6 @@ int __init construct_dom0(
     1.4      /* Machine address of next candidate page-table page. */
     1.5      unsigned long mpt_alloc;
     1.6  
     1.7 -    /* Features supported. */
     1.8 -    uint32_t dom0_features_supported[XENFEAT_NR_SUBMAPS] = { 0 };
     1.9 -    uint32_t dom0_features_required[XENFEAT_NR_SUBMAPS] = { 0 };
    1.10 -
    1.11      /* Sanity! */
    1.12      BUG_ON(d->domain_id != 0);
    1.13      BUG_ON(d->vcpu[0] == NULL);
    1.14 @@ -942,12 +938,12 @@ int __init construct_dom0(
    1.15          v->arch.guest_context.user_regs.gs &= ~3;
    1.16          printk("Dom0 runs in ring 0 (supervisor mode)\n");
    1.17          if ( !test_bit(XENFEAT_supervisor_mode_kernel,
    1.18 -                       dom0_features_supported) )
    1.19 +                       parms.f_supported) )
    1.20              panic("Dom0 does not support supervisor-mode execution\n");
    1.21      }
    1.22      else
    1.23      {
    1.24 -        if ( test_bit(XENFEAT_supervisor_mode_kernel, dom0_features_required) )
    1.25 +        if ( test_bit(XENFEAT_supervisor_mode_kernel, parms.f_required) )
    1.26              panic("Dom0 requires supervisor-mode execution\n");
    1.27      }
    1.28