]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
KVM: x86 emulator: avoid calling wbinvd() macro
authorClemens Noss <cnoss@gmx.de>
Thu, 21 Apr 2011 19:16:05 +0000 (21:16 +0200)
committerAvi Kivity <avi@redhat.com>
Sun, 22 May 2011 12:39:29 +0000 (08:39 -0400)
Commit 0b56652e33c72092956c651ab6ceb9f0ad081153 fails to build:

  CC [M]  arch/x86/kvm/emulate.o
arch/x86/kvm/emulate.c: In function 'x86_emulate_insn':
arch/x86/kvm/emulate.c:4095:25: error: macro "wbinvd" passed 1 arguments, but takes just 0
arch/x86/kvm/emulate.c:4095:3: warning: statement with no effect
make[2]: *** [arch/x86/kvm/emulate.o] Error 1
make[1]: *** [arch/x86/kvm] Error 2
make: *** [arch/x86] Error 2

Work around this for now.

Signed-off-by: Clemens Noss <cnoss@gmx.de>
Signed-off-by: Avi Kivity <avi@redhat.com>
arch/x86/kvm/emulate.c

index 522bc35d290c9fffe298f22cb88197f2843fd76b..ccb8b383beab8524539c653b25299384f88f5416 100644 (file)
@@ -4092,7 +4092,7 @@ twobyte_insn:
                rc = em_clts(ctxt);
                break;
        case 0x09:              /* wbinvd */
-               ctxt->ops->wbinvd(ctxt);
+               (ctxt->ops->wbinvd)(ctxt);
                break;
        case 0x08:              /* invd */
        case 0x0d:              /* GrpP (prefetch) */