dcavalca / rpms / qemu

Forked from rpms/qemu a year ago
Clone

Blame kvm-upstream-ppc.patch

Glauber Costa 8571d0
From 1efd319579c8f34974d654b0a5ac5144424e693e 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 8571d0
 qemu/hw/ppc440.c         |    1 +
Glauber Costa 8571d0
 qemu/hw/ppc440_bamboo.c  |    1 +
Glauber Costa 8571d0
 qemu/target-ppc/helper.c |    1 +
Glauber Costa 8571d0
 3 files changed, 3 insertions(+), 0 deletions(-)
Glauber Costa 8571d0
Glauber Costa 8571d0
diff --git a/qemu/hw/ppc440.c b/qemu/hw/ppc440.c
Glauber Costa 8571d0
index 00d82e4..164c326 100644
Glauber Costa 8571d0
--- a/qemu/hw/ppc440.c
Glauber Costa 8571d0
+++ b/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 8571d0
diff --git a/qemu/hw/ppc440_bamboo.c b/qemu/hw/ppc440_bamboo.c
Glauber Costa 8571d0
index fbd447c..60ddaf4 100644
Glauber Costa 8571d0
--- a/qemu/hw/ppc440_bamboo.c
Glauber Costa 8571d0
+++ b/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 8571d0
diff --git a/qemu/target-ppc/helper.c b/qemu/target-ppc/helper.c
Glauber Costa 8571d0
index fc62a63..d49acaf 100644
Glauber Costa 8571d0
--- a/qemu/target-ppc/helper.c
Glauber Costa 8571d0
+++ b/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
Glauber Costa 8571d0
-- 
Glauber Costa 8571d0
1.5.6.5
Glauber Costa 8571d0