msr-index.h has been in use for a while, so use the identifiers it provides in place of raw numbers plus comments.
Signed-off-by: Jan Beulich <jbeul...@suse.com> --- a/tools/tests/x86_emulator/test_x86_emulator.c +++ b/tools/tests/x86_emulator/test_x86_emulator.c @@ -689,11 +689,11 @@ static int read_msr( { switch ( reg ) { - case 0xc0000080: /* EFER */ - *val = ctxt->addr_size > 32 ? 0x500 /* LME|LMA */ : 0; + case MSR_EFER: + *val = ctxt->addr_size > 32 ? EFER_LME | EFER_LMA : 0; return X86EMUL_OKAY; - case 0xc0000103: /* TSC_AUX */ + case MSR_TSC_AUX: #define TSC_AUX_VALUE 0xCACACACA *val = TSC_AUX_VALUE; return X86EMUL_OKAY;