From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LY2Rm-0006km-6J for qemu-devel@nongnu.org; Fri, 13 Feb 2009 13:07:30 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LY2Rl-0006k2-Od for qemu-devel@nongnu.org; Fri, 13 Feb 2009 13:07:29 -0500 Received: from [199.232.76.173] (port=51899 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LY2Rl-0006jq-Bm for qemu-devel@nongnu.org; Fri, 13 Feb 2009 13:07:29 -0500 Received: from mx2.redhat.com ([66.187.237.31]:36914) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1LY2Rk-0007n4-TZ for qemu-devel@nongnu.org; Fri, 13 Feb 2009 13:07:29 -0500 From: Glauber Costa Date: Fri, 13 Feb 2009 13:07:26 -0500 Message-Id: <1234548446-30006-1-git-send-email-glommer@redhat.com> Subject: [Qemu-devel] [PATCH] use KVM_UPSTREAM for ppc. Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: kvm@vger.kernel.org Cc: qemu-devel@nongnu.org, hollisb@us.ibm.com, avi@redhat.com ppc should compile with upstream qemu code, so, put these defines in ppc specific code that references kvm functions. We don put them in config.h in this case, since there are files (like vl.c) that includes both kvm.h and qemu-kvm.h, and would break compilation. Signed-off-by: Glauber Costa --- qemu/hw/ppc440.c | 1 + qemu/hw/ppc440_bamboo.c | 1 + qemu/target-ppc/helper.c | 1 + 3 files changed, 3 insertions(+), 0 deletions(-) diff --git a/qemu/hw/ppc440.c b/qemu/hw/ppc440.c index 00d82e4..164c326 100644 --- a/qemu/hw/ppc440.c +++ b/qemu/hw/ppc440.c @@ -18,6 +18,7 @@ #include "ppc440.h" #include "ppc405.h" #include "sysemu.h" +#define KVM_UPSTREAM #include "kvm.h" #define PPC440EP_PCI_CONFIG 0xeec00000 diff --git a/qemu/hw/ppc440_bamboo.c b/qemu/hw/ppc440_bamboo.c index fbd447c..60ddaf4 100644 --- a/qemu/hw/ppc440_bamboo.c +++ b/qemu/hw/ppc440_bamboo.c @@ -21,6 +21,7 @@ #include "boards.h" #include "sysemu.h" #include "ppc440.h" +#define KVM_UPSTREAM #include "kvm.h" #include "kvm_ppc.h" #include "device_tree.h" diff --git a/qemu/target-ppc/helper.c b/qemu/target-ppc/helper.c index fc62a63..d49acaf 100644 --- a/qemu/target-ppc/helper.c +++ b/qemu/target-ppc/helper.c @@ -29,6 +29,7 @@ #include "exec-all.h" #include "helper_regs.h" #include "qemu-common.h" +#define KVM_UPSTREAM #include "kvm.h" //#define DEBUG_MMU -- 1.5.6.5