x86emul: fold exit paths Move "cannot_emulate" and make it go through the common (error) exit path. Signed-off-by: Jan Beulich --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -7762,7 +7762,9 @@ x86_emulate( } default: - goto cannot_emulate; + cannot_emulate: + rc = X86EMUL_UNHANDLEABLE; + goto done; } if ( state->simd_size ) @@ -7906,11 +7908,6 @@ x86_emulate( _put_fpu(); put_stub(stub); return rc; - - cannot_emulate: - _put_fpu(); - put_stub(stub); - return X86EMUL_UNHANDLEABLE; #undef state }