]> Pileus Git - ~andy/linux/commitdiff
KVM: x86 emulator: Remove unused arg from read_descriptor()
authorTakuya Yoshikawa <yoshikawa.takuya@oss.ntt.co.jp>
Sun, 1 May 2011 17:25:07 +0000 (02:25 +0900)
committerAvi Kivity <avi@redhat.com>
Sun, 22 May 2011 12:47:59 +0000 (08:47 -0400)
Signed-off-by: Takuya Yoshikawa <yoshikawa.takuya@oss.ntt.co.jp>
Signed-off-by: Avi Kivity <avi@redhat.com>
arch/x86/kvm/emulate.c

index 3d0e5ac3a0c1826438f4e8b01dfb115b52a54403..c26243f6d668fbd8538baba1e1a5ddb53bd9ca21 100644 (file)
@@ -729,7 +729,6 @@ static void *decode_register(u8 modrm_reg, unsigned long *regs,
 }
 
 static int read_descriptor(struct x86_emulate_ctxt *ctxt,
-                          struct x86_emulate_ops *ops,
                           struct segmented_address addr,
                           u16 *size, unsigned long *address, int op_bytes)
 {
@@ -2720,7 +2719,7 @@ static int em_lgdt(struct x86_emulate_ctxt *ctxt)
        struct desc_ptr desc_ptr;
        int rc;
 
-       rc = read_descriptor(ctxt, ctxt->ops, c->src.addr.mem,
+       rc = read_descriptor(ctxt, c->src.addr.mem,
                             &desc_ptr.size, &desc_ptr.address,
                             c->op_bytes);
        if (rc != X86EMUL_CONTINUE)
@@ -2749,9 +2748,8 @@ static int em_lidt(struct x86_emulate_ctxt *ctxt)
        struct desc_ptr desc_ptr;
        int rc;
 
-       rc = read_descriptor(ctxt, ctxt->ops, c->src.addr.mem,
-                            &desc_ptr.size,
-                            &desc_ptr.address,
+       rc = read_descriptor(ctxt, c->src.addr.mem,
+                            &desc_ptr.size, &desc_ptr.address,
                             c->op_bytes);
        if (rc != X86EMUL_CONTINUE)
                return rc;