aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2007-07-17 09:16:11 -0400
committerAvi Kivity <avi@qumranet.com>2007-10-13 04:18:18 -0400
commit1e3c5cb0d5a63b7169708614bfba0c7f25aa493e (patch)
tree55c1d3ded12dbacc2962a3406bcf5da3aa68a513 /drivers
parent5eb549a085c3500f2b9d8b48d40393b6e50b68a9 (diff)
KVM: Trivial: Make decode_register() static
I have shied away from touching x86_emulate.c (it could definitely use some love, but it is forked from the Xen code, and it would be more productive to cross-merge fixes). Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/kvm/x86_emulate.c9
-rw-r--r--drivers/kvm/x86_emulate.h8
2 files changed, 7 insertions, 10 deletions
diff --git a/drivers/kvm/x86_emulate.c b/drivers/kvm/x86_emulate.c
index 4b8a0cc9665e..f5e4644e2437 100644
--- a/drivers/kvm/x86_emulate.c
+++ b/drivers/kvm/x86_emulate.c
@@ -443,8 +443,13 @@ struct operand {
443 (((reg) + _inc) & ((1UL << (ad_bytes << 3)) - 1)); \ 443 (((reg) + _inc) & ((1UL << (ad_bytes << 3)) - 1)); \
444 } while (0) 444 } while (0)
445 445
446void *decode_register(u8 modrm_reg, unsigned long *regs, 446/*
447 int highbyte_regs) 447 * Given the 'reg' portion of a ModRM byte, and a register block, return a
448 * pointer into the block that addresses the relevant register.
449 * @highbyte_regs specifies whether to decode AH,CH,DH,BH.
450 */
451static void *decode_register(u8 modrm_reg, unsigned long *regs,
452 int highbyte_regs)
448{ 453{
449 void *p; 454 void *p;
450 455
diff --git a/drivers/kvm/x86_emulate.h b/drivers/kvm/x86_emulate.h
index 2847d67abfd2..574cca70b22e 100644
--- a/drivers/kvm/x86_emulate.h
+++ b/drivers/kvm/x86_emulate.h
@@ -152,12 +152,4 @@ struct x86_emulate_ctxt {
152int x86_emulate_memop(struct x86_emulate_ctxt *ctxt, 152int x86_emulate_memop(struct x86_emulate_ctxt *ctxt,
153 struct x86_emulate_ops *ops); 153 struct x86_emulate_ops *ops);
154 154
155/*
156 * Given the 'reg' portion of a ModRM byte, and a register block, return a
157 * pointer into the block that addresses the relevant register.
158 * @highbyte_regs specifies whether to decode AH,CH,DH,BH.
159 */
160void *decode_register(u8 modrm_reg, unsigned long *regs,
161 int highbyte_regs);
162
163#endif /* __X86_EMULATE_H__ */ 155#endif /* __X86_EMULATE_H__ */