From 206c786d139c9f20a2779f99b8fd262ddea35613 Mon Sep 17 00:00:00 2001 From: Glauber Costa Date: Mar 11 2009 00:02:51 +0000 Subject: modified ppc patch --- diff --git a/kvm-upstream-ppc.patch b/kvm-upstream-ppc.patch index 723999a..5d1ca4c 100644 --- a/kvm-upstream-ppc.patch +++ b/kvm-upstream-ppc.patch @@ -1,4 +1,4 @@ -From 1efd319579c8f34974d654b0a5ac5144424e693e Mon Sep 17 00:00:00 2001 +From 796d42657fb238cf23a78620051f533662557e2b Mon Sep 17 00:00:00 2001 From: Glauber Costa Date: Fri, 13 Feb 2009 13:00:31 -0500 Subject: [PATCH] use KVM_UPSTREAM for ppc. @@ -12,10 +12,11 @@ and would break compilation. Signed-off-by: Glauber Costa --- - qemu/hw/ppc440.c | 1 + - qemu/hw/ppc440_bamboo.c | 1 + - qemu/target-ppc/helper.c | 1 + - 3 files changed, 3 insertions(+), 0 deletions(-) + hw/ppc440.c | 1 + + hw/ppc440_bamboo.c | 1 + + hw/ppce500_mpc8544ds.c | 1 + + target-ppc/helper.c | 2 +- + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/qemu/hw/ppc440.c b/qemu/hw/ppc440.c index 00d82e4..164c326 100644 @@ -41,8 +42,20 @@ index fbd447c..60ddaf4 100644 #include "kvm.h" #include "kvm_ppc.h" #include "device_tree.h" +diff --git a/qemu/hw/ppce500_mpc8544ds.c b/qemu/hw/ppce500_mpc8544ds.c +index 3d73f8a..d8ea947 100644 +--- a/qemu/hw/ppce500_mpc8544ds.c ++++ b/qemu/hw/ppce500_mpc8544ds.c +@@ -16,6 +16,7 @@ + + #include + ++#define KVM_UPSTREAM + #include "config.h" + #include "qemu-common.h" + #include "net.h" diff --git a/qemu/target-ppc/helper.c b/qemu/target-ppc/helper.c -index fc62a63..d49acaf 100644 +index 80b53eb..e8dc384 100644 --- a/qemu/target-ppc/helper.c +++ b/qemu/target-ppc/helper.c @@ -29,6 +29,7 @@ @@ -54,5 +67,5 @@ index fc62a63..d49acaf 100644 //#define DEBUG_MMU -- -1.5.6.5 +1.6.1.2 diff --git a/qemu.spec b/qemu.spec index 9d0203f..0449d5d 100644 --- a/qemu.spec +++ b/qemu.spec @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.10 -Release: 0.6.kvm20090310git%{?dist} +Release: 0.7.kvm20090310git%{?dist} # I have mistakenly thought the revision name would be 1.0. # So 0.10 series get Epoch = 1 Epoch: 2 @@ -409,6 +409,9 @@ fi %{_mandir}/man1/qemu-img.1* %changelog +* Tue Mar 10 2009 Glauber Costa - 2:0.10-0.7.kvm20090310git +- modify ppc patch + * Tue Mar 10 2009 Glauber Costa - 2:0.10-0.6.kvm20090310git - updated to kvm20090310git - removed sasl patches (already in this release)