[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH for-next v2 03/10] x86/domain: make release_compact_l4 NULL tolerant
Push the check in caller down to that function so that it becomes idempotent. No functional change. Signed-off-by: Wei Liu <wei.liu2@xxxxxxxxxx> --- Cc: Jan Beulich <jbeulich@xxxxxxxx> Cc: Andrew Cooper <andrew.cooper3@xxxxxxxxxx> --- xen/arch/x86/domain.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 1f76d034a7..b3d65b1f82 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -338,7 +338,8 @@ static int setup_compat_l4(struct vcpu *v) static void release_compat_l4(struct vcpu *v) { - free_domheap_page(pagetable_get_page(v->arch.guest_table)); + if ( !pagetable_is_null(v->arch.guest_table) ) + free_domheap_page(pagetable_get_page(v->arch.guest_table)); v->arch.guest_table = pagetable_null(); v->arch.guest_table_user = pagetable_null(); } @@ -379,9 +380,7 @@ int switch_compat(struct domain *d) for_each_vcpu( d, v ) { free_compat_arg_xlat(v); - - if ( !pagetable_is_null(v->arch.guest_table) ) - release_compat_l4(v); + release_compat_l4(v); } return rc; -- 2.11.0 _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxx https://lists.xen.org/xen-devel
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |