diff --git a/0034-build-link-with-libatomic-on-powerp.patch b/0034-build-link-with-libatomic-on-powerp.patch deleted file mode 100644 index d15be86..0000000 --- a/0034-build-link-with-libatomic-on-powerp.patch +++ /dev/null @@ -1,53 +0,0 @@ -From bb8771719728d7bc6981aef1393dd3422d54c63c Mon Sep 17 00:00:00 2001 -From: Olaf Hering -Date: Fri, 1 Apr 2016 12:27:16 +0200 -Subject: [PATCH] build: link with libatomic on powerpc-linux - -Building on powerpc-linux fails with undefined reference to -__atomic_load_8 in icount_warp_rt(). Force linking to -latomic. - -Fixes a0aa44b ("include/qemu/atomic.h: default to __atomic functions") - -Signed-off-by: Olaf Hering ---- - configure | 27 +++++++++++++++++++++++++++ - 1 file changed, 27 insertions(+) - -diff --git a/configure b/configure -index b882d19..dfd37b1 100755 ---- a/configure -+++ b/configure -@@ -4049,6 +4049,33 @@ if test "$usb_redir" != "no" ; then - fi - fi - -+if test "$linux_user" = "no" -a "$cpu" = "ppc" -a "$targetos" = "Linux" ; then -+ # Do we need libm -+ cat > $TMPC << EOF -+ #include -+ #include -+ #include -+ int64_t val; -+ int main(int argc, char **argv) -+ { -+ val = (int64_t)read(0, NULL, 0); -+ if (atomic_read(&val) == -1) { -+ return 0; -+ } -+ return 1; -+ } -+EOF -+ if compile_prog "-Iinclude" "" ; then -+ : -+ echo "No need to link with -latomic on powerpc-linux" -+ elif compile_prog "-Iinclude" "-latomic" ; then -+ echo "Link with -latomic on powerpc-linux" -+ libs_softmmu="$libs_softmmu -latomic" -+ else -+ error_exit "libatomic check failed" -+ fi -+fi -+ - ########################################## - # check if we have VSS SDK headers for win - diff --git a/0035-xen-SUSE-xenlinux-unplug-for-emulat.patch b/0034-xen-SUSE-xenlinux-unplug-for-emulat.patch similarity index 96% rename from 0035-xen-SUSE-xenlinux-unplug-for-emulat.patch rename to 0034-xen-SUSE-xenlinux-unplug-for-emulat.patch index 72172ff..8c16435 100644 --- a/0035-xen-SUSE-xenlinux-unplug-for-emulat.patch +++ b/0034-xen-SUSE-xenlinux-unplug-for-emulat.patch @@ -1,4 +1,4 @@ -From cb9cefce08cdc9ed66e2e50998d9daf182af0354 Mon Sep 17 00:00:00 2001 +From 21e9a3360b1a1845aee3eb501d15cb56f6024057 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Tue, 21 Jun 2016 18:42:45 +0200 Subject: [PATCH] xen: SUSE xenlinux unplug for emulated PCI diff --git a/0036-qemu-bridge-helper-reduce-security-.patch b/0035-qemu-bridge-helper-reduce-security-.patch similarity index 97% rename from 0036-qemu-bridge-helper-reduce-security-.patch rename to 0035-qemu-bridge-helper-reduce-security-.patch index b4af3f6..014c999 100644 --- a/0036-qemu-bridge-helper-reduce-security-.patch +++ b/0035-qemu-bridge-helper-reduce-security-.patch @@ -1,4 +1,4 @@ -From 02b362649c8e391e465f425a876eb914af3727a6 Mon Sep 17 00:00:00 2001 +From 5219d096e17d3623cc0e274f9d9988effb11e9a1 Mon Sep 17 00:00:00 2001 From: Bruce Rogers Date: Tue, 2 Aug 2016 11:36:02 -0600 Subject: [PATCH] qemu-bridge-helper: reduce security profile diff --git a/0037-qemu-binfmt-conf-use-qemu-ARCH-binf.patch b/0036-qemu-binfmt-conf-use-qemu-ARCH-binf.patch similarity index 94% rename from 0037-qemu-binfmt-conf-use-qemu-ARCH-binf.patch rename to 0036-qemu-binfmt-conf-use-qemu-ARCH-binf.patch index fbdb7c3..e0acf74 100644 --- a/0037-qemu-binfmt-conf-use-qemu-ARCH-binf.patch +++ b/0036-qemu-binfmt-conf-use-qemu-ARCH-binf.patch @@ -1,4 +1,4 @@ -From 30cba7c4e3835462a6e7ce5841594a2e02cd4466 Mon Sep 17 00:00:00 2001 +From 3a45e30cfeda81b1c5a311e4bd030165396ab921 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Fri, 12 Aug 2016 18:20:49 +0200 Subject: [PATCH] qemu-binfmt-conf: use qemu-ARCH-binfmt diff --git a/0038-configure-Fix-detection-of-seccomp-.patch b/0037-configure-Fix-detection-of-seccomp-.patch similarity index 87% rename from 0038-configure-Fix-detection-of-seccomp-.patch rename to 0037-configure-Fix-detection-of-seccomp-.patch index 70fca79..5c334d8 100644 --- a/0038-configure-Fix-detection-of-seccomp-.patch +++ b/0037-configure-Fix-detection-of-seccomp-.patch @@ -1,4 +1,4 @@ -From b678731b465e09c6ee1b6a9e98560c6102c703c2 Mon Sep 17 00:00:00 2001 +From 0b135a5863998d3936302e291e69a0b13596fc6f Mon Sep 17 00:00:00 2001 From: markkp Date: Thu, 11 Aug 2016 16:28:39 -0400 Subject: [PATCH] configure: Fix detection of seccomp on s390x @@ -13,7 +13,7 @@ Signed-off-by: Andreas Färber 1 file changed, 3 insertions(+) diff --git a/configure b/configure -index dfd37b1..4eb76a6 100755 +index b882d19..1954f62 100755 --- a/configure +++ b/configure @@ -1902,6 +1902,9 @@ if test "$seccomp" != "no" ; then diff --git a/0039-linux-user-properly-test-for-infini.patch b/0038-linux-user-properly-test-for-infini.patch similarity index 94% rename from 0039-linux-user-properly-test-for-infini.patch rename to 0038-linux-user-properly-test-for-infini.patch index 845fed9..755ce70 100644 --- a/0039-linux-user-properly-test-for-infini.patch +++ b/0038-linux-user-properly-test-for-infini.patch @@ -1,4 +1,4 @@ -From 35d123d3b2508186a8412144186a1d2fb7e033e5 Mon Sep 17 00:00:00 2001 +From 7c9a134065df3deab252918c5172021b5a9e3ab0 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Thu, 8 Sep 2016 11:21:05 +0200 Subject: [PATCH] linux-user: properly test for infinite timeout in poll (#8) diff --git a/qemu-linux-user.changes b/qemu-linux-user.changes index bd52e8b..a198dd7 100644 --- a/qemu-linux-user.changes +++ b/qemu-linux-user.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Wed Sep 21 13:55:35 UTC 2016 - afaerber@suse.de + +- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.7 +* Patches dropped: + 0034-build-link-with-libatomic-on-powerp.patch +* Patches renamed: + 0035-xen-SUSE-xenlinux-unplug-for-emulat.patch -> 0034-xen-SUSE-xenlinux-unplug-for-emulat.patch + 0036-qemu-bridge-helper-reduce-security-.patch -> 0035-qemu-bridge-helper-reduce-security-.patch + 0037-qemu-binfmt-conf-use-qemu-ARCH-binf.patch -> 0036-qemu-binfmt-conf-use-qemu-ARCH-binf.patch + 0038-configure-Fix-detection-of-seccomp-.patch -> 0037-configure-Fix-detection-of-seccomp-.patch + 0039-linux-user-properly-test-for-infini.patch -> 0038-linux-user-properly-test-for-infini.patch + ------------------------------------------------------------------- Sat Sep 10 09:27:57 UTC 2016 - afaerber@suse.de diff --git a/qemu-linux-user.spec b/qemu-linux-user.spec index bd70483..c244afb 100644 --- a/qemu-linux-user.spec +++ b/qemu-linux-user.spec @@ -58,12 +58,11 @@ Patch0030: 0030-configure-Enable-PIE-for-ppc-and-pp.patch Patch0031: 0031-AIO-Reduce-number-of-threads-for-32.patch Patch0032: 0032-dictzip-Fix-on-big-endian-systems.patch Patch0033: 0033-xen_disk-Add-suse-specific-flush-di.patch -Patch0034: 0034-build-link-with-libatomic-on-powerp.patch -Patch0035: 0035-xen-SUSE-xenlinux-unplug-for-emulat.patch -Patch0036: 0036-qemu-bridge-helper-reduce-security-.patch -Patch0037: 0037-qemu-binfmt-conf-use-qemu-ARCH-binf.patch -Patch0038: 0038-configure-Fix-detection-of-seccomp-.patch -Patch0039: 0039-linux-user-properly-test-for-infini.patch +Patch0034: 0034-xen-SUSE-xenlinux-unplug-for-emulat.patch +Patch0035: 0035-qemu-bridge-helper-reduce-security-.patch +Patch0036: 0036-qemu-binfmt-conf-use-qemu-ARCH-binf.patch +Patch0037: 0037-configure-Fix-detection-of-seccomp-.patch +Patch0038: 0038-linux-user-properly-test-for-infini.patch # Please do not add patches manually here, run update_git.sh. # this is to make lint happy Source300: qemu-rpmlintrc @@ -155,7 +154,6 @@ run cross-architecture builds. %patch0036 -p1 %patch0037 -p1 %patch0038 -p1 -%patch0039 -p1 %build ./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \ diff --git a/qemu-testsuite.changes b/qemu-testsuite.changes index 04ff6d7..571209b 100644 --- a/qemu-testsuite.changes +++ b/qemu-testsuite.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Wed Sep 21 13:24:20 UTC 2016 - afaerber@suse.de + +- Document two new options, but leave jemalloc disabled for now +- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.7 +* Patches dropped: + 0034-build-link-with-libatomic-on-powerp.patch +* Patches renamed: + 0035-xen-SUSE-xenlinux-unplug-for-emulat.patch -> 0034-xen-SUSE-xenlinux-unplug-for-emulat.patch + 0036-qemu-bridge-helper-reduce-security-.patch -> 0035-qemu-bridge-helper-reduce-security-.patch + 0037-qemu-binfmt-conf-use-qemu-ARCH-binf.patch -> 0036-qemu-binfmt-conf-use-qemu-ARCH-binf.patch + 0038-configure-Fix-detection-of-seccomp-.patch -> 0037-configure-Fix-detection-of-seccomp-.patch + 0039-linux-user-properly-test-for-infini.patch -> 0038-linux-user-properly-test-for-infini.patch + ------------------------------------------------------------------- Sat Sep 10 09:27:57 UTC 2016 - afaerber@suse.de diff --git a/qemu-testsuite.spec b/qemu-testsuite.spec index d9a380c..e538120 100644 --- a/qemu-testsuite.spec +++ b/qemu-testsuite.spec @@ -120,12 +120,11 @@ Patch0030: 0030-configure-Enable-PIE-for-ppc-and-pp.patch Patch0031: 0031-AIO-Reduce-number-of-threads-for-32.patch Patch0032: 0032-dictzip-Fix-on-big-endian-systems.patch Patch0033: 0033-xen_disk-Add-suse-specific-flush-di.patch -Patch0034: 0034-build-link-with-libatomic-on-powerp.patch -Patch0035: 0035-xen-SUSE-xenlinux-unplug-for-emulat.patch -Patch0036: 0036-qemu-bridge-helper-reduce-security-.patch -Patch0037: 0037-qemu-binfmt-conf-use-qemu-ARCH-binf.patch -Patch0038: 0038-configure-Fix-detection-of-seccomp-.patch -Patch0039: 0039-linux-user-properly-test-for-infini.patch +Patch0034: 0034-xen-SUSE-xenlinux-unplug-for-emulat.patch +Patch0035: 0035-qemu-bridge-helper-reduce-security-.patch +Patch0036: 0036-qemu-binfmt-conf-use-qemu-ARCH-binf.patch +Patch0037: 0037-configure-Fix-detection-of-seccomp-.patch +Patch0038: 0038-linux-user-properly-test-for-infini.patch # Please do not add QEMU patches manually here. # Run update_git.sh to regenerate this queue. @@ -744,7 +743,6 @@ This package provides a service file for starting and stopping KSM. %patch0036 -p1 %patch0037 -p1 %patch0038 -p1 -%patch0039 -p1 %if %{build_x86_fw_from_source} pushd roms/seabios @@ -813,6 +811,7 @@ rm -f pc-bios/slof.bin %else --with-gtkabi=2.0 \ %endif + --disable-jemalloc \ %if %{kvm_available} --enable-kvm \ %else @@ -889,6 +888,7 @@ rm -f pc-bios/slof.bin %else --disable-spice \ %endif + --disable-tcmalloc \ --enable-tpm \ %if 0%{?sles_version} != 11 --enable-usb-redir \ diff --git a/qemu.changes b/qemu.changes index 04ff6d7..571209b 100644 --- a/qemu.changes +++ b/qemu.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Wed Sep 21 13:24:20 UTC 2016 - afaerber@suse.de + +- Document two new options, but leave jemalloc disabled for now +- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.7 +* Patches dropped: + 0034-build-link-with-libatomic-on-powerp.patch +* Patches renamed: + 0035-xen-SUSE-xenlinux-unplug-for-emulat.patch -> 0034-xen-SUSE-xenlinux-unplug-for-emulat.patch + 0036-qemu-bridge-helper-reduce-security-.patch -> 0035-qemu-bridge-helper-reduce-security-.patch + 0037-qemu-binfmt-conf-use-qemu-ARCH-binf.patch -> 0036-qemu-binfmt-conf-use-qemu-ARCH-binf.patch + 0038-configure-Fix-detection-of-seccomp-.patch -> 0037-configure-Fix-detection-of-seccomp-.patch + 0039-linux-user-properly-test-for-infini.patch -> 0038-linux-user-properly-test-for-infini.patch + ------------------------------------------------------------------- Sat Sep 10 09:27:57 UTC 2016 - afaerber@suse.de diff --git a/qemu.spec b/qemu.spec index cd63a10..9f4afd4 100644 --- a/qemu.spec +++ b/qemu.spec @@ -120,12 +120,11 @@ Patch0030: 0030-configure-Enable-PIE-for-ppc-and-pp.patch Patch0031: 0031-AIO-Reduce-number-of-threads-for-32.patch Patch0032: 0032-dictzip-Fix-on-big-endian-systems.patch Patch0033: 0033-xen_disk-Add-suse-specific-flush-di.patch -Patch0034: 0034-build-link-with-libatomic-on-powerp.patch -Patch0035: 0035-xen-SUSE-xenlinux-unplug-for-emulat.patch -Patch0036: 0036-qemu-bridge-helper-reduce-security-.patch -Patch0037: 0037-qemu-binfmt-conf-use-qemu-ARCH-binf.patch -Patch0038: 0038-configure-Fix-detection-of-seccomp-.patch -Patch0039: 0039-linux-user-properly-test-for-infini.patch +Patch0034: 0034-xen-SUSE-xenlinux-unplug-for-emulat.patch +Patch0035: 0035-qemu-bridge-helper-reduce-security-.patch +Patch0036: 0036-qemu-binfmt-conf-use-qemu-ARCH-binf.patch +Patch0037: 0037-configure-Fix-detection-of-seccomp-.patch +Patch0038: 0038-linux-user-properly-test-for-infini.patch # Please do not add QEMU patches manually here. # Run update_git.sh to regenerate this queue. @@ -744,7 +743,6 @@ This package provides a service file for starting and stopping KSM. %patch0036 -p1 %patch0037 -p1 %patch0038 -p1 -%patch0039 -p1 %if %{build_x86_fw_from_source} pushd roms/seabios @@ -813,6 +811,7 @@ rm -f pc-bios/slof.bin %else --with-gtkabi=2.0 \ %endif + --disable-jemalloc \ %if %{kvm_available} --enable-kvm \ %else @@ -889,6 +888,7 @@ rm -f pc-bios/slof.bin %else --disable-spice \ %endif + --disable-tcmalloc \ --enable-tpm \ %if 0%{?sles_version} != 11 --enable-usb-redir \ diff --git a/qemu.spec.in b/qemu.spec.in index 7e0434b..c5381f6 100644 --- a/qemu.spec.in +++ b/qemu.spec.in @@ -738,6 +738,7 @@ rm -f pc-bios/slof.bin %else --with-gtkabi=2.0 \ %endif + --disable-jemalloc \ %if %{kvm_available} --enable-kvm \ %else @@ -814,6 +815,7 @@ rm -f pc-bios/slof.bin %else --disable-spice \ %endif + --disable-tcmalloc \ --enable-tpm \ %if 0%{?sles_version} != 11 --enable-usb-redir \