[fedora-virt-maint] rpms/qemu/devel qemu-add-ksm-support.patch, 1.4, 1.5 qemu-allow-pulseaudio-to-be-the-default.patch, 1.2, 1.3 qemu-bios-bigger-roms.patch, 1.11, 1.12 qemu-correctly-free-nic-info-structure.patch, 1.1, 1.2 qemu-fix-linux-user-build-on-ppc.patch, 1.7, 1.8 qemu.spec, 1.131, 1.132 sources, 1.21, 1.22 qemu-fix-msix-error-handling-on-older-kernels.patch, 1.3, NONE qemu-fix-no-kvm-segfault.patch, 1.4, NONE

Mark McLoughlin markmc at fedoraproject.org
Mon Sep 28 07:30:15 UTC 2009


Author: markmc

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

Modified Files:
	qemu-add-ksm-support.patch 
	qemu-allow-pulseaudio-to-be-the-default.patch 
	qemu-bios-bigger-roms.patch 
	qemu-correctly-free-nic-info-structure.patch 
	qemu-fix-linux-user-build-on-ppc.patch qemu.spec sources 
Removed Files:
	qemu-fix-msix-error-handling-on-older-kernels.patch 
	qemu-fix-no-kvm-segfault.patch 
Log Message:
* Mon Sep 28 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.11.0-1
- Update to 0.11.0 release
- Drop a couple of upstreamed patches


qemu-add-ksm-support.patch:
 exec.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Index: qemu-add-ksm-support.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu-add-ksm-support.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- qemu-add-ksm-support.patch	16 Sep 2009 22:20:32 -0000	1.4
+++ qemu-add-ksm-support.patch	28 Sep 2009 07:30:15 -0000	1.5
@@ -1,4 +1,4 @@
-From ef44e9475ab38ec73b30e83241279170fac06b22 Mon Sep 17 00:00:00 2001
+From c6c94b043e8b3593d0beb52966dce43069233840 Mon Sep 17 00:00:00 2001
 From: Izik Eidus <ieidus at redhat.com>
 Date: Tue, 28 Jul 2009 19:14:26 +0300
 Subject: [PATCH] kvm userspace: ksm support

qemu-allow-pulseaudio-to-be-the-default.patch:
 paaudio.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Index: qemu-allow-pulseaudio-to-be-the-default.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu-allow-pulseaudio-to-be-the-default.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- qemu-allow-pulseaudio-to-be-the-default.patch	7 Sep 2009 14:22:20 -0000	1.2
+++ qemu-allow-pulseaudio-to-be-the-default.patch	28 Sep 2009 07:30:15 -0000	1.3
@@ -1,4 +1,4 @@
-From 4f5019c88e710be0aa597c81017b683d494c532d Mon Sep 17 00:00:00 2001
+From 8ab0d97572264051176ff45171484fa463d1287f Mon Sep 17 00:00:00 2001
 From: Mark McLoughlin <markmc at redhat.com>
 Date: Fri, 4 Sep 2009 11:24:03 +0100
 Subject: [PATCH] Allow pulseaudio backend to be the default

qemu-bios-bigger-roms.patch:
 rombios.c |   34 +++++++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 7 deletions(-)

Index: qemu-bios-bigger-roms.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu-bios-bigger-roms.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- qemu-bios-bigger-roms.patch	7 Sep 2009 14:22:20 -0000	1.11
+++ qemu-bios-bigger-roms.patch	28 Sep 2009 07:30:15 -0000	1.12
@@ -1,4 +1,4 @@
-From f751c8937a81116469149357359c767a71ee8ebd Mon Sep 17 00:00:00 2001
+From b5c99e96655e8dc938f801e1ac0dbdf2d6dfba37 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] compute checksum for roms bigger than a segment

qemu-correctly-free-nic-info-structure.patch:
 net.c |   16 +++++++++++-----
 net.h |    8 ++++----
 vl.c  |    3 +--
 3 files changed, 16 insertions(+), 11 deletions(-)

Index: qemu-correctly-free-nic-info-structure.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu-correctly-free-nic-info-structure.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- qemu-correctly-free-nic-info-structure.patch	23 Sep 2009 11:31:31 -0000	1.1
+++ qemu-correctly-free-nic-info-structure.patch	28 Sep 2009 07:30:15 -0000	1.2
@@ -1,4 +1,4 @@
-From 2b76390876db26fb279d26de86b2c0b8260ff142 Mon Sep 17 00:00:00 2001
+From 3675a0dde74f890404f392e194f1adc6b24285f7 Mon Sep 17 00:00:00 2001
 From: Glauber Costa <glommer at redhat.com>
 Date: Wed, 23 Sep 2009 09:49:43 +0100
 Subject: [PATCH] Correctly free nd structure
@@ -29,10 +29,10 @@ Fedora-patch: qemu-correctly-free-nic-in
  3 files changed, 16 insertions(+), 10 deletions(-)
 
 diff --git a/net.c b/net.c
-index 61c9649..b58945f 100644
+index a1c1111..da2f428 100644
 --- a/net.c
 +++ b/net.c
-@@ -2564,7 +2564,7 @@ void qemu_check_nic_model_list(NICInfo *nd, const char * const *models,
+@@ -2559,7 +2559,7 @@ void qemu_check_nic_model_list(NICInfo *nd, const char * const *models,
      int i, exit_status = 0;
  
      if (!nd->model)
@@ -41,7 +41,7 @@ index 61c9649..b58945f 100644
  
      if (strcmp(nd->model, "?") != 0) {
          for (i = 0 ; models[i]; i++)
-@@ -2634,6 +2634,7 @@ int net_client_init(Monitor *mon, const char *device, const char *p)
+@@ -2629,6 +2629,7 @@ int net_client_init(Monitor *mon, const char *device, const char *p)
              goto out;
          }
          nd = &nd_table[idx];
@@ -49,7 +49,7 @@ index 61c9649..b58945f 100644
          macaddr = nd->macaddr;
          macaddr[0] = 0x52;
          macaddr[1] = 0x54;
-@@ -2650,13 +2651,13 @@ int net_client_init(Monitor *mon, const char *device, const char *p)
+@@ -2645,13 +2646,13 @@ int net_client_init(Monitor *mon, const char *device, const char *p)
              }
          }
          if (get_param_value(buf, sizeof(buf), "model", p)) {
@@ -66,7 +66,7 @@ index 61c9649..b58945f 100644
          }
          nd->nvectors = NIC_NVECTORS_UNSPECIFIED;
          if (get_param_value(buf, sizeof(buf), "vectors", p)) {
-@@ -3003,8 +3004,13 @@ void net_client_uninit(NICInfo *nd)
+@@ -2998,8 +2999,13 @@ void net_client_uninit(NICInfo *nd)
  {
      nd->vlan->nb_guest_devs--;
      nb_nics--;
@@ -82,10 +82,10 @@ index 61c9649..b58945f 100644
  
  static int net_host_check_device(const char *device)
 diff --git a/net.h b/net.h
-index b172691..ec78d0a 100644
+index 57ab031..94db0d7 100644
 --- a/net.h
 +++ b/net.h
-@@ -100,10 +100,10 @@ enum {
+@@ -101,10 +101,10 @@ enum {
  
  struct NICInfo {
      uint8_t macaddr[6];

qemu-fix-linux-user-build-on-ppc.patch:
 elf.h                |    2 ++
 linux-user/elfload.c |   11 ++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

Index: qemu-fix-linux-user-build-on-ppc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu-fix-linux-user-build-on-ppc.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- qemu-fix-linux-user-build-on-ppc.patch	7 Sep 2009 14:22:20 -0000	1.7
+++ qemu-fix-linux-user-build-on-ppc.patch	28 Sep 2009 07:30:15 -0000	1.8
@@ -1,4 +1,4 @@
-From 22c6c8c5dfe66a5e7f81dd4a296e1b2b245c5d28 Mon Sep 17 00:00:00 2001
+From 8f4d4cb4e4e73d0533aa2cb421c14210c75f6edc Mon Sep 17 00:00:00 2001
 From: Mark McLoughlin <markmc at redhat.com>
 Date: Mon, 29 Jun 2009 14:49:03 +0100
 Subject: [PATCH] Fix linux-user build on ppc


Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -p -r1.131 -r1.132
--- qemu.spec	23 Sep 2009 11:31:31 -0000	1.131
+++ qemu.spec	28 Sep 2009 07:30:15 -0000	1.132
@@ -1,16 +1,14 @@
-%define kvmverfull kvm-0.11.0-rc2
-
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
-Version: 0.10.92
-Release: 5%{?dist}
+Version: 0.11.0
+Release: 1%{?dist}
 # Epoch because we pushed a qemu-1.0 package
 Epoch: 2
 License: GPLv2+ and LGPLv2+ and BSD
 Group: Development/Tools
 URL: http://www.qemu.org/
 
-Source0: http://downloads.sourceforge.net/sourceforge/kvm/qemu-%{kvmverfull}.tar.gz
+Source0: http://downloads.sourceforge.net/sourceforge/kvm/qemu-kvm-%{version}.tar.gz
 Source1: qemu.init
 
 # Loads kvm kernel modules at boot
@@ -38,14 +36,8 @@ Patch03: qemu-allow-pulseaudio-to-be-the
 # Add KSM support - see https://fedoraproject.org/wiki/Features/KSM
 Patch04: qemu-add-ksm-support.patch
 
-# Fix MSI-X error handling on older kernels (#519787)
-Patch05: qemu-fix-msix-error-handling-on-older-kernels.patch
-
-# Fix segfault when qemu-kvm is invoked inside a VM (bug #516543)
-Patch06: qemu-fix-no-kvm-segfault.patch
-
 # Fix issue causing NIC hotplug confusion when no model is specified (#524022)
-Patch07: qemu-correctly-free-nic-info-structure.patch
+Patch05: qemu-correctly-free-nic-info-structure.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel
@@ -235,8 +227,6 @@ such as kvmtrace and kvm_stat.
 %patch03 -p1
 %patch04 -p1
 %patch05 -p1
-%patch06 -p1
-%patch07 -p1
 
 %build
 # systems like rhel build system does not have a recent enough linker so
@@ -530,6 +520,10 @@ fi
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Mon Sep 28 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.11.0-1
+- Update to 0.11.0 release
+- Drop a couple of upstreamed patches
+
 * Wed Sep 23 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.92-5
 - Fix issue causing NIC hotplug confusion when no model is specified (#524022)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	7 Sep 2009 14:22:20 -0000	1.21
+++ sources	28 Sep 2009 07:30:15 -0000	1.22
@@ -1 +1 @@
-35294f8c77250eae6ef48c713fe92803  qemu-kvm-0.11.0-rc2.tar.gz
+440837a062967102a68e634d57eaf719  qemu-kvm-0.11.0.tar.gz


--- qemu-fix-msix-error-handling-on-older-kernels.patch DELETED ---


--- qemu-fix-no-kvm-segfault.patch DELETED ---




More information about the Fedora-virt-maint mailing list