[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH 5/5] x86/shadow: Misc minor cleanup
* Move the #ifdefary inside sh_audit_gw() to avoid needing the else clause. * The walk_t parameter is only ever read, so make it const. * Use mfn_eq() rather than opencoding it. No functional change. Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx> --- CC: Jan Beulich <JBeulich@xxxxxxxx> CC: Tim Deegan <tim@xxxxxxx> CC: George Dunlap <george.dunlap@xxxxxxxxxxxxx> --- xen/arch/x86/mm/shadow/multi.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 713f23d..336d24f 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -321,11 +321,11 @@ gw_remove_write_accesses(struct vcpu *v, unsigned long va, walk_t *gw) return rc; } -#if SHADOW_AUDIT & SHADOW_AUDIT_ENTRIES /* Lightweight audit: pass all the shadows associated with this guest walk * through the audit mechanisms */ -static void sh_audit_gw(struct vcpu *v, walk_t *gw) +static void sh_audit_gw(struct vcpu *v, const walk_t *gw) { +#if SHADOW_AUDIT & SHADOW_AUDIT_ENTRIES struct domain *d = v->domain; mfn_t smfn; @@ -362,13 +362,9 @@ static void sh_audit_gw(struct vcpu *v, walk_t *gw) && mfn_valid( (smfn = get_fl1_shadow_status(d, guest_l2e_get_gfn(gw->l2e)))) ) (void) sh_audit_fl1_table(v, smfn, INVALID_MFN); +#endif /* SHADOW_AUDIT & SHADOW_AUDIT_ENTRIES */ } -#else -#define sh_audit_gw(_v, _gw) do {} while(0) -#endif /* audit code */ - - /* * Write a new value into the guest pagetable, and update the shadows * appropriately. Returns 0 if we page-faulted, 1 for success. @@ -3309,7 +3305,7 @@ static int sh_page_fault(struct vcpu *v, } } #else /* 32 or 64 */ - used = (mfn_x(pagetable_get_mfn(tmp->arch.guest_table)) == mfn_x(gmfn)); + used = mfn_eq(pagetable_get_mfn(tmp->arch.guest_table), gmfn); #endif if ( used ) break; -- 2.1.4 _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxx https://lists.xen.org/xen-devel
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |