Drop introduced trailing whitespace, excessively long lines, mal-indention,
superfluous use of PRI macros for int-or-smaller types, and incorrect PRI
macros for gfns and mfns.
Signed-off-by: Andrew Cooper <andrew.coop...@citrix.com>
---
CC: George Dunlap <george.dun...@eu.citrix.com>
CC: Tamas K Lengyel <ta...@tklengyel.com>
CC: Jan Beulich <jbeul...@suse.com>
CC: Wei Liu <w...@xen.org>
CC: Roger Pau Monné <roger....@citrix.com>
---
xen/arch/x86/hvm/hvm.c | 5 +++--
xen/arch/x86/mm/p2m.c | 8 ++++----
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c
index 0e33e04..a44944b 100644
--- a/xen/arch/x86/hvm/hvm.c
+++ b/xen/arch/x86/hvm/hvm.c
@@ -1765,12 +1765,13 @@ int hvm_hap_nested_page_fault(paddr_t gpa, unsigned
long gla,
{
p2m = p2m_get_altp2m(curr);
- /*
+ /*
* Get the altp2m entry if present; or if not, propagate from
* the host p2m. NB that this returns with gfn locked in the
* altp2m.
*/
- if ( p2m_altp2m_get_or_propagate(p2m, gfn, &mfn, &p2mt, &p2ma,
page_order) )
+ if ( p2m_altp2m_get_or_propagate(p2m, gfn, &mfn, &p2mt,
+ &p2ma, page_order) )
{
/* Entry was copied from host -- retry fault */
rc = 1;
diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c
index 0ea8941..4c99548 100644
--- a/xen/arch/x86/mm/p2m.c
+++ b/xen/arch/x86/mm/p2m.c
@@ -2440,7 +2440,7 @@ bool p2m_altp2m_get_or_propagate(struct p2m_domain *ap2m,
unsigned long gfn_l,
* gfns below.
*/
p2m_lock(ap2m);
-
+
amfn = get_gfn_type_access(ap2m, gfn_l, &ap2mt, &ap2ma, 0, NULL);
if ( !mfn_eq(amfn, INVALID_MFN) )
@@ -2474,11 +2474,11 @@ bool p2m_altp2m_get_or_propagate(struct p2m_domain
*ap2m, unsigned long gfn_l,
if ( rc )
{
gprintk(XENLOG_ERR,
- "failed to set entry for %#"PRIx64" -> %#"PRIx64" altp2m %#"PRIx16".
rc: %"PRIi32"\n",
- gfn_l, mfn_x(amfn), vcpu_altp2m(current).p2midx, rc);
+ "failed to set entry for %"PRI_gfn" -> %"PRI_mfn" altp2m %u,
rc %d\n",
+ gfn_l, mfn_x(amfn), vcpu_altp2m(current).p2midx, rc);
domain_crash(ap2m->domain);
}
-
+
return true;
}
--
2.1.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
