dcavalca / rpms / qemu

Forked from rpms/qemu a year ago
Clone

Blame qemu-fix-ppc-softmmu-kvm-disabled-build.patch

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