Remove the redundant is_pv_domain check. Rearrange setup_compat calls.
Signed-off-by: Wei Liu <wei.l...@citrix.com>
---
xen/arch/x86/pv/domain.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/xen/arch/x86/pv/domain.c b/xen/arch/x86/pv/domain.c
index a01e3516ca..f55d41587a 100644
--- a/xen/arch/x86/pv/domain.c
+++ b/xen/arch/x86/pv/domain.c
@@ -65,16 +65,12 @@ int switch_compat(struct domain *d)
return 0;
d->arch.has_32bit_shinfo = 1;
- if ( is_pv_domain(d) )
- d->arch.is_32bit_pv = 1;
+ d->arch.is_32bit_pv = 1;
for_each_vcpu( d, v )
{
- rc = setup_compat_arg_xlat(v);
- if ( !rc )
- rc = setup_compat_l4(v);
-
- if ( rc )
+ if ( (rc = setup_compat_arg_xlat(v)) ||
+ (rc = setup_compat_l4(v)) )
goto undo_and_fail;
}
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
