[fedora-virt-maint] rpms/qemu/devel qemu-add-ksm-support.patch, 1.2, 1.3 qemu-allow-pulseaudio-to-be-the-default.patch, 1.1, 1.2 qemu-bios-bigger-roms.patch, 1.10, 1.11 qemu-fix-linux-user-build-on-ppc.patch, 1.6, 1.7 qemu-fix-msix-error-handling-on-older-kernels.patch, 1.1, 1.2 qemu-fix-no-kvm-segfault.patch, 1.2, 1.3 qemu.spec, 1.125, 1.126 sources, 1.20, 1.21 qemu-fix-extboot-signrom.patch, 1.2, NONE qemu-fix-optionrom-install.patch, 1.2, NONE qemu-fix-vnet-hdr-slirp-bustage.patch, 1.1, NONE

Mark McLoughlin markmc at fedoraproject.org
Mon Sep 7 14:22:20 UTC 2009


Author: markmc

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

Modified Files:
	qemu-add-ksm-support.patch 
	qemu-allow-pulseaudio-to-be-the-default.patch 
	qemu-bios-bigger-roms.patch 
	qemu-fix-linux-user-build-on-ppc.patch 
	qemu-fix-msix-error-handling-on-older-kernels.patch 
	qemu-fix-no-kvm-segfault.patch qemu.spec sources 
Removed Files:
	qemu-fix-extboot-signrom.patch 
	qemu-fix-optionrom-install.patch 
	qemu-fix-vnet-hdr-slirp-bustage.patch 
Log Message:
* Mon Sep  7 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.92-1
- Update to qemu-kvm-0.11.0-rc2
- Drop upstreamed patches
- extboot install now fixed upstream
- Re-place TCG init fix (#516543) with the one gone upstream


qemu-add-ksm-support.patch:
 exec.c |    4 +++-
 1 file changed, 3 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.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- qemu-add-ksm-support.patch	4 Aug 2009 14:48:15 -0000	1.2
+++ qemu-add-ksm-support.patch	7 Sep 2009 14:22:19 -0000	1.3
@@ -1,4 +1,4 @@
-From 729b681039015c718e476b8f294480b179ed726d Mon Sep 17 00:00:00 2001
+From 4d64a615f69458c202561fcc01e8e0505fa46ee9 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
@@ -13,10 +13,10 @@ Fedora-patch: qemu-add-ksm-support.patch
  1 files changed, 3 insertions(+), 0 deletions(-)
 
 diff --git a/exec.c b/exec.c
-index 2134697..88bcff5 100644
+index 0655b4b..b93f7b8 100644
 --- a/exec.c
 +++ b/exec.c
-@@ -2578,6 +2578,9 @@ ram_addr_t qemu_ram_alloc(ram_addr_t size)
+@@ -2579,6 +2579,9 @@ ram_addr_t qemu_ram_alloc(ram_addr_t size)
      new_block->host = file_ram_alloc(size, mem_path);
      if (!new_block->host) {
          new_block->host = qemu_vmalloc(size);

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.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- qemu-allow-pulseaudio-to-be-the-default.patch	4 Sep 2009 10:34:32 -0000	1.1
+++ qemu-allow-pulseaudio-to-be-the-default.patch	7 Sep 2009 14:22:20 -0000	1.2
@@ -1,4 +1,4 @@
-From 01c3198a8f0d933c9b219acaf087c675d729bbf7 Mon Sep 17 00:00:00 2001
+From 4f5019c88e710be0aa597c81017b683d494c532d 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.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- qemu-bios-bigger-roms.patch	4 Aug 2009 14:48:15 -0000	1.10
+++ qemu-bios-bigger-roms.patch	7 Sep 2009 14:22:20 -0000	1.11
@@ -1,4 +1,4 @@
-From 7f871498235ac7591bd4398a745735081290c1a2 Mon Sep 17 00:00:00 2001
+From f751c8937a81116469149357359c767a71ee8ebd 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-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.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- qemu-fix-linux-user-build-on-ppc.patch	4 Aug 2009 14:48:16 -0000	1.6
+++ qemu-fix-linux-user-build-on-ppc.patch	7 Sep 2009 14:22:20 -0000	1.7
@@ -1,4 +1,4 @@
-From 1cdc8e879b1e2140cc48c1a76718c336f42b0a7d Mon Sep 17 00:00:00 2001
+From 22c6c8c5dfe66a5e7f81dd4a296e1b2b245c5d28 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
@@ -58,7 +58,7 @@ index b042002..14f8aa1 100644
  /* ARM specific declarations */
  
 diff --git a/linux-user/elfload.c b/linux-user/elfload.c
-index d31cca7..3ccfdda 100644
+index 3a8268b..d283f73 100644
 --- a/linux-user/elfload.c
 +++ b/linux-user/elfload.c
 @@ -134,6 +134,7 @@ static inline void init_thread(struct target_pt_regs *regs, struct image_info *i

qemu-fix-msix-error-handling-on-older-kernels.patch:
 msix.c |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

Index: qemu-fix-msix-error-handling-on-older-kernels.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu-fix-msix-error-handling-on-older-kernels.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- qemu-fix-msix-error-handling-on-older-kernels.patch	7 Sep 2009 07:02:08 -0000	1.1
+++ qemu-fix-msix-error-handling-on-older-kernels.patch	7 Sep 2009 14:22:20 -0000	1.2
@@ -1,4 +1,4 @@
-From 057fb1b4b227bc49aa00b08da5f177b50c020693 Mon Sep 17 00:00:00 2001
+From 0b341eda83cd2f01134d5b13300d97c07a3abced Mon Sep 17 00:00:00 2001
 From: Michael S. Tsirkin <mst at redhat.com>
 Date: Thu, 23 Jul 2009 16:34:13 +0300
 Subject: [PATCH] Fix error handling in msix vector add

qemu-fix-no-kvm-segfault.patch:
 vl.c |   29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

Index: qemu-fix-no-kvm-segfault.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu-fix-no-kvm-segfault.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- qemu-fix-no-kvm-segfault.patch	4 Sep 2009 07:22:09 -0000	1.2
+++ qemu-fix-no-kvm-segfault.patch	7 Sep 2009 14:22:20 -0000	1.3
@@ -1,37 +1,78 @@
-From aa1620047bb49079f4c114326d43fb9aa7a26065 Mon Sep 17 00:00:00 2001
-From: Richard Jones <rjones at redhat.com>
-Date: Thu, 20 Aug 2009 13:52:20 +0100
-Subject: [PATCH] Workaround segfault when qemu-kvm runs inside a VM (RHBZ#516543).
-
-Regression was introduced by this commit:
-http://git.kernel.org/?p=virt/kvm/qemu-kvm.git;a=commitdiff;h=b8083e930efc1ee85a7ad7e700dbd0f52ebb32dd
-
-Upstream discussion:
-http://www.mail-archive.com/kvm@vger.kernel.org/msg19890.html
-
-Note: NOT UPSTREAM and this is something of a hack.  Upstream are
-still debating how they really want to fix this.
-
-Signed-off-by: Richard Jones <rjones at redhat.com>
+From 00782050707fbb999bfffe722794490d2211a0a9 Mon Sep 17 00:00:00 2001
+From: Dustin Kirkland <kirkland at canonical.com>
+Date: Fri, 4 Sep 2009 14:38:30 -0500
+Subject: [PATCH] qemu-kvm: fix segfault when running kvm without /dev/kvm
+
+qemu-kvm segfaults on systems without access to /dev/kvm.
+The global kvm_allowed is being set too late in vl.c.
+
+This patch moves the kvm initialization a bit higher in the
+vl.c main, just after the daemonize fork.
+
+This fix is intended to be a short term solution, solving the
+segfaults.
+
+In the longer term, the suggested approach requires a bit more
+development and testing:
+ * If no arg given          => try kvm, try kqemu, try tcg
+ * If --accelmode arg given => try $arg, and fail if unavailable
+
+(cherry picked from commit c06b44bfc9814930b6a94db7bbeb3be1cd39c0d2)
+
+Signed-off-by: Dustin Kirkland <kirkland at canonical.com>
+Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>
+Signed-off-by: Mark McLoughlin <markmc at redhat.com>
 Fedora-patch: qemu-fix-no-kvm-segfault.patch
 ---
- exec.c |    3 ---
- 1 files changed, 0 insertions(+), 3 deletions(-)
+ vl.c |   28 ++++++++++++++--------------
+ 1 files changed, 14 insertions(+), 14 deletions(-)
 
-diff --git a/exec.c b/exec.c
-index 88bcff5..721fcff 100644
---- a/exec.c
-+++ b/exec.c
-@@ -421,9 +421,6 @@ static uint8_t static_code_gen_buffer[DEFAULT_CODE_GEN_BUFFER_SIZE];
+diff --git a/vl.c b/vl.c
+index db75470..26bced8 100644
+--- a/vl.c
++++ b/vl.c
+@@ -5831,6 +5831,20 @@ int main(int argc, char **argv, char **envp)
+     }
+ #endif
+ 
++    if (kvm_enabled()) {
++        int ret;
++
++        ret = kvm_init(smp_cpus);
++        if (ret < 0) {
++#if defined(KVM_UPSTREAM) || defined(NO_CPU_EMULATION)
++            fprintf(stderr, "failed to initialize KVM\n");
++            exit(1);
++#endif
++            fprintf(stderr, "Could not initialize KVM, will disable KVM support\n");
++            kvm_allowed = 0;
++        }
++    }
++
+ #ifdef CONFIG_KQEMU
+     if (smp_cpus > 1)
+         kqemu_allowed = 0;
+@@ -6002,20 +6016,6 @@ int main(int argc, char **argv, char **envp)
+         }
+     }
  
- static void code_gen_alloc(unsigned long tb_size)
- {
--    if (kvm_enabled())
--        return;
+-    if (kvm_enabled()) {
+-        int ret;
+-
+-        ret = kvm_init(smp_cpus);
+-        if (ret < 0) {
+-#if defined(KVM_UPSTREAM) || defined(NO_CPU_EMULATION)
+-            fprintf(stderr, "failed to initialize KVM\n");
+-            exit(1);
+-#endif
+-            fprintf(stderr, "Could not initialize KVM, will disable KVM support\n");
+-	     kvm_allowed = 0;
+-        }
+-    }
 -
- #ifdef USE_STATIC_CODE_GEN_BUFFER
-     code_gen_buffer = static_code_gen_buffer;
-     code_gen_buffer_size = DEFAULT_CODE_GEN_BUFFER_SIZE;
+     if (monitor_device) {
+         monitor_hd = qemu_chr_open("monitor", monitor_device, NULL);
+         if (!monitor_hd) {
 -- 
 1.6.2.5
 


Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -p -r1.125 -r1.126
--- qemu.spec	7 Sep 2009 07:02:08 -0000	1.125
+++ qemu.spec	7 Sep 2009 14:22:20 -0000	1.126
@@ -1,10 +1,9 @@
-%define kvmvertag  rc1
-%define kvmverfull kvm-0.11.0-rc1
+%define kvmverfull kvm-0.11.0-rc2
 
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
-Version: 0.10.91
-Release: 0.10.%{kvmvertag}%{?dist}
+Version: 0.10.92
+Release: 1%{?dist}
 # Epoch because we pushed a qemu-1.0 package
 Epoch: 2
 License: GPLv2+ and LGPLv2+ and BSD
@@ -22,26 +21,17 @@ Patch01: qemu-bios-bigger-roms.patch
 # Works around broken linux-user build on ppc
 Patch02: qemu-fix-linux-user-build-on-ppc.patch
 
-# Make sure multiboot.bin/extboot.bin gets installed
-Patch03: qemu-fix-optionrom-install.patch
+# Allow the pulseudio backend to be the default
+Patch03: qemu-allow-pulseaudio-to-be-the-default.patch
 
 # Add KSM support - see https://fedoraproject.org/wiki/Features/KSM
 Patch04: qemu-add-ksm-support.patch
 
-# Fix extboot checksum (bug #514899)
-Patch05: qemu-fix-extboot-signrom.patch
-
-# Fix virtio_net with -net user (bug #516022)
-Patch06: qemu-fix-vnet-hdr-slirp-bustage.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)
-Patch07: qemu-fix-no-kvm-segfault.patch
-
-# Allow the pulseudio backend to be the default
-Patch08: qemu-allow-pulseaudio-to-be-the-default.patch
-
-# Fix MSI-X error handling on older kernels (#519787)
-Patch09: qemu-fix-msix-error-handling-on-older-kernels.patch
+Patch06: qemu-fix-no-kvm-segfault.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel
@@ -229,9 +219,6 @@ such as kvmtrace and kvm_stat.
 %patch04 -p1
 %patch05 -p1
 %patch06 -p1
-%patch07 -p1
-%patch08 -p1
-%patch09 -p1
 
 %build
 # systems like rhel build system does not have a recent enough linker so
@@ -496,6 +483,12 @@ getent passwd qemu >/dev/null || \
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Mon Sep  7 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.92-1
+- Update to qemu-kvm-0.11.0-rc2
+- Drop upstreamed patches
+- extboot install now fixed upstream
+- Re-place TCG init fix (#516543) with the one gone upstream
+
 * Mon Sep  7 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.91-0.10.rc1
 - Fix MSI-X error handling on older kernels (#519787)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	4 Aug 2009 14:48:16 -0000	1.20
+++ sources	7 Sep 2009 14:22:20 -0000	1.21
@@ -1 +1 @@
-bef21a81a3e81cfbaf92e9f2c4219575  qemu-kvm-0.11.0-rc1.tar.gz
+35294f8c77250eae6ef48c713fe92803  qemu-kvm-0.11.0-rc2.tar.gz


--- qemu-fix-extboot-signrom.patch DELETED ---


--- qemu-fix-optionrom-install.patch DELETED ---


--- qemu-fix-vnet-hdr-slirp-bustage.patch DELETED ---




More information about the Fedora-virt-maint mailing list