Blame kvm-upstream-ppc.patch

Glauber Costa 206c78
From 796d42657fb238cf23a78620051f533662557e2b Mon Sep 17 00:00:00 2001
Glauber Costa 8571d0
From: Glauber Costa <glommer@redhat.com>
Glauber Costa 8571d0
Date: Fri, 13 Feb 2009 13:00:31 -0500
Glauber Costa 8571d0
Subject: [PATCH] use KVM_UPSTREAM for ppc.
Glauber Costa 8571d0
Glauber Costa 8571d0
ppc should compile with upstream qemu code, so, put these
Glauber Costa 8571d0
defines in ppc specific code that references kvm functions.
Glauber Costa 8571d0
Glauber Costa 8571d0
We don put them in config.h in this case, since there are
Glauber Costa 8571d0
files (like vl.c) that includes both kvm.h and qemu-kvm.h,
Glauber Costa 8571d0
and would break compilation.
Glauber Costa 8571d0
Glauber Costa 8571d0
Signed-off-by: Glauber Costa <glommer@redhat.com>
Glauber Costa 8571d0
---
Glauber Costa 206c78
 hw/ppc440.c            |    1 +
Glauber Costa 206c78
 hw/ppc440_bamboo.c     |    1 +
Glauber Costa 206c78
 hw/ppce500_mpc8544ds.c |    1 +
Glauber Costa 206c78
 target-ppc/helper.c    |    2 +-
Glauber Costa 206c78
 4 files changed, 4 insertions(+), 1 deletion(-)
Glauber Costa 8571d0
Glauber Costa 47b075
Index: qemu-kvm-0.10/qemu/hw/ppc440.c
Glauber Costa 47b075
===================================================================
Glauber Costa 47b075
--- qemu-kvm-0.10.orig/qemu/hw/ppc440.c
Glauber Costa 47b075
+++ qemu-kvm-0.10/qemu/hw/ppc440.c
Glauber Costa 8571d0
@@ -18,6 +18,7 @@
Glauber Costa 8571d0
 #include "ppc440.h"
Glauber Costa 8571d0
 #include "ppc405.h"
Glauber Costa 8571d0
 #include "sysemu.h"
Glauber Costa 8571d0
+#define KVM_UPSTREAM
Glauber Costa 8571d0
 #include "kvm.h"
Glauber Costa 8571d0
 
Glauber Costa 8571d0
 #define PPC440EP_PCI_CONFIG     0xeec00000
Glauber Costa 47b075
Index: qemu-kvm-0.10/qemu/hw/ppc440_bamboo.c
Glauber Costa 47b075
===================================================================
Glauber Costa 47b075
--- qemu-kvm-0.10.orig/qemu/hw/ppc440_bamboo.c
Glauber Costa 47b075
+++ qemu-kvm-0.10/qemu/hw/ppc440_bamboo.c
Glauber Costa 8571d0
@@ -21,6 +21,7 @@
Glauber Costa 8571d0
 #include "boards.h"
Glauber Costa 8571d0
 #include "sysemu.h"
Glauber Costa 8571d0
 #include "ppc440.h"
Glauber Costa 8571d0
+#define KVM_UPSTREAM
Glauber Costa 8571d0
 #include "kvm.h"
Glauber Costa 8571d0
 #include "kvm_ppc.h"
Glauber Costa 8571d0
 #include "device_tree.h"
Glauber Costa 47b075
Index: qemu-kvm-0.10/qemu/hw/ppce500_mpc8544ds.c
Glauber Costa 47b075
===================================================================
Glauber Costa 47b075
--- qemu-kvm-0.10.orig/qemu/hw/ppce500_mpc8544ds.c
Glauber Costa 47b075
+++ qemu-kvm-0.10/qemu/hw/ppce500_mpc8544ds.c
Glauber Costa 206c78
@@ -16,6 +16,7 @@
Glauber Costa 206c78
 
Glauber Costa 206c78
 #include <dirent.h>
Glauber Costa 206c78
 
Glauber Costa 206c78
+#define KVM_UPSTREAM
Glauber Costa 206c78
 #include "config.h"
Glauber Costa 206c78
 #include "qemu-common.h"
Glauber Costa 206c78
 #include "net.h"
Glauber Costa 47b075
Index: qemu-kvm-0.10/qemu/target-ppc/helper.c
Glauber Costa 47b075
===================================================================
Glauber Costa 47b075
--- qemu-kvm-0.10.orig/qemu/target-ppc/helper.c
Glauber Costa 47b075
+++ qemu-kvm-0.10/qemu/target-ppc/helper.c
Glauber Costa 8571d0
@@ -29,6 +29,7 @@
Glauber Costa 8571d0
 #include "exec-all.h"
Glauber Costa 8571d0
 #include "helper_regs.h"
Glauber Costa 8571d0
 #include "qemu-common.h"
Glauber Costa 8571d0
+#define KVM_UPSTREAM
Glauber Costa 8571d0
 #include "kvm.h"
Glauber Costa 8571d0
 
Glauber Costa 8571d0
 //#define DEBUG_MMU