# HG changeset patch
# User awilliam@xxxxxxxxxxx
# Node ID 06ed19691f6d770eb9cbf2a9236f02f1d016da74
# Parent 78c494a16b951c96452cc395dd49ac1d228b3dcd
[IA64] code cleanups
A few more code cleanups
Signed-off-by: Alex Williamson <alex.williamson@xxxxxx>
---
xen/arch/ia64/xen/privop.c | 35 ++++++++++++++++++++++-------------
1 files changed, 22 insertions(+), 13 deletions(-)
diff -r 78c494a16b95 -r 06ed19691f6d xen/arch/ia64/xen/privop.c
--- a/xen/arch/ia64/xen/privop.c Tue Oct 17 15:43:41 2006 -0600
+++ b/xen/arch/ia64/xen/privop.c Tue Oct 17 15:49:05 2006 -0600
@@ -148,9 +148,11 @@ static IA64FAULT priv_itr_d(VCPU * vcpu,
//if (!vcpu_get_psr_ic(vcpu))
// return IA64_ILLOP_FAULT;
- if ((fault = vcpu_get_itir(vcpu, &itir)) != IA64_NO_FAULT)
- return IA64_ILLOP_FAULT;
- if ((fault = vcpu_get_ifa(vcpu, &ifa)) != IA64_NO_FAULT)
+ fault = vcpu_get_itir(vcpu, &itir);
+ if (fault != IA64_NO_FAULT)
+ return IA64_ILLOP_FAULT;
+ fault = vcpu_get_ifa(vcpu, &ifa);
+ if (fault != IA64_NO_FAULT)
return IA64_ILLOP_FAULT;
pte = vcpu_get_gr(vcpu, inst.M42.r2);
slot = vcpu_get_gr(vcpu, inst.M42.r3);
@@ -163,9 +165,11 @@ static IA64FAULT priv_itr_i(VCPU * vcpu,
u64 fault, itir, ifa, pte, slot;
//if (!vcpu_get_psr_ic(vcpu)) return IA64_ILLOP_FAULT;
- if ((fault = vcpu_get_itir(vcpu, &itir)) != IA64_NO_FAULT)
- return IA64_ILLOP_FAULT;
- if ((fault = vcpu_get_ifa(vcpu, &ifa)) != IA64_NO_FAULT)
+ fault = vcpu_get_itir(vcpu, &itir);
+ if (fault != IA64_NO_FAULT)
+ return IA64_ILLOP_FAULT;
+ fault = vcpu_get_ifa(vcpu, &ifa);
+ if (fault != IA64_NO_FAULT)
return IA64_ILLOP_FAULT;
pte = vcpu_get_gr(vcpu, inst.M42.r2);
slot = vcpu_get_gr(vcpu, inst.M42.r3);
@@ -178,9 +182,11 @@ static IA64FAULT priv_itc_d(VCPU * vcpu,
u64 fault, itir, ifa, pte;
//if (!vcpu_get_psr_ic(vcpu)) return IA64_ILLOP_FAULT;
- if ((fault = vcpu_get_itir(vcpu, &itir)) != IA64_NO_FAULT)
- return IA64_ILLOP_FAULT;
- if ((fault = vcpu_get_ifa(vcpu, &ifa)) != IA64_NO_FAULT)
+ fault = vcpu_get_itir(vcpu, &itir);
+ if (fault != IA64_NO_FAULT)
+ return IA64_ILLOP_FAULT;
+ fault = vcpu_get_ifa(vcpu, &ifa);
+ if (fault != IA64_NO_FAULT)
return IA64_ILLOP_FAULT;
pte = vcpu_get_gr(vcpu, inst.M41.r2);
@@ -192,9 +198,11 @@ static IA64FAULT priv_itc_i(VCPU * vcpu,
u64 fault, itir, ifa, pte;
//if (!vcpu_get_psr_ic(vcpu)) return IA64_ILLOP_FAULT;
- if ((fault = vcpu_get_itir(vcpu, &itir)) != IA64_NO_FAULT)
- return IA64_ILLOP_FAULT;
- if ((fault = vcpu_get_ifa(vcpu, &ifa)) != IA64_NO_FAULT)
+ fault = vcpu_get_itir(vcpu, &itir);
+ if (fault != IA64_NO_FAULT)
+ return IA64_ILLOP_FAULT;
+ fault = vcpu_get_ifa(vcpu, &ifa);
+ if (fault != IA64_NO_FAULT)
return IA64_ILLOP_FAULT;
pte = vcpu_get_gr(vcpu, inst.M41.r2);
@@ -516,7 +524,8 @@ static IA64FAULT priv_mov_from_psr(VCPU
u64 val;
IA64FAULT fault;
- if ((fault = vcpu_get_psr(vcpu, &val)) == IA64_NO_FAULT)
+ fault = vcpu_get_psr(vcpu, &val);
+ if (fault == IA64_NO_FAULT)
return vcpu_set_gr(vcpu, tgt, val, 0);
else
return fault;
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home