From d26894e1b0d47cb3eb6a6c046301fac22d9a8b65 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Tue, 17 Jul 2007 23:16:11 +1000 Subject: [PATCH] --- yaml --- r: 68344 b: refs/heads/master c: 1e3c5cb0d5a63b7169708614bfba0c7f25aa493e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/kvm/x86_emulate.c | 9 +++++++-- trunk/drivers/kvm/x86_emulate.h | 8 -------- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index c2a7aa0b9f56..acaaf547ea64 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5eb549a085c3500f2b9d8b48d40393b6e50b68a9 +refs/heads/master: 1e3c5cb0d5a63b7169708614bfba0c7f25aa493e diff --git a/trunk/drivers/kvm/x86_emulate.c b/trunk/drivers/kvm/x86_emulate.c index 4b8a0cc9665e..f5e4644e2437 100644 --- a/trunk/drivers/kvm/x86_emulate.c +++ b/trunk/drivers/kvm/x86_emulate.c @@ -443,8 +443,13 @@ struct operand { (((reg) + _inc) & ((1UL << (ad_bytes << 3)) - 1)); \ } while (0) -void *decode_register(u8 modrm_reg, unsigned long *regs, - int highbyte_regs) +/* + * Given the 'reg' portion of a ModRM byte, and a register block, return a + * pointer into the block that addresses the relevant register. + * @highbyte_regs specifies whether to decode AH,CH,DH,BH. + */ +static void *decode_register(u8 modrm_reg, unsigned long *regs, + int highbyte_regs) { void *p; diff --git a/trunk/drivers/kvm/x86_emulate.h b/trunk/drivers/kvm/x86_emulate.h index 2847d67abfd2..574cca70b22e 100644 --- a/trunk/drivers/kvm/x86_emulate.h +++ b/trunk/drivers/kvm/x86_emulate.h @@ -152,12 +152,4 @@ struct x86_emulate_ctxt { int x86_emulate_memop(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops); -/* - * Given the 'reg' portion of a ModRM byte, and a register block, return a - * pointer into the block that addresses the relevant register. - * @highbyte_regs specifies whether to decode AH,CH,DH,BH. - */ -void *decode_register(u8 modrm_reg, unsigned long *regs, - int highbyte_regs); - #endif /* __X86_EMULATE_H__ */