|
 |
58aa032 |
From 398e45e57ee98e9d1a7387816b53d7038d1c3283 Mon Sep 17 00:00:00 2001
|
|
|
58aa032 |
From: Anthony Liguori <aliguori@us.ibm.com>
|
|
|
58aa032 |
Date: Wed, 24 Jun 2009 14:25:15 -0500
|
|
|
58aa032 |
Subject: [PATCH] Fix ppc-softmmu kvm-disabled build
|
|
|
58aa032 |
|
|
|
58aa032 |
This gets ppc-softmmu building when KVM is not enabled. It may be enough to get
|
|
|
58aa032 |
it working with KVM enabled but I haven't checked.
|
|
|
58aa032 |
|
|
|
58aa032 |
(cherry picked from commit 9011bae8e2101095aae53f1f1553ca3e72919f9b)
|
|
|
58aa032 |
|
|
|
58aa032 |
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
|
|
|
58aa032 |
Signed-off-by: Avi Kivity <avi@redhat.com>
|
|
|
58aa032 |
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
|
|
|
58aa032 |
---
|
|
|
58aa032 |
hw/ppc440.c | 1 +
|
|
|
58aa032 |
hw/ppc440_bamboo.c | 1 +
|
|
|
58aa032 |
hw/ppce500_mpc8544ds.c | 1 +
|
|
|
58aa032 |
qemu-kvm.h | 1 +
|
|
|
58aa032 |
target-ppc/helper.c | 1 +
|
|
|
58aa032 |
target-ppc/machine.c | 1 +
|
|
|
58aa032 |
6 files changed, 6 insertions(+), 0 deletions(-)
|
|
|
58aa032 |
|
|
|
58aa032 |
diff --git a/hw/ppc440.c b/hw/ppc440.c
|
|
|
58aa032 |
index 00d82e4..c2c9e65 100644
|
|
|
58aa032 |
--- a/hw/ppc440.c
|
|
|
58aa032 |
+++ b/hw/ppc440.c
|
|
|
58aa032 |
@@ -19,6 +19,7 @@
|
|
|
58aa032 |
#include "ppc405.h"
|
|
|
58aa032 |
#include "sysemu.h"
|
|
|
58aa032 |
#include "kvm.h"
|
|
|
58aa032 |
+#include "qemu-kvm.h"
|
|
|
58aa032 |
|
|
|
58aa032 |
#define PPC440EP_PCI_CONFIG 0xeec00000
|
|
|
58aa032 |
#define PPC440EP_PCI_INTACK 0xeed00000
|
|
|
58aa032 |
diff --git a/hw/ppc440_bamboo.c b/hw/ppc440_bamboo.c
|
|
|
58aa032 |
index 00aa2c7..e4aad39 100644
|
|
|
58aa032 |
--- a/hw/ppc440_bamboo.c
|
|
|
58aa032 |
+++ b/hw/ppc440_bamboo.c
|
|
|
58aa032 |
@@ -22,6 +22,7 @@
|
|
|
58aa032 |
#include "kvm.h"
|
|
|
58aa032 |
#include "kvm_ppc.h"
|
|
|
58aa032 |
#include "device_tree.h"
|
|
|
58aa032 |
+#include "qemu-kvm.h"
|
|
|
58aa032 |
|
|
|
58aa032 |
#define BINARY_DEVICE_TREE_FILE "bamboo.dtb"
|
|
|
58aa032 |
|
|
|
58aa032 |
diff --git a/hw/ppce500_mpc8544ds.c b/hw/ppce500_mpc8544ds.c
|
|
|
58aa032 |
index d9ed36c..1099b99 100644
|
|
|
58aa032 |
--- a/hw/ppce500_mpc8544ds.c
|
|
|
58aa032 |
+++ b/hw/ppce500_mpc8544ds.c
|
|
|
58aa032 |
@@ -29,6 +29,7 @@
|
|
|
58aa032 |
#include "device_tree.h"
|
|
|
58aa032 |
#include "openpic.h"
|
|
|
58aa032 |
#include "ppce500.h"
|
|
|
58aa032 |
+#include "qemu-kvm.h"
|
|
|
58aa032 |
|
|
|
58aa032 |
#define BINARY_DEVICE_TREE_FILE "mpc8544ds.dtb"
|
|
|
58aa032 |
#define UIMAGE_LOAD_BASE 0
|
|
|
58aa032 |
diff --git a/qemu-kvm.h b/qemu-kvm.h
|
|
|
58aa032 |
index 68a5b40..9341d0c 100644
|
|
|
58aa032 |
--- a/qemu-kvm.h
|
|
|
58aa032 |
+++ b/qemu-kvm.h
|
|
|
58aa032 |
@@ -169,6 +169,7 @@ int kvm_has_sync_mmu(void);
|
|
|
58aa032 |
void kvm_init_vcpu(CPUState *env);
|
|
|
58aa032 |
void kvm_load_tsc(CPUState *env);
|
|
|
58aa032 |
#else
|
|
|
58aa032 |
+#define kvm_has_sync_mmu() (0)
|
|
|
58aa032 |
#define kvm_enabled() (0)
|
|
|
58aa032 |
#define kvm_nested 0
|
|
|
58aa032 |
#define qemu_kvm_irqchip_in_kernel() (0)
|
|
|
58aa032 |
diff --git a/target-ppc/helper.c b/target-ppc/helper.c
|
|
|
58aa032 |
index 5a7a935..3629c99 100644
|
|
|
58aa032 |
--- a/target-ppc/helper.c
|
|
|
58aa032 |
+++ b/target-ppc/helper.c
|
|
|
58aa032 |
@@ -29,6 +29,7 @@
|
|
|
58aa032 |
#include "helper_regs.h"
|
|
|
58aa032 |
#include "qemu-common.h"
|
|
|
58aa032 |
#include "kvm.h"
|
|
|
58aa032 |
+#include "qemu-kvm.h"
|
|
|
58aa032 |
|
|
|
58aa032 |
//#define DEBUG_MMU
|
|
|
58aa032 |
//#define DEBUG_BATS
|
|
|
58aa032 |
diff --git a/target-ppc/machine.c b/target-ppc/machine.c
|
|
|
58aa032 |
index 99ba3eb..ec8e197 100644
|
|
|
58aa032 |
--- a/target-ppc/machine.c
|
|
|
58aa032 |
+++ b/target-ppc/machine.c
|
|
|
58aa032 |
@@ -1,6 +1,7 @@
|
|
|
58aa032 |
#include "hw/hw.h"
|
|
|
58aa032 |
#include "hw/boards.h"
|
|
|
58aa032 |
#include "kvm.h"
|
|
|
58aa032 |
+#include "qemu-kvm.h"
|
|
|
58aa032 |
|
|
|
58aa032 |
void cpu_save(QEMUFile *f, void *opaque)
|
|
|
58aa032 |
{
|
|
|
58aa032 |
--
|
|
|
58aa032 |
1.6.2.5
|
|
|
58aa032 |
|