From 412ddc726cc527abcb861df68fee034fa2f2a25f Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Fri, 30 Sep 2016 15:06:40 +0200 Subject: [PATCH] x86emul: sort opcode 0f01 special case switch() statement Sort the special case opcode 0f01 entries numerically, insert blank lines between each of the cases, and properly place opening braces. No functional change. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/x86_emulate/x86_emulate.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index ba0a01a41e..fd9e5f660f 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -4187,6 +4187,14 @@ x86_emulate( } #endif + case 0xd4: /* vmfunc */ + generate_exception_if(lock_prefix | rep_prefix() | (vex.pfx == vex_66), + EXC_UD, -1); + fail_if(!ops->vmfunc); + if ( (rc = ops->vmfunc(ctxt) != X86EMUL_OKAY) ) + goto done; + goto no_writeback; + case 0xdf: /* invlpga */ generate_exception_if(!in_protmode(ctxt, ops), EXC_UD, -1); generate_exception_if(!mode_ring0(), EXC_GP, 0); @@ -4195,7 +4203,9 @@ x86_emulate( ctxt)) ) goto done; goto no_writeback; - case 0xf9: /* rdtscp */ { + + case 0xf9: /* rdtscp */ + { uint64_t tsc_aux; fail_if(ops->read_msr == NULL); if ( (rc = ops->read_msr(MSR_TSC_AUX, &tsc_aux, ctxt)) != 0 ) @@ -4203,14 +4213,9 @@ x86_emulate( _regs.ecx = (uint32_t)tsc_aux; goto rdtsc; } - case 0xd4: /* vmfunc */ - generate_exception_if(lock_prefix | rep_prefix() | (vex.pfx == vex_66), - EXC_UD, -1); - fail_if(ops->vmfunc == NULL); - if ( (rc = ops->vmfunc(ctxt) != X86EMUL_OKAY) ) - goto done; - goto no_writeback; - case 0xfc: /* clzero */ { + + case 0xfc: /* clzero */ + { unsigned int eax = 1, ebx = 0, dummy = 0; unsigned long zero = 0; -- 2.30.2