From d02ff298f6137a2612339d45183fcfc6847c8f05 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roger=20Pau=20Monn=C3=A9?= Date: Wed, 20 Dec 2017 10:00:16 +0100 Subject: [PATCH] x86/dom0: remove is_pv_domain leftovers from the PV domain builder MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Those where added when PVHv1 was sharing the domain builder with PV. Signed-off-by: Roger Pau Monné Reviewed-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/pv/dom0_build.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/pv/dom0_build.c b/xen/arch/x86/pv/dom0_build.c index 6a5fc326f7..09c765a06f 100644 --- a/xen/arch/x86/pv/dom0_build.c +++ b/xen/arch/x86/pv/dom0_build.c @@ -671,8 +671,7 @@ int __init dom0_construct_pv(struct domain *d, } /* Pages that are part of page tables must be read only. */ - if ( is_pv_domain(d) ) - mark_pv_pt_pages_rdonly(d, l4start, vpt_start, nr_pt_pages); + mark_pv_pt_pages_rdonly(d, l4start, vpt_start, nr_pt_pages); /* Mask all upcalls... */ for ( i = 0; i < XEN_LEGACY_MAX_VCPUS; i++ ) @@ -751,7 +750,7 @@ int __init dom0_construct_pv(struct domain *d, count = d->tot_pages; /* Set up the phys->machine table if not part of the initial mapping. */ - if ( is_pv_domain(d) && parms.p2m_base != UNSET_ADDR ) + if ( parms.p2m_base != UNSET_ADDR ) { pfn = pagetable_get_pfn(v->arch.guest_table); setup_pv_physmap(d, pfn, v_start, v_end, vphysmap_start, vphysmap_end, -- 2.30.2