ia64/xen-unstable

changeset 17190:f85b379fa943

x86 hvm: Remove global 'hap' boot parameter now that their is a
per-domain configuration option.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
author Keir Fraser <keir.fraser@citrix.com>
date Wed Mar 05 11:16:32 2008 +0000 (2008-03-05)
parents 86e64b684fb2
children 1166ee0f4765
files xen/arch/x86/hvm/hvm.c xen/arch/x86/mm/p2m.c
line diff
     1.1 --- a/xen/arch/x86/hvm/hvm.c	Wed Mar 05 11:10:29 2008 +0000
     1.2 +++ b/xen/arch/x86/hvm/hvm.c	Wed Mar 05 11:16:32 2008 +0000
     1.3 @@ -51,16 +51,6 @@
     1.4  #include <public/version.h>
     1.5  #include <public/memory.h>
     1.6  
     1.7 -/*
     1.8 - * Xen command-line option to allow/disallow hardware-assisted paging.
     1.9 - * Since the phys-to-machine table of AMD NPT is in host format, 32-bit Xen
    1.10 - * can only support guests using NPT with up to a 4GB memory map. Therefore
    1.11 - * we disallow HAP by default on PAE Xen (by default we want to support an
    1.12 - * 8GB pseudophysical memory map for HVM guests on a PAE host).
    1.13 - */
    1.14 -static int opt_hap_permitted = (CONFIG_PAGING_LEVELS != 3);
    1.15 -boolean_param("hap", opt_hap_permitted);
    1.16 -
    1.17  int hvm_enabled __read_mostly;
    1.18  
    1.19  unsigned int opt_hvm_debug_level __read_mostly;
    1.20 @@ -88,12 +78,7 @@ void hvm_enable(struct hvm_function_tabl
    1.21      hvm_enabled = 1;
    1.22  
    1.23      if ( hvm_funcs.hap_supported )
    1.24 -    {
    1.25 -        if ( !opt_hap_permitted )
    1.26 -            hvm_funcs.hap_supported = 0;
    1.27 -        printk("HVM: Hardware Assisted Paging detected %s.\n",
    1.28 -               hvm_funcs.hap_supported ? "and enabled" : "but disabled");
    1.29 -    }
    1.30 +        printk("HVM: Hardware Assisted Paging detected.\n");
    1.31  }
    1.32  
    1.33  void hvm_set_guest_tsc(struct vcpu *v, u64 guest_tsc)
     2.1 --- a/xen/arch/x86/mm/p2m.c	Wed Mar 05 11:10:29 2008 +0000
     2.2 +++ b/xen/arch/x86/mm/p2m.c	Wed Mar 05 11:16:32 2008 +0000
     2.3 @@ -724,8 +724,7 @@ guest_physmap_add_entry(struct domain *d
     2.4      {
     2.5          if ( !test_and_set_bool(d->arch.hvm_domain.amd_npt_4gb_warning) )
     2.6              dprintk(XENLOG_WARNING, "Dom%d failed to populate memory beyond"
     2.7 -                    " 4GB: specify 'nohap' Xen boot parameter, or 'hap=0' "
     2.8 -                    "domain config option.\n",
     2.9 +                    " 4GB: specify 'hap=0' domain config option.\n",
    2.10                      d->domain_id);
    2.11          return -EINVAL;
    2.12      }