diff options
| author | Keir Fraser <keir@xen.org> | 2012-09-12 13:59:26 +0100 |
|---|---|---|
| committer | Keir Fraser <keir@xen.org> | 2012-09-12 13:59:26 +0100 |
| commit | 218adf199e6868eb4a15644a63e6991ede1613bc (patch) | |
| tree | faa5070fb10dee2354b8c753385e10fc32668a2d /xen/arch/x86/domain.c | |
| parent | 5d1181a5ea5e0f11d481a94b16ed00d883f9726e (diff) | |
| download | xen-218adf199e6868eb4a15644a63e6991ede1613bc.tar.gz xen-218adf199e6868eb4a15644a63e6991ede1613bc.tar.bz2 xen-218adf199e6868eb4a15644a63e6991ede1613bc.zip | |
x86: We can assume CONFIG_PAGING_LEVELS==4.
Signed-off-by: Keir Fraser <keir@xen.org>
Diffstat (limited to 'xen/arch/x86/domain.c')
| -rw-r--r-- | xen/arch/x86/domain.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 2a19d8e380..9cd7cf4827 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -588,9 +588,8 @@ int arch_domain_create(struct domain *d, unsigned int domcr_flags) } else { - /* 32-bit PV guest by default only if Xen is not 64-bit. */ - d->arch.is_32bit_pv = d->arch.has_32bit_shinfo = - (CONFIG_PAGING_LEVELS != 4); + /* 64-bit PV guest by default. */ + d->arch.is_32bit_pv = d->arch.has_32bit_shinfo = 0; spin_lock_init(&d->arch.pv_domain.e820_lock); } @@ -2096,7 +2095,6 @@ int domain_relinquish_resources(struct domain *d) ret = relinquish_memory(d, &d->xenpage_list, ~0UL); if ( ret ) return ret; -#if CONFIG_PAGING_LEVELS >= 4 d->arch.relmem = RELMEM_l4; /* fallthrough */ @@ -2104,8 +2102,6 @@ int domain_relinquish_resources(struct domain *d) ret = relinquish_memory(d, &d->page_list, PGT_l4_page_table); if ( ret ) return ret; -#endif -#if CONFIG_PAGING_LEVELS >= 3 d->arch.relmem = RELMEM_l3; /* fallthrough */ @@ -2113,7 +2109,6 @@ int domain_relinquish_resources(struct domain *d) ret = relinquish_memory(d, &d->page_list, PGT_l3_page_table); if ( ret ) return ret; -#endif d->arch.relmem = RELMEM_l2; /* fallthrough */ |