From 8a0cce2bab1d72dce83a76722318454d9a7f258f Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Jun 29 2013 00:11:02 +0000 Subject: Rebased to version 1.5.1 --- diff --git a/.gitignore b/.gitignore index bf06366..6bf18a7 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ qemu-kvm-0.13.0-25fdf4a.tar.gz /qemu-1.4.0.tar.bz2 /qemu-1.4.1.tar.bz2 /qemu-1.5.0.tar.bz2 +/qemu-1.5.1.tar.bz2 diff --git a/0001-configure-Add-enable-migration-from-qemu-kvm.patch b/0001-configure-Add-enable-migration-from-qemu-kvm.patch index 6e9de6d..23dbc2e 100644 --- a/0001-configure-Add-enable-migration-from-qemu-kvm.patch +++ b/0001-configure-Add-enable-migration-from-qemu-kvm.patch @@ -1,4 +1,4 @@ -From 7cd5a50e02ed4866932c2a70680bec48a75dae72 Mon Sep 17 00:00:00 2001 +From 0f8c8df923aea533c4b573a013b9a35c3581c2df Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Tue, 19 Feb 2013 14:39:05 -0500 Subject: [PATCH] configure: Add --enable-migration-from-qemu-kvm @@ -14,7 +14,7 @@ not a big loss (and I don't know any way to avoid it). 1 file changed, 10 insertions(+) diff --git a/configure b/configure -index 5ae7e4a..fb41cb6 100755 +index eb74510..f558a21 100755 --- a/configure +++ b/configure @@ -179,6 +179,7 @@ xfs="" @@ -25,7 +25,7 @@ index 5ae7e4a..fb41cb6 100755 gprof="no" debug_tcg="no" debug="no" -@@ -777,6 +778,8 @@ for opt do +@@ -776,6 +777,8 @@ for opt do ;; --enable-kvm) kvm="yes" ;; @@ -34,7 +34,7 @@ index 5ae7e4a..fb41cb6 100755 --disable-tcg-interpreter) tcg_interpreter="no" ;; --enable-tcg-interpreter) tcg_interpreter="yes" -@@ -1136,6 +1139,9 @@ echo " --enable-bluez enable bluez stack connectivity" +@@ -1135,6 +1138,9 @@ echo " --enable-bluez enable bluez stack connectivity" echo " --disable-slirp disable SLIRP userspace network connectivity" echo " --disable-kvm disable KVM acceleration support" echo " --enable-kvm enable KVM acceleration support" @@ -44,7 +44,7 @@ index 5ae7e4a..fb41cb6 100755 echo " --enable-tcg-interpreter enable TCG with bytecode interpreter (TCI)" echo " --disable-nptl disable usermode NPTL support" echo " --enable-nptl enable usermode NPTL support" -@@ -3554,6 +3560,7 @@ echo "Linux AIO support $linux_aio" +@@ -3553,6 +3559,7 @@ echo "Linux AIO support $linux_aio" echo "ATTR/XATTR support $attr" echo "Install blobs $blobs" echo "KVM support $kvm" @@ -52,7 +52,7 @@ index 5ae7e4a..fb41cb6 100755 echo "TCG interpreter $tcg_interpreter" echo "fdt support $fdt" echo "preadv support $preadv" -@@ -3863,6 +3870,9 @@ fi +@@ -3862,6 +3869,9 @@ fi if test "$signalfd" = "yes" ; then echo "CONFIG_SIGNALFD=y" >> $config_host_mak fi diff --git a/0002-acpi_piix4-Drop-minimum_version_id-to-handle-qemu-kv.patch b/0002-acpi_piix4-Drop-minimum_version_id-to-handle-qemu-kv.patch index d6107a8..bdc73fc 100644 --- a/0002-acpi_piix4-Drop-minimum_version_id-to-handle-qemu-kv.patch +++ b/0002-acpi_piix4-Drop-minimum_version_id-to-handle-qemu-kv.patch @@ -1,4 +1,4 @@ -From 9df0fd5765377d32a0e9f2d855dc1d428c19f767 Mon Sep 17 00:00:00 2001 +From eebf11b36cdd88ed2273eda6258760c59a9aaf9b Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Tue, 19 Feb 2013 14:44:49 -0500 Subject: [PATCH] acpi_piix4: Drop minimum_version_id to handle qemu-kvm diff --git a/0003-i8254-Fix-migration-from-qemu-kvm-1.1.patch b/0003-i8254-Fix-migration-from-qemu-kvm-1.1.patch index 44c1e8f..9ae2d5c 100644 --- a/0003-i8254-Fix-migration-from-qemu-kvm-1.1.patch +++ b/0003-i8254-Fix-migration-from-qemu-kvm-1.1.patch @@ -1,4 +1,4 @@ -From e1f0936bbf84664d7d7fe7bbbdd1595be745b539 Mon Sep 17 00:00:00 2001 +From 05d94ec26781d83f78bb6e9c7a5610cf88f69293 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Tue, 19 Feb 2013 15:04:59 -0500 Subject: [PATCH] i8254: Fix migration from qemu-kvm < 1.1 diff --git a/0004-pc_piix-Add-compat-handling-for-qemu-kvm-VGA-mem-siz.patch b/0004-pc_piix-Add-compat-handling-for-qemu-kvm-VGA-mem-siz.patch index 820e99d..50f11ef 100644 --- a/0004-pc_piix-Add-compat-handling-for-qemu-kvm-VGA-mem-siz.patch +++ b/0004-pc_piix-Add-compat-handling-for-qemu-kvm-VGA-mem-siz.patch @@ -1,4 +1,4 @@ -From 3e580f65ac69c7a84b672a59de6772dae24b5a8a Mon Sep 17 00:00:00 2001 +From 437b8cb633fa6402546bf0f2e808a64ea447b55e Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Tue, 19 Feb 2013 15:35:40 -0500 Subject: [PATCH] pc_piix: Add compat handling for qemu-kvm VGA mem size @@ -19,7 +19,7 @@ all others. This will break incoming qemu migration for qemu < 1.3. 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c -index 43ab480..48fb7b7 100644 +index 06416ce..0787f38 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -383,6 +383,13 @@ static QEMUMachine pc_machine_v1_3 = { diff --git a/0005-qxl-Add-rom_size-compat-property-fix-migration-from-.patch b/0005-qxl-Add-rom_size-compat-property-fix-migration-from-.patch index 4fa4a8b..258040c 100644 --- a/0005-qxl-Add-rom_size-compat-property-fix-migration-from-.patch +++ b/0005-qxl-Add-rom_size-compat-property-fix-migration-from-.patch @@ -1,4 +1,4 @@ -From ae8d642477d87287b42b0b40c133637dd1cdd8b9 Mon Sep 17 00:00:00 2001 +From 9642978bbeba188570ec62fd989cad4da32589c3 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Tue, 19 Feb 2013 16:19:02 -0500 Subject: [PATCH] qxl: Add rom_size compat property, fix migration from 1.2 @@ -64,7 +64,7 @@ index c475cb1..74f07c0 100644 }; diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c -index 48fb7b7..2307d26 100644 +index 0787f38..e26c93d 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -369,6 +369,14 @@ static QEMUMachine pc_i440fx_machine_v1_4 = { diff --git a/0006-configure-dtc-Probe-for-libfdt_env.h.patch b/0006-configure-dtc-Probe-for-libfdt_env.h.patch new file mode 100644 index 0000000..c46c885 --- /dev/null +++ b/0006-configure-dtc-Probe-for-libfdt_env.h.patch @@ -0,0 +1,85 @@ +From 93178ab04a3dd129848e398838e14f22ba0ba23f Mon Sep 17 00:00:00 2001 +From: Peter Crosthwaite +Date: Mon, 27 May 2013 14:20:57 +1000 +Subject: [PATCH] configure: dtc: Probe for libfdt_env.h + +Currently QEMU provides a local clone of the file libfdt_env.h in +/include. This file is supposed to come with the libfdt package and is +only needed for broken installs of libfdt. Now that we have submodule +dtc, just ignore these broken installs and prompt for the dtc submodule +install instead. QEMU's local libfdt_env.h is removed accordingly. + +Manifests as a bug when building QEMU with modern libfdt. The new +version of libfdt does not compile when QEMUs libfdt_env.h takes +precedence over the hosts. + +Signed-off-by: Peter Crosthwaite +Reviewed-by: Peter Maydell +Acked-by: David Gibson +Signed-off-by: Kim Phillips +Acked-by: Paolo Bonzini +Message-id: 9b6a3a52e3f46cfbc1ded9ab56385ec045e46705.1369628289.git.peter.crosthwaite@xilinx.com +Signed-off-by: Peter Maydell +(cherry picked from commit 96ce65457690561417ae8e6f0e85f3c6f135018b) +--- + configure | 2 ++ + include/libfdt_env.h | 36 ------------------------------------ + 2 files changed, 2 insertions(+), 36 deletions(-) + delete mode 100644 include/libfdt_env.h + +diff --git a/configure b/configure +index f558a21..ed09648 100755 +--- a/configure ++++ b/configure +@@ -2525,7 +2525,9 @@ fi + # fdt probe + if test "$fdt" != "no" ; then + fdt_libs="-lfdt" ++ # explicitly check for libfdt_env.h as it is missing in some stable installs + cat > $TMPC << EOF ++#include + int main(void) { return 0; } + EOF + if compile_prog "" "$fdt_libs" ; then +diff --git a/include/libfdt_env.h b/include/libfdt_env.h +deleted file mode 100644 +index 3667d4c..0000000 +--- a/include/libfdt_env.h ++++ /dev/null +@@ -1,36 +0,0 @@ +-/* +- * This program is free software; you can redistribute it and/or modify +- * it under the terms of the GNU General Public License, version 2, as +- * published by the Free Software Foundation. +- * +- * This program is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- * GNU General Public License for more details. +- * +- * You should have received a copy of the GNU General Public License +- * along with this program; if not, see . +- * +- * Copyright IBM Corp. 2008 +- * Authors: Hollis Blanchard +- * +- */ +- +-#ifndef _LIBFDT_ENV_H +-#define _LIBFDT_ENV_H +- +-#include "qemu/bswap.h" +- +-#ifdef HOST_WORDS_BIGENDIAN +-#define fdt32_to_cpu(x) (x) +-#define cpu_to_fdt32(x) (x) +-#define fdt64_to_cpu(x) (x) +-#define cpu_to_fdt64(x) (x) +-#else +-#define fdt32_to_cpu(x) bswap32(x) +-#define cpu_to_fdt32(x) bswap32(x) +-#define fdt64_to_cpu(x) bswap64(x) +-#define cpu_to_fdt64(x) bswap64(x) +-#endif +- +-#endif /* _LIBFDT_ENV_H */ diff --git a/0006-rtl8139-flush-queued-packets-when-RxBufPtr-is-writte.patch b/0006-rtl8139-flush-queued-packets-when-RxBufPtr-is-writte.patch deleted file mode 100644 index 9b9fb4a..0000000 --- a/0006-rtl8139-flush-queued-packets-when-RxBufPtr-is-writte.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 4044e0670486ad089367952843f17351c4f6faa0 Mon Sep 17 00:00:00 2001 -From: Stefan Hajnoczi -Date: Wed, 22 May 2013 14:50:18 +0200 -Subject: [PATCH] rtl8139: flush queued packets when RxBufPtr is written - -Net queues support efficient "receive disable". For example, tap's file -descriptor will not be polled while its peer has receive disabled. This -saves CPU cycles for needlessly copying and then dropping packets which -the peer cannot receive. - -rtl8139 is missing the qemu_flush_queued_packets() call that wakes the -queue up when receive becomes possible again. - -As a result, the Windows 7 guest driver reaches a state where the -rtl8139 cannot receive packets. The driver has actually refilled the -receive buffer but we never resume reception. - -The bug can be reproduced by running a large FTP 'get' inside a Windows -7 guest: - - $ qemu -netdev tap,id=tap0,... - -device rtl8139,netdev=tap0 - -The Linux guest driver does not trigger the bug, probably due to a -different buffer management strategy. - -Reported-by: Oliver Francke -Signed-off-by: Stefan Hajnoczi -(cherry picked from commit 00b7ade807b5ce6779ddd86ce29c5521ec5c529a) ---- - hw/net/rtl8139.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c -index 9369507..7993f9f 100644 ---- a/hw/net/rtl8139.c -+++ b/hw/net/rtl8139.c -@@ -2575,6 +2575,9 @@ static void rtl8139_RxBufPtr_write(RTL8139State *s, uint32_t val) - /* this value is off by 16 */ - s->RxBufPtr = MOD2(val + 0x10, s->RxBufferSize); - -+ /* more buffer space may be available so try to receive */ -+ qemu_flush_queued_packets(qemu_get_queue(s->nic)); -+ - DPRINTF(" CAPR write: rx buffer length %d head 0x%04x read 0x%04x\n", - s->RxBufferSize, s->RxBufAddr, s->RxBufPtr); - } diff --git a/0007-configure-dtc-Probe-for-libfdt_env.h.patch b/0007-configure-dtc-Probe-for-libfdt_env.h.patch deleted file mode 100644 index dc48971..0000000 --- a/0007-configure-dtc-Probe-for-libfdt_env.h.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 7e72644adb7ed1092a90cf26c4edbba4b3f2b11b Mon Sep 17 00:00:00 2001 -From: Peter Crosthwaite -Date: Mon, 27 May 2013 14:20:57 +1000 -Subject: [PATCH] configure: dtc: Probe for libfdt_env.h - -Currently QEMU provides a local clone of the file libfdt_env.h in -/include. This file is supposed to come with the libfdt package and is -only needed for broken installs of libfdt. Now that we have submodule -dtc, just ignore these broken installs and prompt for the dtc submodule -install instead. QEMU's local libfdt_env.h is removed accordingly. - -Manifests as a bug when building QEMU with modern libfdt. The new -version of libfdt does not compile when QEMUs libfdt_env.h takes -precedence over the hosts. - -Signed-off-by: Peter Crosthwaite -Reviewed-by: Peter Maydell -Acked-by: David Gibson -Signed-off-by: Kim Phillips -Acked-by: Paolo Bonzini -Message-id: 9b6a3a52e3f46cfbc1ded9ab56385ec045e46705.1369628289.git.peter.crosthwaite@xilinx.com -Signed-off-by: Peter Maydell -(cherry picked from commit 96ce65457690561417ae8e6f0e85f3c6f135018b) ---- - configure | 2 ++ - include/libfdt_env.h | 36 ------------------------------------ - 2 files changed, 2 insertions(+), 36 deletions(-) - delete mode 100644 include/libfdt_env.h - -diff --git a/configure b/configure -index fb41cb6..7e07cb7 100755 ---- a/configure -+++ b/configure -@@ -2526,7 +2526,9 @@ fi - # fdt probe - if test "$fdt" != "no" ; then - fdt_libs="-lfdt" -+ # explicitly check for libfdt_env.h as it is missing in some stable installs - cat > $TMPC << EOF -+#include - int main(void) { return 0; } - EOF - if compile_prog "" "$fdt_libs" ; then -diff --git a/include/libfdt_env.h b/include/libfdt_env.h -deleted file mode 100644 -index 3667d4c..0000000 ---- a/include/libfdt_env.h -+++ /dev/null -@@ -1,36 +0,0 @@ --/* -- * This program is free software; you can redistribute it and/or modify -- * it under the terms of the GNU General Public License, version 2, as -- * published by the Free Software Foundation. -- * -- * This program is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- * GNU General Public License for more details. -- * -- * You should have received a copy of the GNU General Public License -- * along with this program; if not, see . -- * -- * Copyright IBM Corp. 2008 -- * Authors: Hollis Blanchard -- * -- */ -- --#ifndef _LIBFDT_ENV_H --#define _LIBFDT_ENV_H -- --#include "qemu/bswap.h" -- --#ifdef HOST_WORDS_BIGENDIAN --#define fdt32_to_cpu(x) (x) --#define cpu_to_fdt32(x) (x) --#define fdt64_to_cpu(x) (x) --#define cpu_to_fdt64(x) (x) --#else --#define fdt32_to_cpu(x) bswap32(x) --#define cpu_to_fdt32(x) bswap32(x) --#define fdt64_to_cpu(x) bswap64(x) --#define cpu_to_fdt64(x) bswap64(x) --#endif -- --#endif /* _LIBFDT_ENV_H */ diff --git a/qemu.spec b/qemu.spec index 04f29f2..c14209c 100644 --- a/qemu.spec +++ b/qemu.spec @@ -139,8 +139,8 @@ Summary: QEMU is a FAST! processor emulator Name: qemu -Version: 1.5.0 -Release: 9%{?dist} +Version: 1.5.1 +Release: 1%{?dist} Epoch: 2 License: GPLv2+ and LGPLv2+ and BSD Group: Development/Tools @@ -188,10 +188,8 @@ Patch0003: 0003-i8254-Fix-migration-from-qemu-kvm-1.1.patch Patch0004: 0004-pc_piix-Add-compat-handling-for-qemu-kvm-VGA-mem-siz.patch # Fix migration w/ qxl from qemu-kvm 1.2 (solution pending upstream) Patch0005: 0005-qxl-Add-rom_size-compat-property-fix-migration-from-.patch -# Fix rtl8139 + windows 7 + large transfers (bz #970240) -Patch0006: 0006-rtl8139-flush-queued-packets-when-RxBufPtr-is-writte.patch # Fix build with rawhide libfdt -Patch0007: 0007-configure-dtc-Probe-for-libfdt_env.h.patch +Patch0006: 0006-configure-dtc-Probe-for-libfdt_env.h.patch BuildRequires: SDL-devel BuildRequires: zlib-devel @@ -688,10 +686,8 @@ CAC emulation development files. %patch0004 -p1 # Fix migration w/ qxl from qemu-kvm 1.2 (solution pending upstream) %patch0005 -p1 -# Fix rtl8139 + windows 7 + large transfers (bz #970240) -%patch0006 -p1 # Fix build with rawhide libfdt -%patch0007 -p1 +%patch0006 -p1 %build @@ -1378,6 +1374,9 @@ getent passwd qemu >/dev/null || \ %endif %changelog +* Fri Jun 28 2013 Cole Robinson - 2:1.5.1-1 +- Rebased to version 1.5.1 + * Wed Jun 19 2013 Cole Robinson - 2:1.5.0-9 - Don't install conflicting binfmt handler on arm (bz #974804) - Use upstream patch for libfdt build fix diff --git a/sources b/sources index 56d3af3..198c322 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b6f3265b8ed39d77e8f354f35cc26e16 qemu-1.5.0.tar.bz2 +b56e73bdcfdb214d5c68e13111aca96f qemu-1.5.1.tar.bz2