# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1204715792 0
# Node ID f85b379fa9436be0ecd733d7bedbebdf1838a310
# Parent 86e64b684fb2751f8d2db7e07e88da8505008255
x86 hvm: Remove global 'hap' boot parameter now that their is a
per-domain configuration option.
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
xen/arch/x86/hvm/hvm.c | 17 +----------------
xen/arch/x86/mm/p2m.c | 3 +--
2 files changed, 2 insertions(+), 18 deletions(-)
diff -r 86e64b684fb2 -r f85b379fa943 xen/arch/x86/hvm/hvm.c
--- a/xen/arch/x86/hvm/hvm.c Wed Mar 05 11:10:29 2008 +0000
+++ b/xen/arch/x86/hvm/hvm.c Wed Mar 05 11:16:32 2008 +0000
@@ -51,16 +51,6 @@
#include <public/version.h>
#include <public/memory.h>
-/*
- * Xen command-line option to allow/disallow hardware-assisted paging.
- * Since the phys-to-machine table of AMD NPT is in host format, 32-bit Xen
- * can only support guests using NPT with up to a 4GB memory map. Therefore
- * we disallow HAP by default on PAE Xen (by default we want to support an
- * 8GB pseudophysical memory map for HVM guests on a PAE host).
- */
-static int opt_hap_permitted = (CONFIG_PAGING_LEVELS != 3);
-boolean_param("hap", opt_hap_permitted);
-
int hvm_enabled __read_mostly;
unsigned int opt_hvm_debug_level __read_mostly;
@@ -88,12 +78,7 @@ void hvm_enable(struct hvm_function_tabl
hvm_enabled = 1;
if ( hvm_funcs.hap_supported )
- {
- if ( !opt_hap_permitted )
- hvm_funcs.hap_supported = 0;
- printk("HVM: Hardware Assisted Paging detected %s.\n",
- hvm_funcs.hap_supported ? "and enabled" : "but disabled");
- }
+ printk("HVM: Hardware Assisted Paging detected.\n");
}
void hvm_set_guest_tsc(struct vcpu *v, u64 guest_tsc)
diff -r 86e64b684fb2 -r f85b379fa943 xen/arch/x86/mm/p2m.c
--- a/xen/arch/x86/mm/p2m.c Wed Mar 05 11:10:29 2008 +0000
+++ b/xen/arch/x86/mm/p2m.c Wed Mar 05 11:16:32 2008 +0000
@@ -724,8 +724,7 @@ guest_physmap_add_entry(struct domain *d
{
if ( !test_and_set_bool(d->arch.hvm_domain.amd_npt_4gb_warning) )
dprintk(XENLOG_WARNING, "Dom%d failed to populate memory beyond"
- " 4GB: specify 'nohap' Xen boot parameter, or 'hap=0' "
- "domain config option.\n",
+ " 4GB: specify 'hap=0' domain config option.\n",
d->domain_id);
return -EINVAL;
}
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home