[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 03/16] x86/P2M: drop a few CONFIG_HVM
- To: "xen-devel@xxxxxxxxxxxxxxxxxxxx" <xen-devel@xxxxxxxxxxxxxxxxxxxx>
- From: Jan Beulich <jbeulich@xxxxxxxx>
- Date: Mon, 5 Jul 2021 18:06:39 +0200
- Arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none
- Arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4cC6Un4LMCn/lFnPBKF4eFaPubNu7dvYnjhXyk0P90U=; b=KoulVsXM5gjgidL5FZDJ7ydnAs6+gsi58Rs9VeKBxtkjW9E1Xv232QBrbOcg3+w24LQNKW98oiCM2fFLXaWcUiOf4Rexg8IVaTpNu5LpWGAOSQvHr9ca5gfYw3CJdDOWsGvZf3QA+0JzAOQf85dLr/76cOcwrhyPZr3OYgLwYKWASQBnePAD3dwvXFhaCKDrjTmpJzlS1DPZbte2HIZyOpPW5K3fkHx8IUwAFnZrMcmT/fSgC4E3kx4e9lr8BvIsQ0R1h4ftRSFwwg28a7MqPYW7XoEpJdJDkEWP2nIzAaKrR7wZBD96t3Lx9cp0BsOGlTt7rwh70zSwdlBaYeUwxw==
- Arc-seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BzloCQjGohMTksuqpX0ip/cYd/ThOCej61ZD7mj4aiGW56jodX+YKIAgJ2lrWg9x4zgbRgxnkWQTAfuMAkqVoUvfXBKd8Aq0h0jJglvWJAdj0NZSGZOIf9rSK0eDV0GnNkPFyfNCLZHJpp+Lli6dQQVbIprpaiW1zo2OVcvhUpTbm4mjZj1rjMLaJCtmMhicPpPXrqMz/YEETe0VoqZeg1pqZLEsFWVzQuPgKrNsE0dQzif4ecrre6rPAvFtapLCQ1NU+U73Txvw/C65Q0BctlEdiNLpYMgUymXKql8jidvIgDI9/oOjLUDc8IkDUE3jYKb7Wrd0x5DCaxblEps4MQ==
- Authentication-results: citrix.com; dkim=none (message not signed) header.d=none;citrix.com; dmarc=none action=none header.from=suse.com;
- Cc: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>, Wei Liu <wl@xxxxxxx>, Roger Pau Monné <roger.pau@xxxxxxxxxx>, George Dunlap <george.dunlap@xxxxxxxxxx>
- Delivery-date: Mon, 05 Jul 2021 16:06:46 +0000
- List-id: Xen developer discussion <xen-devel.lists.xenproject.org>
This is to make it easier to see which parts of p2m.c still aren't HVM-
specific: In one case the conditionals sat in an already guarded region,
while in the other case P2M_AUDIT implies HVM.
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
--- a/xen/arch/x86/mm/p2m.c
+++ b/xen/arch/x86/mm/p2m.c
@@ -1584,11 +1584,10 @@ p2m_flush_table_locked(struct p2m_domain
* when discarding them.
*/
ASSERT(!p2m_is_hostp2m(p2m));
-#ifdef CONFIG_HVM
- /* Nested p2m's do not do pod, hence the asserts (and no pod lock)*/
+
+ /* Nested p2m's do not do pod, hence the asserts (and no pod lock) */
ASSERT(page_list_empty(&p2m->pod.super));
ASSERT(page_list_empty(&p2m->pod.single));
-#endif
/* No need to flush if it's already empty */
if ( p2m_is_nestedp2m(p2m) && p2m->np2m_base == P2M_BASE_EADDR )
@@ -2497,7 +2496,6 @@ int p2m_altp2m_propagate_change(struct d
return ret;
}
-#endif /* CONFIG_HVM */
/*** Audit ***/
@@ -2603,8 +2601,6 @@ out_p2m_audit:
}
#endif /* P2M_AUDIT */
-#ifdef CONFIG_HVM
-
/*
* Add frame from foreign domain to target domain's physmap. Similar to
* XENMAPSPACE_gmfn but the frame is foreign being mapped into current,
|
