mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 18:50:05 +01:00
libxc/x86/pvh: Allow creation of 32b PVH guests
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com> Acked-by: Ian Campbell <ian.campbell@citrix.com>
This commit is contained in:
Boris Ostrovsky authored and 
Jan Beulich committed
1 parent
8149a99ed9
commit
fd5964a2a0
1 file changed
+15
-17
+15
-17
@@ -300,7 +300,8 @@ static int setup_pgtables_x86_32_pae(struct xc_dom_image *dom)
|
||||
pgpfn = (addr - dom->parms.virt_base) >> PAGE_SHIFT_X86;
|
||||
l1tab[l1off] =
|
||||
pfn_to_paddr(xc_dom_p2m_guest(dom, pgpfn)) | L1_PROT;
|
||||
if ( (addr >= dom->pgtables_seg.vstart) &&
|
||||
if ( (!dom->pvh_enabled) &&
|
||||
(addr >= dom->pgtables_seg.vstart) &&
|
||||
(addr < dom->pgtables_seg.vend) )
|
||||
l1tab[l1off] &= ~_PAGE_RW; /* page tables are r/o */
|
||||
|
||||
@@ -590,22 +591,9 @@ static int vcpu_x86_32(struct xc_dom_image *dom, void *ptr)
|
||||
|
||||
DOMPRINTF_CALLED(dom->xch);
|
||||
|
||||
if ( dom->pvh_enabled )
|
||||
{
|
||||
xc_dom_panic(dom->xch, XC_INTERNAL_ERROR,
|
||||
"%s: PVH not supported for 32bit guests.", __FUNCTION__);
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* clear everything */
|
||||
memset(ctxt, 0, sizeof(*ctxt));
|
||||
|
||||
ctxt->user_regs.ds = FLAT_KERNEL_DS_X86_32;
|
||||
ctxt->user_regs.es = FLAT_KERNEL_DS_X86_32;
|
||||
ctxt->user_regs.fs = FLAT_KERNEL_DS_X86_32;
|
||||
ctxt->user_regs.gs = FLAT_KERNEL_DS_X86_32;
|
||||
ctxt->user_regs.ss = FLAT_KERNEL_SS_X86_32;
|
||||
ctxt->user_regs.cs = FLAT_KERNEL_CS_X86_32;
|
||||
ctxt->user_regs.eip = dom->parms.virt_entry;
|
||||
ctxt->user_regs.esp =
|
||||
dom->parms.virt_base + (dom->bootstack_pfn + 1) * PAGE_SIZE_X86;
|
||||
@@ -613,9 +601,6 @@ static int vcpu_x86_32(struct xc_dom_image *dom, void *ptr)
|
||||
dom->parms.virt_base + (dom->start_info_pfn) * PAGE_SIZE_X86;
|
||||
ctxt->user_regs.eflags = 1 << 9; /* Interrupt Enable */
|
||||
|
||||
ctxt->kernel_ss = ctxt->user_regs.ss;
|
||||
ctxt->kernel_sp = ctxt->user_regs.esp;
|
||||
|
||||
ctxt->flags = VGCF_in_kernel_X86_32 | VGCF_online_X86_32;
|
||||
if ( dom->parms.pae == 2 /* extended_cr3 */ ||
|
||||
dom->parms.pae == 3 /* bimodal */ )
|
||||
@@ -626,6 +611,19 @@ static int vcpu_x86_32(struct xc_dom_image *dom, void *ptr)
|
||||
DOMPRINTF("%s: cr3: pfn 0x%" PRIpfn " mfn 0x%" PRIpfn "",
|
||||
__FUNCTION__, dom->pgtables_seg.pfn, cr3_pfn);
|
||||
|
||||
if ( dom->pvh_enabled )
|
||||
return 0;
|
||||
|
||||
ctxt->user_regs.ds = FLAT_KERNEL_DS_X86_32;
|
||||
ctxt->user_regs.es = FLAT_KERNEL_DS_X86_32;
|
||||
ctxt->user_regs.fs = FLAT_KERNEL_DS_X86_32;
|
||||
ctxt->user_regs.gs = FLAT_KERNEL_DS_X86_32;
|
||||
ctxt->user_regs.ss = FLAT_KERNEL_SS_X86_32;
|
||||
ctxt->user_regs.cs = FLAT_KERNEL_CS_X86_32;
|
||||
|
||||
ctxt->kernel_ss = ctxt->user_regs.ss;
|
||||
ctxt->kernel_sp = ctxt->user_regs.esp;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||