From patchwork Thu Apr 21 19:16:05 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Clemens Noss X-Patchwork-Id: 725391 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p3LJGDBs010018 for ; Thu, 21 Apr 2011 19:16:14 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752632Ab1DUTQL (ORCPT ); Thu, 21 Apr 2011 15:16:11 -0400 Received: from mailout-de.gmx.net ([213.165.64.23]:47296 "HELO mailout-de.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1752385Ab1DUTQK (ORCPT ); Thu, 21 Apr 2011 15:16:10 -0400 Received: (qmail invoked by alias); 21 Apr 2011 19:16:08 -0000 Received: from p4FD8AF1D.dip.t-dialin.net (EHLO rose.darmstadt.cn-net.local) [79.216.175.29] by mail.gmx.net (mp011) with SMTP; 21 Apr 2011 21:16:08 +0200 X-Authenticated: #1094420 X-Provags-ID: V01U2FsdGVkX184tY5Lt4Y46c2ImaGA8TACXIK6ETR3xSlXE8Jo5d BsauhHufM5iL2r Received: from localhost.darmstadt.cn-net.local ([10.45.34.5]) by rose.darmstadt.cn-net.local (8.14.4/8.14.4) with ESMTP id p3LJG6WI024048; Thu, 21 Apr 2011 21:16:06 +0200 Received: from laptop10c.darmstadt.cn-net.local (localhost [127.0.0.1]) by localhost.darmstadt.cn-net.local (8.14.4/8.14.4) with ESMTP id p3LJG5In002937; Thu, 21 Apr 2011 21:16:05 +0200 From: Clemens Noss To: kvm@vger.kernel.org Cc: avi@redhat.com Subject: [PATCH] KVM: x86 emulator: avoid calling wbinvd() macro Date: Thu, 21 Apr 2011 21:16:05 +0200 Message-Id: <1303413365-2808-1-git-send-email-cnoss@gmx.de> X-Mailer: git-send-email 1.7.4.4 X-Y-GMX-Trusted: 0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Thu, 21 Apr 2011 19:16:35 +0000 (UTC) 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 --- arch/x86/kvm/emulate.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c index f683ce1..97b1a29 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c @@ -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) */