commit cfb223753c3750b28103136ad4d51d1a3ae4d64b
author Clemens Noss <cnoss@gmx.de> Thu Apr 21 21:16:05 2011 +0200
committer Avi Kivity <avi@redhat.com> Sun May 22 08:39:29 2011 -0400
tree 42cc3dd4692435a14360a299219c0863cd196da3
parent a38f84ca8c6991925cb8bb6371ade8df9d3cc1e6

KVM: x86 emulator: avoid calling wbinvd() macro

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

diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
index 522bc35..ccb8b38 100644
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
@@ -4092,7 +4092,7 @@
 		rc = em_clts(ctxt);
 		break;
 	case 0x09:		/* wbinvd */
-		ctxt->ops->wbinvd(ctxt);
+		(ctxt->ops->wbinvd)(ctxt);
 		break;
 	case 0x08:		/* invd */
 	case 0x0d:		/* GrpP (prefetch) */