From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jerone Young <jyoung5@us.ibm.com>
Subject: Latest qemu tcg breakage
Date: Mon, 09 Jun 2008 08:53:41 -0500
Message-ID: <1213019621.6792.7.camel@thinkpadL>
Reply-To: jyoung5@us.ibm.com
Mime-Version: 1.0
Content-Type: text/plain
Content-Transfer-Encoding: 7bit
Cc: kvm-ppc-devel <kvm-ppc-devel@lists.sourceforge.net>
To: kvm <kvm@vger.kernel.org>
Return-path: <kvm-owner@vger.kernel.org>
Received: from e6.ny.us.ibm.com ([32.97.182.146]:60938 "EHLO e6.ny.us.ibm.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751315AbYFINx7 (ORCPT <rfc822;kvm@vger.kernel.org>);
	Mon, 9 Jun 2008 09:53:59 -0400
Received: from d01relay04.pok.ibm.com (d01relay04.pok.ibm.com [9.56.227.236])
	by e6.ny.us.ibm.com (8.13.8/8.13.8) with ESMTP id m59Du9Yp003517
	for <kvm@vger.kernel.org>; Mon, 9 Jun 2008 09:56:09 -0400
Received: from d01av04.pok.ibm.com (d01av04.pok.ibm.com [9.56.224.64])
	by d01relay04.pok.ibm.com (8.13.8/8.13.8/NCO v8.7) with ESMTP id m59Drgiv228118
	for <kvm@vger.kernel.org>; Mon, 9 Jun 2008 09:53:42 -0400
Received: from d01av04.pok.ibm.com (loopback [127.0.0.1])
	by d01av04.pok.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id m59DrgkX013295
	for <kvm@vger.kernel.org>; Mon, 9 Jun 2008 09:53:42 -0400
Sender: kvm-owner@vger.kernel.org
List-ID: <kvm.vger.kernel.org>

So upstream qemu is being pervasive about changes with TCG, starting to
place tcg only functions in exec.c . I've spun a quick patch that fixes
things for PowerPC when building qemu. But we need to try and isolate
TCG in upstream qemu as it is starting to leak, and I'm not sure of a
good way to fix it as there is no CONFIG defined for tcg  currently.

Just something to keep in mind.

Signed-off-by: Jerone Young <jyoung5@us.ibm.com>

diff --git a/qemu/Makefile.target b/qemu/Makefile.target
--- a/qemu/Makefile.target
+++ b/qemu/Makefile.target
@@ -196,7 +196,6 @@ LIBOBJS+=fake-exec.o
 LIBOBJS+=fake-exec.o
 else
 LIBOBJS+= translate-all.o translate.o
-endif
 ifdef CONFIG_DYNGEN_OP
 LIBOBJS+=op.o
 endif
@@ -205,6 +204,7 @@ CPPFLAGS+=-I$(SRC_PATH)/tcg -I$(SRC_PATH
 CPPFLAGS+=-I$(SRC_PATH)/tcg -I$(SRC_PATH)/tcg/$(ARCH)
 ifeq ($(ARCH),sparc64)
 CPPFLAGS+=-I$(SRC_PATH)/tcg/sparc
+endif
 endif
 
 ifeq ($(USE_KVM), 1)
diff --git a/qemu/exec.c b/qemu/exec.c
--- a/qemu/exec.c
+++ b/qemu/exec.c
@@ -37,8 +37,11 @@
 #include "exec-all.h"
 #include "qemu-common.h"
 
+#ifdef USE_KVM
+#include "qemu-kvm.h"
+#else
 #include "tcg.h"
-#include "qemu-kvm.h"
+#endif
 
 #if defined(CONFIG_USER_ONLY)
 #include <qemu.h>
@@ -3197,7 +3200,9 @@ void dump_exec_info(FILE *f,
     cpu_fprintf(f, "TB flush count      %d\n", tb_flush_count);
     cpu_fprintf(f, "TB invalidate count %d\n",
tb_phys_invalidate_count);
     cpu_fprintf(f, "TLB flush count     %d\n", tlb_flush_count);
+#if !defined(USE_KVM)
     tcg_dump_info(f, cpu_fprintf);
+#endif
 }
 
 #if !defined(CONFIG_USER_ONLY)