x86/HVM: drop stale check from hvm_load_cpu_msrs()
PATCH v2 1/1 x86/HVM: drop stale check from hvm_load_cpu_msrs()
Up until f61685a66903 ("x86: remove defunct init/load/save_msr() hvm_funcs") the check of the _rsvd field served as an error check for the earlier hvm_funcs.save_msr() invocation. With that invocation gone the check makes no sense anymore: It is effectively dead code due to the checking of the field in the earlier loop.
While dropping the conditional also eliminate the "err" local variable (using a non-standard name anyway), replaced by suitable new/adjusted "return" statements.
---
v2: Remove "err". Amend description.
xen/arch/x86/hvm/hvm.c +4 -7
@@ -1428,7 +1428,6 @@ static int cf_check hvm_load_cpu_msrs(ststruct vcpu *v;const struct hvm_save_descriptor *desc;struct hvm_msr *ctxt; -int err =0 ;if ( vcpuid >= d->max_vcpus || (v = d->vcpu[vcpuid]) ==NULL ) {
@@ -1479,7 +1478,7 @@ static int cf_check hvm_load_cpu_msrs(streturn -EOPNOTSUPP ;/* Checking finished */ -for ( i =0 ; !err && i < ctxt->count; ++i ) +for ( i =0 ; i < ctxt->count; ++i ) {switch ( ctxt->msr[i].index ) {
@@ -1495,17 +1494,15 @@ static int cf_check hvm_load_cpu_msrs(st rc =guest_wrmsr (v, ctxt->msr[i].index, ctxt->msr[i].val);if ( rc !=X86EMUL_OKAY ) - err = -ENXIO ; +return -ENXIO ;break ;default : -if ( !ctxt->msr[i]._rsvd ) - err = -ENXIO ; -break ; +return -ENXIO ; } } -return err; +return 0 ; }/* We need variable length data chunks for XSAVE area and MSRs, hence
Quoted 11 lines · Jan Beulich
Up until
f61685a66903("x86: remove defunct init/load/save_msr()hvm_funcs") the check of the_rsvdfield served as an error check for the earlierhvm_funcs.save_msr()invocation. With that invocation gone the check makes no sense anymore: It is effectively dead code due to the checking of the field in the earlier loop.While dropping the conditional also eliminate the "err" local variable (using a non-standard name anyway), replaced by suitable new/adjusted "return" statements.
Signed-off-by Jan Beulich <[email protected]>