[fedora-virt-maint] rpms/qemu/F-11 qemu-ppc-on-ppc.patch, NONE, 1.1 qemu-roms-more-room.patch, 1.4, 1.5 qemu.spec, 1.97, 1.98

[Mark McLoughlin]

Author: markmc

Update of /cvs/pkgs/rpms/qemu/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9086

Modified Files:
	qemu-roms-more-room.patch qemu.spec 
Added Files:
	qemu-ppc-on-ppc.patch 
Log Message:
* Wed Jun 17 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.5-3
- ppc-on-ppc fix (#504273)
- Fix -kernel regression (#506443)


qemu-ppc-on-ppc.patch:

--- NEW FILE qemu-ppc-on-ppc.patch ---
>From d19076faca944c31bb051b95d285e75ec67902f7 Mon Sep 17 00:00:00 2001
From: malc <malc at c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Thu, 2 Apr 2009 01:16:39 +0000
Subject: [PATCH 1/1] Temporary workaround for ppc on ppc

target-ppc/translate.c puts values of type opcode_t into .opcodes
section, using GCC extension to do so, and hoping that this will make
them appear contiguously and in the source order in the resulting
executable. This assumption is not safe and is known to be violated
with certain versions of GCC, certain flags passed to it and on
certain platforms (gcc 4.3.0, -O and PPC/PPC64 for instance)

The workaround consists of adding -fno-unit-at-a-time to the list of
GCC command line options while building PPC translate.o on a PPC.

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6967 c046a42c-6fe2-441c-8c8c-71466251a162
---
 Makefile.target |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/Makefile.target b/Makefile.target
index 046427d..e855dc3 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -91,6 +91,10 @@ ifeq ($(ARCH),i386)
 HELPER_CFLAGS+=-fomit-frame-pointer
 endif
 
+ifeq ($(subst ppc64,ppc,$(ARCH))$(TARGET_BASE_ARCH),ppcppc)
+translate.o: CFLAGS := $(CFLAGS) $(call cc-option, $(CFLAGS), -fno-unit-at-a-time,)
+endif
+
 ifeq ($(ARCH),sparc)
   CFLAGS+=-ffixed-g2 -ffixed-g3
   ifneq ($(CONFIG_SOLARIS),yes)
-- 
1.6.0.6


qemu-roms-more-room.patch:

Index: qemu-roms-more-room.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-11/qemu-roms-more-room.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- qemu-roms-more-room.patch	31 May 2009 14:42:34 -0000	1.4
+++ qemu-roms-more-room.patch	17 Jun 2009 12:02:48 -0000	1.5
@@ -31,10 +31,9 @@ git-svn-id: svn://svn.savannah.nongnu.or
  hw/pc.c |   29 +++++++++++++++++++----------
  1 files changed, 19 insertions(+), 10 deletions(-)
 
-Index: qemu-kvm-0.10.5/hw/pc.c
-===================================================================
---- qemu-kvm-0.10.5.orig/hw/pc.c
-+++ qemu-kvm-0.10.5/hw/pc.c
+diff -up qemu-kvm-0.10.5/hw/pc.c.roms-more-room qemu-kvm-0.10.5/hw/pc.c
+--- qemu-kvm-0.10.5/hw/pc.c.roms-more-room	2009-06-17 12:54:43.000000000 +0100
++++ qemu-kvm-0.10.5/hw/pc.c	2009-06-17 12:55:43.000000000 +0100
 @@ -818,7 +818,7 @@ static void pc_init1(ram_addr_t ram_size
  {
      char buf[1024];
@@ -95,7 +94,8 @@ Index: qemu-kvm-0.10.5/hw/pc.c
 -            cpu_register_physical_memory(0xd0000, TARGET_PAGE_SIZE,
 +            cpu_register_physical_memory(option_rom_start, TARGET_PAGE_SIZE,
                                           option_rom_offset);
-             load_linux(0xd0000,
+-            load_linux(0xd0000,
++            load_linux(option_rom_offset,
                         kernel_filename, initrd_filename, kernel_cmdline, below_4g_mem_size);
 -            offset = TARGET_PAGE_SIZE;
 +            offset += TARGET_PAGE_SIZE;


Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-11/qemu.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- qemu.spec	3 Jun 2009 15:04:28 -0000	1.97
+++ qemu.spec	17 Jun 2009 12:02:48 -0000	1.98
@@ -1,7 +1,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.10.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 # Epoch because we pushed a qemu-1.0 package
 Epoch: 2
 License: GPLv2+ and LGPLv2+ and BSD
@@ -30,6 +30,7 @@ Patch14: qemu-kvm-fix-kerneldir-includes
 Patch15: qemu-fix-net-socket-list-init.patch
 Patch16: qemu-prevent-cdrom-media-eject-while-device-is-locked.patch
 Patch17: qemu-avoid-harmless-msr-warnings.patch
+Patch18: qemu-ppc-on-ppc.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel
@@ -227,6 +228,7 @@ such as kvmtrace and kvm_stat.
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
+%patch18 -p1
 
 %build
 # systems like rhel build system does not have a recent enough linker so
@@ -469,6 +471,10 @@ fi
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Wed Jun 17 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.5-3
+- ppc-on-ppc fix (#504273)
+- Fix -kernel regression (#506443)
+
 * Wed Jun  3 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.5-2
 - Prevent locked cdrom eject - fixes hang at end of anaconda installs (#501412)
 - Fix crash with '-net socket,listen=...' (#501264)