rpms/qemu/devel qemu-fix-ppc-softmmu-kvm-disabled-build.patch, 1.2, 1.3 qemu.spec, 1.103, 1.104 qemu-fix-broken-elf-coredump-build-on-ppc.patch, 1.2, NONE

[Mark McLoughlin]

Author: markmc

Update of /cvs/pkgs/rpms/qemu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1477

Modified Files:
	qemu.spec 
Added Files:
	qemu-fix-ppc-softmmu-kvm-disabled-build.patch 
Removed Files:
	qemu-fix-broken-elf-coredump-build-on-ppc.patch 
Log Message:
Replaced the wrong patch


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

Index: qemu-fix-ppc-softmmu-kvm-disabled-build.patch
===================================================================
RCS file: qemu-fix-ppc-softmmu-kvm-disabled-build.patch
diff -N qemu-fix-ppc-softmmu-kvm-disabled-build.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ qemu-fix-ppc-softmmu-kvm-disabled-build.patch	29 Jun 2009 16:31:33 -0000	1.3
@@ -0,0 +1,97 @@
+From 398e45e57ee98e9d1a7387816b53d7038d1c3283 Mon Sep 17 00:00:00 2001
+From: Anthony Liguori <aliguori at us.ibm.com>
+Date: Wed, 24 Jun 2009 14:25:15 -0500
+Subject: [PATCH] Fix ppc-softmmu kvm-disabled build
+
+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.
+
+(cherry picked from commit 9011bae8e2101095aae53f1f1553ca3e72919f9b)
+
+Signed-off-by: Anthony Liguori <aliguori at us.ibm.com>
+Signed-off-by: Avi Kivity <avi at redhat.com>
+Signed-off-by: Mark McLoughlin <markmc at redhat.com>
+---
+ 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)
+ {
+-- 
+1.6.2.5
+


Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- qemu.spec	29 Jun 2009 16:04:48 -0000	1.103
+++ qemu.spec	29 Jun 2009 16:31:33 -0000	1.104
@@ -19,11 +19,11 @@ Source2: kvm.modules
 # Not upstream, why?
 Patch01: qemu-bios-bigger-roms.patch
 
-# Fixes linux-user build on ppc
-Patch02: qemu-fix-linux-user-build-on-ppc.patch
+# Fixes ppc-softmmu target build, cherry-picked from upstream
+Patch02: qemu-fix-ppc-softmmu-kvm-disabled-build.patch
 
 # Works around broken linux-user build on ppc
-Patch03: qemu-fix-broken-elf-coredump-build-on-ppc.patch
+Patch03: qemu-fix-linux-user-build-on-ppc.patch
 
 # Fix for hw/pcspk.c errors with --disable-kvm
 Patch04: qemu-fix-pcspk-build-with-kvm-disabled.patch


--- qemu-fix-broken-elf-coredump-build-on-ppc.patch DELETED ---