[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH 2/5] xen: make use of new pae enum in hypervisor
Instead of using own defines for the possible values of pae_kernel make use of the new libelf enum. Signed-off-by: Juergen Gross <jgross@xxxxxxxx> --- xen/arch/x86/domain_build.c | 6 +++--- xen/include/xen/sched.h | 4 ---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/domain_build.c b/xen/arch/x86/domain_build.c index 18cf6aa..cd27864 100644 --- a/xen/arch/x86/domain_build.c +++ b/xen/arch/x86/domain_build.c @@ -953,8 +953,8 @@ int __init construct_dom0( compat32 = 0; machine = elf_uval(&elf, elf.ehdr, e_machine); printk(" Xen kernel: 64-bit, lsb, compat32\n"); - if (elf_32bit(&elf) && parms.pae == PAEKERN_bimodal) - parms.pae = PAEKERN_extended_cr3; + if (elf_32bit(&elf) && parms.pae == XEN_PAE_BIMODAL) + parms.pae = XEN_PAE_EXTCR3; if (elf_32bit(&elf) && parms.pae && machine == EM_386) { compat32 = 1; @@ -1005,7 +1005,7 @@ int __init construct_dom0( nr_pages = compute_dom0_nr_pages(d, &parms, initrd_len); - if ( parms.pae == PAEKERN_extended_cr3 ) + if ( parms.pae == XEN_PAE_EXTCR3 ) set_bit(VMASST_TYPE_pae_extended_cr3, &d->vm_assist); if ( (parms.virt_hv_start_low != UNSET_ADDR) && elf_32bit(&elf) ) diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 8053b5a..20d3865 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -475,10 +475,6 @@ struct domain_setup_info unsigned long v_kernstart; unsigned long v_kernend; unsigned long v_kernentry; -#define PAEKERN_no 0 -#define PAEKERN_yes 1 -#define PAEKERN_extended_cr3 2 -#define PAEKERN_bimodal 3 unsigned int pae_kernel; /* Initialised by loader: Private. */ unsigned long elf_paddr_offset; -- 2.1.4 _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxx http://lists.xen.org/xen-devel
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |