diff options
author | Takuya Yoshikawa <yoshikawa.takuya@oss.ntt.co.jp> | 2011-05-01 13:25:07 -0400 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2011-05-22 08:47:59 -0400 |
commit | 509cf9fe11dad85f96944095ed63b2caa85cdfc9 (patch) | |
tree | e511bd5f883c037d99a3c787f22320cb98c3d8d0 /arch | |
parent | c1ed6dea8113597cfa00911faa814d9dbb586932 (diff) |
KVM: x86 emulator: Remove unused arg from read_descriptor()
Signed-off-by: Takuya Yoshikawa <yoshikawa.takuya@oss.ntt.co.jp>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/kvm/emulate.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c index 3d0e5ac3a0c1..c26243f6d668 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c | |||
@@ -729,7 +729,6 @@ static void *decode_register(u8 modrm_reg, unsigned long *regs, | |||
729 | } | 729 | } |
730 | 730 | ||
731 | static int read_descriptor(struct x86_emulate_ctxt *ctxt, | 731 | static int read_descriptor(struct x86_emulate_ctxt *ctxt, |
732 | struct x86_emulate_ops *ops, | ||
733 | struct segmented_address addr, | 732 | struct segmented_address addr, |
734 | u16 *size, unsigned long *address, int op_bytes) | 733 | u16 *size, unsigned long *address, int op_bytes) |
735 | { | 734 | { |
@@ -2720,7 +2719,7 @@ static int em_lgdt(struct x86_emulate_ctxt *ctxt) | |||
2720 | struct desc_ptr desc_ptr; | 2719 | struct desc_ptr desc_ptr; |
2721 | int rc; | 2720 | int rc; |
2722 | 2721 | ||
2723 | rc = read_descriptor(ctxt, ctxt->ops, c->src.addr.mem, | 2722 | rc = read_descriptor(ctxt, c->src.addr.mem, |
2724 | &desc_ptr.size, &desc_ptr.address, | 2723 | &desc_ptr.size, &desc_ptr.address, |
2725 | c->op_bytes); | 2724 | c->op_bytes); |
2726 | if (rc != X86EMUL_CONTINUE) | 2725 | if (rc != X86EMUL_CONTINUE) |
@@ -2749,9 +2748,8 @@ static int em_lidt(struct x86_emulate_ctxt *ctxt) | |||
2749 | struct desc_ptr desc_ptr; | 2748 | struct desc_ptr desc_ptr; |
2750 | int rc; | 2749 | int rc; |
2751 | 2750 | ||
2752 | rc = read_descriptor(ctxt, ctxt->ops, c->src.addr.mem, | 2751 | rc = read_descriptor(ctxt, c->src.addr.mem, |
2753 | &desc_ptr.size, | 2752 | &desc_ptr.size, &desc_ptr.address, |
2754 | &desc_ptr.address, | ||
2755 | c->op_bytes); | 2753 | c->op_bytes); |
2756 | if (rc != X86EMUL_CONTINUE) | 2754 | if (rc != X86EMUL_CONTINUE) |
2757 | return rc; | 2755 | return rc; |