[fedora-virt-maint] rpms/qemu/devel kvm-upstream-ppc.patch, 1.5, 1.6 qemu-bios-bigger-roms.patch, 1.3, 1.4 qemu.spec, 1.98, 1.99 sources, 1.16, 1.17 qemu-avoid-harmless-msr-warnings.patch, 1.2, NONE qemu-disable-preadv.patch, 1.3, NONE qemu-fix-arm-framebuffer-build.patch, 1.3, NONE qemu-fix-cpuid-trimming.patch, 1.2, NONE qemu-prevent-cdrom-media-eject-while-device-is-locked.patch, 1.2, NONE

[Mark McLoughlin]

Author: markmc

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

Modified Files:
	kvm-upstream-ppc.patch qemu-bios-bigger-roms.patch qemu.spec 
	sources 
Removed Files:
	qemu-avoid-harmless-msr-warnings.patch 
	qemu-disable-preadv.patch qemu-fix-arm-framebuffer-build.patch 
	qemu-fix-cpuid-trimming.patch 
	qemu-prevent-cdrom-media-eject-while-device-is-locked.patch 
Log Message:
Doesn't build yet:

  In file included from /git/qemu-kvm/hw/ppc440.c:23:
  ../kvm.h:35: error: conflicting types for ‘kvm_init’
  ../libkvm-all.h:180: note: previous declaration of ‘kvm_init’ was here

* Sat Jun 27 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.50-7.kvm87
- Update to kvm-87
- Drop upstreamed patches
- Re-enable preadv()/pwritev() since #497429 is long since fixed



kvm-upstream-ppc.patch:

Index: kvm-upstream-ppc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/kvm-upstream-ppc.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- kvm-upstream-ppc.patch	24 Jun 2009 16:22:39 -0000	1.5
+++ kvm-upstream-ppc.patch	27 Jun 2009 15:10:12 -0000	1.6
@@ -1,7 +1,7 @@
-From b16ca7f06c09f46cc6dda7c49a31edc9a3325956 Mon Sep 17 00:00:00 2001
+From d1f92ec1f31fa25b447c8c54ccb36f33da97af69 Mon Sep 17 00:00:00 2001
 From: Glauber Costa <glommer at redhat.com>
 Date: Wed, 24 Jun 2009 14:22:57 +0100
-Subject: [PATCH 1/7] use KVM_UPSTREAM for ppc.
+Subject: [PATCH] use KVM_UPSTREAM for ppc.
 
 ppc should compile with upstream qemu code, so, put these
 defines in ppc specific code that references kvm functions.
@@ -32,10 +32,10 @@ index 00d82e4..164c326 100644
  
  #define PPC440EP_PCI_CONFIG     0xeec00000
 diff --git a/hw/ppc440_bamboo.c b/hw/ppc440_bamboo.c
-index 6963309..cf5b35b 100644
+index 00aa2c7..565571d 100644
 --- a/hw/ppc440_bamboo.c
 +++ b/hw/ppc440_bamboo.c
-@@ -21,6 +21,7 @@
+@@ -19,6 +19,7 @@
  #include "boards.h"
  #include "sysemu.h"
  #include "ppc440.h"
@@ -44,7 +44,7 @@ index 6963309..cf5b35b 100644
  #include "kvm_ppc.h"
  #include "device_tree.h"
 diff --git a/hw/ppce500_mpc8544ds.c b/hw/ppce500_mpc8544ds.c
-index d946f03..4692c96 100644
+index d9ed36c..49cc135 100644
 --- a/hw/ppce500_mpc8544ds.c
 +++ b/hw/ppce500_mpc8544ds.c
 @@ -16,6 +16,7 @@
@@ -56,10 +56,10 @@ index d946f03..4692c96 100644
  #include "qemu-common.h"
  #include "net.h"
 diff --git a/target-ppc/helper.c b/target-ppc/helper.c
-index db765e3..721d467 100644
+index 5a7a935..c150432 100644
 --- a/target-ppc/helper.c
 +++ b/target-ppc/helper.c
-@@ -29,6 +29,7 @@
+@@ -28,6 +28,7 @@
  #include "exec-all.h"
  #include "helper_regs.h"
  #include "qemu-common.h"

qemu-bios-bigger-roms.patch:

Index: qemu-bios-bigger-roms.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu-bios-bigger-roms.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- qemu-bios-bigger-roms.patch	24 Jun 2009 16:22:39 -0000	1.3
+++ qemu-bios-bigger-roms.patch	27 Jun 2009 15:10:13 -0000	1.4
@@ -1,7 +1,7 @@
-From 3a9288fab031a820afa7be96e355c28ded1546bf Mon Sep 17 00:00:00 2001
+From f5042b31db5e1270f7bd96a6f4b20fd63dcb013b Mon Sep 17 00:00:00 2001
 From: Glauber Costa <glommer at redhat.com>
 Date: Wed, 24 Jun 2009 14:31:41 +0100
-Subject: [PATCH 2/7] compute checksum for roms bigger than a segment
+Subject: [PATCH] compute checksum for roms bigger than a segment
 
 Some option roms (e1000 provided by gpxe project as an example)
 are bigger than a segment. The current algorithm to compute the


Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- qemu.spec	5 Jun 2009 09:32:34 -0000	1.98
+++ qemu.spec	27 Jun 2009 15:10:13 -0000	1.99
@@ -1,11 +1,11 @@
-%define kvmvernum  86
+%define kvmvernum  87
 %define kvmvertag  kvm%{kvmvernum}
 %define kvmverfull kvm-devel-%{kvmvernum}
 
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.10.50
-Release: 6.%{kvmvertag}%{?dist}
+Release: 7.%{kvmvertag}%{?dist}
 # Epoch because we pushed a qemu-1.0 package
 Epoch: 2
 License: GPLv2+ and LGPLv2+ and BSD
@@ -22,21 +22,6 @@ Patch01: kvm-upstream-ppc.patch
 # Not upstream, why?
 Patch02: qemu-bios-bigger-roms.patch
 
-# kvm-85 build fix, submitted upstream
-Patch03: qemu-fix-arm-framebuffer-build.patch
-
-# Disable preadv()/pwritev() until bug #497429 is fixed
-Patch04: qemu-disable-preadv.patch
-
-# Fix hang at end of anaconda cd installs (#50142)
-Patch05: qemu-prevent-cdrom-media-eject-while-device-is-locked.patch
-
-# Avoid harmless "unhandled wrmsr" warnings (#499712)
-Patch06: qemu-avoid-harmless-msr-warnings.patch
-
-# Fix from upstream for "kernel requires an x86-64 CPU" error
-Patch07: qemu-fix-cpuid-trimming.patch
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel
 BuildRequires: rsync dev86 iasl
@@ -219,11 +204,6 @@ such as kvmtrace and kvm_stat.
 
 %patch01 -p1 -b .kvm-upstream-ppc
 %patch02 -p1 -b .bios-bigger-roms
-%patch03 -p1 -b .framebuffer-build-fix
-%patch04 -p1 -b .disable-preadv
-%patch05 -p1 -b .prevent-cdrom-eject
-%patch06 -p1 -b .wrmsr-warnings
-%patch07 -p1 -b .cpuid-trimming
 
 %build
 # systems like rhel build system does not have a recent enough linker so
@@ -467,6 +447,11 @@ fi
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Sat Jun 27 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.50-7.kvm87
+- Update to kvm-87
+- Drop upstreamed patches
+- Re-enable preadv()/pwritev() since #497429 is long since fixed
+
 * Fri Jun  5 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.50-6.kvm86
 - Fix 'kernel requires an x86-64 CPU' error
 - BuildRequires ncurses-devel to enable '-curses' option (#504226)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	20 May 2009 15:24:23 -0000	1.16
+++ sources	27 Jun 2009 15:10:13 -0000	1.17
@@ -1 +1 @@
-58ba34e20886041e0cc2b5a11340f637  qemu-kvm-devel-86.tar.gz
+949e6e072fe1f24361d1b17dea52be7f  qemu-kvm-devel-87.tar.gz


--- qemu-avoid-harmless-msr-warnings.patch DELETED ---


--- qemu-disable-preadv.patch DELETED ---


--- qemu-fix-arm-framebuffer-build.patch DELETED ---


--- qemu-fix-cpuid-trimming.patch DELETED ---


--- qemu-prevent-cdrom-media-eject-while-device-is-locked.patch DELETED ---