From patchwork Wed Jun 24 19:25:15 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony Liguori X-Patchwork-Id: 32234 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n5OJPLTm004802 for ; Wed, 24 Jun 2009 19:25:22 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753605AbZFXTZQ (ORCPT ); Wed, 24 Jun 2009 15:25:16 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753428AbZFXTZQ (ORCPT ); Wed, 24 Jun 2009 15:25:16 -0400 Received: from e8.ny.us.ibm.com ([32.97.182.138]:54282 "EHLO e8.ny.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753002AbZFXTZO (ORCPT ); Wed, 24 Jun 2009 15:25:14 -0400 Received: from d01relay04.pok.ibm.com (d01relay04.pok.ibm.com [9.56.227.236]) by e8.ny.us.ibm.com (8.13.1/8.13.1) with ESMTP id n5OJEX5h022450 for ; Wed, 24 Jun 2009 15:14:33 -0400 Received: from d01av02.pok.ibm.com (d01av02.pok.ibm.com [9.56.224.216]) by d01relay04.pok.ibm.com (8.13.8/8.13.8/NCO v9.2) with ESMTP id n5OJPHch252318 for ; Wed, 24 Jun 2009 15:25:17 -0400 Received: from d01av02.pok.ibm.com (loopback [127.0.0.1]) by d01av02.pok.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id n5OJMspj008317 for ; Wed, 24 Jun 2009 15:22:55 -0400 Received: from localhost.localdomain (sig-9-48-84-240.mts.ibm.com [9.48.84.240]) by d01av02.pok.ibm.com (8.12.11.20060308/8.12.11) with ESMTP id n5OJMrRg008253; Wed, 24 Jun 2009 15:22:54 -0400 From: Anthony Liguori To: kvm@vger.kernel.org Cc: Avi Kivity , Dustin Kirkland , Hollis Blanchard , Anthony Liguori Subject: [PATCH] Fix ppc-softmmu build Date: Wed, 24 Jun 2009 14:25:15 -0500 Message-Id: <1245871515-4030-1-git-send-email-aliguori@us.ibm.com> X-Mailer: git-send-email 1.6.2.5 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org This gets ppc-softmmu building when KVM is not enabled. It may be enough to get it working with KVM enabled but I haven't checked. Signed-off-by: Anthony Liguori --- hw/ppc440.c | 1 + hw/ppc440_bamboo.c | 1 + hw/ppce500_mpc8544ds.c | 1 + qemu-kvm.h | 1 + target-ppc/helper.c | 1 + target-ppc/machine.c | 1 + 6 files changed, 6 insertions(+), 0 deletions(-) diff --git a/hw/ppc440.c b/hw/ppc440.c index 00d82e4..c2c9e65 100644 --- a/hw/ppc440.c +++ b/hw/ppc440.c @@ -19,6 +19,7 @@ #include "ppc405.h" #include "sysemu.h" #include "kvm.h" +#include "qemu-kvm.h" #define PPC440EP_PCI_CONFIG 0xeec00000 #define PPC440EP_PCI_INTACK 0xeed00000 diff --git a/hw/ppc440_bamboo.c b/hw/ppc440_bamboo.c index 00aa2c7..e4aad39 100644 --- a/hw/ppc440_bamboo.c +++ b/hw/ppc440_bamboo.c @@ -22,6 +22,7 @@ #include "kvm.h" #include "kvm_ppc.h" #include "device_tree.h" +#include "qemu-kvm.h" #define BINARY_DEVICE_TREE_FILE "bamboo.dtb" diff --git a/hw/ppce500_mpc8544ds.c b/hw/ppce500_mpc8544ds.c index d9ed36c..1099b99 100644 --- a/hw/ppce500_mpc8544ds.c +++ b/hw/ppce500_mpc8544ds.c @@ -29,6 +29,7 @@ #include "device_tree.h" #include "openpic.h" #include "ppce500.h" +#include "qemu-kvm.h" #define BINARY_DEVICE_TREE_FILE "mpc8544ds.dtb" #define UIMAGE_LOAD_BASE 0 diff --git a/qemu-kvm.h b/qemu-kvm.h index 68a5b40..9341d0c 100644 --- a/qemu-kvm.h +++ b/qemu-kvm.h @@ -169,6 +169,7 @@ int kvm_has_sync_mmu(void); void kvm_init_vcpu(CPUState *env); void kvm_load_tsc(CPUState *env); #else +#define kvm_has_sync_mmu() (0) #define kvm_enabled() (0) #define kvm_nested 0 #define qemu_kvm_irqchip_in_kernel() (0) diff --git a/target-ppc/helper.c b/target-ppc/helper.c index 5a7a935..3629c99 100644 --- a/target-ppc/helper.c +++ b/target-ppc/helper.c @@ -29,6 +29,7 @@ #include "helper_regs.h" #include "qemu-common.h" #include "kvm.h" +#include "qemu-kvm.h" //#define DEBUG_MMU //#define DEBUG_BATS diff --git a/target-ppc/machine.c b/target-ppc/machine.c index 99ba3eb..ec8e197 100644 --- a/target-ppc/machine.c +++ b/target-ppc/machine.c @@ -1,6 +1,7 @@ #include "hw/hw.h" #include "hw/boards.h" #include "kvm.h" +#include "qemu-kvm.h" void cpu_save(QEMUFile *f, void *opaque) {