main/qemu: upgrade to 2.8.0

5 files changed, 35 insertions, 46 deletions

diff --git a/main/qemu/APKBUILD b/main/qemu/APKBUILD
index 892991cc85..bef333b41d 100644
--- a/main/qemu/APKBUILD
+++ b/main/qemu/APKBUILD
@@ -2,7 +2,7 @@
 # Contributor: Jakub Jirutka <jakub@jirutka.cz>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=qemu
-pkgver=2.7.0
+pkgver=2.8.0
 pkgrel=0
 pkgdesc="QEMU is a generic machine emulator and virtualizer"
 url="http://qemu.org/"
@@ -98,7 +98,6 @@ _subsystems="
 	system-x86_64
 	system-xtensa
 	system-xtensaeb
-	unicore32
 	x86_64
 	"
 for _sub in $_subsystems; do
@@ -123,7 +122,7 @@ source="http://wiki.qemu-project.org/download/$pkgname-$pkgver.tar.bz2
 	0001-linux-user-fix-build-with-musl-on-aarch64.patch
 	musl-F_SHLCK-and-F_EXLCK.patch
 	fix-sigevent-and-sigval_t.patch
-	configure-ifunc.patch
+	xattr_size_max.patch
 	$pkgname-guest-agent.confd
 	$pkgname-guest-agent.initd
 	80-kvm.rules
@@ -153,7 +152,6 @@ _compile() {
 		--enable-cap-ng \
 		--enable-linux-aio \
 		--enable-usb-redir \
-		--enable-uuid \
 		--enable-libssh2 \
 		--enable-vhost-net \
 		--enable-pie \
@@ -281,35 +279,35 @@ guest() {
 		"$subpkgdir"/etc/conf.d/$pkgname-guest-agent || return 1
 }
 
-md5sums="08d4d06d1cb598efecd796137f4844ab  qemu-2.7.0.tar.bz2
+md5sums="17940dce063b6ce450a12e719a6c9c43  qemu-2.8.0.tar.bz2
 672727bb1d8c8ab7b5def65dd1793c33  0001-elfload-load-PIE-executables-to-right-address.patch
 d364208c4847ad2baeb237900befecd1  0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch
 38fbaee6f2913993169e5b39d96927a1  0001-linux-user-fix-build-with-musl-on-aarch64.patch
-bc5f2e41ed3b6d6d30b672adab82e3e1  musl-F_SHLCK-and-F_EXLCK.patch
-9afbd6c9586229ce64275f012d665e2a  fix-sigevent-and-sigval_t.patch
-a3ec1de5e0513c97a83d211f182a634c  configure-ifunc.patch
+19a26bd596f0a1c55d2e831106ce96f5  musl-F_SHLCK-and-F_EXLCK.patch
+18f3194bdb0751d1c96140bd4d98b86f  fix-sigevent-and-sigval_t.patch
+36b835d7f00aa99f69d909bcdff9b1cf  xattr_size_max.patch
 1663bc6977f6886a58394155b1bf3676  qemu-guest-agent.confd
 ea972f2fc5505488f68320bf386106bb  qemu-guest-agent.initd
 66660f143235201249dc0648b39b86ee  80-kvm.rules
 a2f5570453f2489b6e4023e96f70cb7e  bridge.conf"
-sha256sums="326e739506ba690daf69fc17bd3913a6c313d9928d743bd8eddb82f403f81e53  qemu-2.7.0.tar.bz2
+sha256sums="dafd5d7f649907b6b617b822692f4c82e60cf29bc0fc58bc2036219b591e5e62  qemu-2.8.0.tar.bz2
 af35304b165622a53f7557b59ffd8da5030f5fd444e669c862f9410131f3b987  0001-elfload-load-PIE-executables-to-right-address.patch
 6af6cf9044997710a6d0fbdba30a35c8d775e30d30c032ec97db672f75ec88ac  0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch
 1086ee9ea9411b3bacaf58bc72630a159260ef873a66710b7edb7223be1ea2c0  0001-linux-user-fix-build-with-musl-on-aarch64.patch
-eefd597197223899d3b12d8274af493153e270fd06ea8622e33d6eaeae063d40  musl-F_SHLCK-and-F_EXLCK.patch
-9abdf3410dea742cac3552363950c8a7fbcec8dd2bfd68e3c417a284f4e702f5  fix-sigevent-and-sigval_t.patch
-73a87efa545ee16b8bef9ddea870da29f0eed71a8a6934d2888577b03088286b  configure-ifunc.patch
+ec5e2bd34636c47f464c6b9efd01e487a7b81602c8b598df6efe8d8ceed0c2e5  musl-F_SHLCK-and-F_EXLCK.patch
+5bd5723873af643406b250641e7eaa248ce728b8caf8e761e219728f59ce6072  fix-sigevent-and-sigval_t.patch
+a0c21e70495ac249e3dfcba7420eebe044c6cccc5a8bdc5b635d89ca2e2eac7f  xattr_size_max.patch
 d84e53a94584f37f3bd1b21f44077b5de0d07094c6729f26ae20ab1f7b9cc298  qemu-guest-agent.confd
 5bef90ccab2e743868fd562eee9a3ded35c8d3e01fa387367ed55a0da95570d5  qemu-guest-agent.initd
 37f666f1cdb7d8a62171de69b531681dcb0fba74236729dac8b6c019232eba84  80-kvm.rules
 2f05021990014a5f832aa17317c1464806dc97c278f88d8284db88378f53cb32  bridge.conf"
-sha512sums="654acaa7b3724a288e5d7e2a26ab780d9c9ed9f647fba00a906cbaffbe9d58fd666f2d962514aa2c5b391b4c53811ac3170d2eb51727f090bd19dfe45ca9a9db  qemu-2.7.0.tar.bz2
+sha512sums="50f2988d822388ba9fd1bf5dbe68359033ed7432d7f0f9790299f32f63faa6dc72979256b5632ba572d47ee3e74ed40e3e8e331dc6303ec1599f1b4367cb78c2  qemu-2.8.0.tar.bz2
 405008589cad1c8b609eca004d520bf944366e8525f85a19fc6e283c95b84b6c2429822ba064675823ab69f1406a57377266a65021623d1cd581e7db000134fd  0001-elfload-load-PIE-executables-to-right-address.patch
 ec84b27648c01c6e58781295dcd0c2ff8e5a635f9836ef50c1da5d0ed125db1afc4cb5b01cb97606d6dd8f417acba93e1560d9a32ca29161a4bb730b302440ea  0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch
 4431dad803156d424a6c9fc74783762590b27fcb3bfadb6b23b149bc9e71c31f139991541aa4e0583c17ac531242dff02ebf4d5a8f9a9a77be757fb30cb65565  0001-linux-user-fix-build-with-musl-on-aarch64.patch
-5de10f7e8abae16d1d7521e5ca1bfb62a8f295b324bea84f122f882b7b9354c21e5a00b20a1c5484c1b737b937e53c4ca6979e55705522f0779a5669725369f5  musl-F_SHLCK-and-F_EXLCK.patch
-e3f006c28318669356cd5b778f26774f06b0a40a4ac852573379df63efcc8276869958faec16797a38bf96c6061dfc040309e462d8559984f67eaf4af701ca1a  fix-sigevent-and-sigval_t.patch
-f51a2906b8685c007c6dbba9ecfe1cc3a34cad4fe1264a2d02e1add05a391d95bfe05524adf58d1a880d39a2b23bcce6a850265b82c49f64171019bdf38978de  configure-ifunc.patch
+224f5b44da749921e8a821359478c5238d8b6e24a9c0b4c5738c34e82f3062ec4639d495b8b5883d304af4a0d567e38aa6623aac1aa3a7164a5757c036528ac0  musl-F_SHLCK-and-F_EXLCK.patch
+5da8114b9bd2e62f0f1f0f73f393fdbd738c5dea827ea60cedffd6f6edd0f5a97489c7148d37a8ec5a148d4e65d75cbefe9353714ee6b6f51a600200133fc914  fix-sigevent-and-sigval_t.patch
+4b1e26ba4d53f9f762cbd5cea8ef6f8062d827ae3ae07bc36c5b0c0be4e94fc1856ad2477e8e791b074b8a25d51ed6d0ddd75e605e54600e5dd0799143793ce4  xattr_size_max.patch
 d90c034cae3f9097466854ed1a9f32ab4b02089fcdf7320e8f4da13b2b1ff65067233f48809911485e4431d7ec1a22448b934121bc9522a2dc489009e87e2b1f  qemu-guest-agent.confd
 316b40d97587fea717821852859d81039cfdcb276a658bb6e6fb554e321d5856a833ebb3778149c4732cea625bac320b1008d374c88a9aae35c0fb67977c01b7  qemu-guest-agent.initd
 9b7a89b20fcf737832cb7b4d5dc7d8301dd88169cbe5339eda69fbb51c2e537d8cb9ec7cf37600899e734209e63410d50d0821bce97e401421db39c294d97be2  80-kvm.rules
diff --git a/main/qemu/configure-ifunc.patch b/main/qemu/configure-ifunc.patch
deleted file mode 100644
index 3d455a9628..0000000000
--- a/main/qemu/configure-ifunc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./configure.orig
-+++ ./configure
-@@ -1805,7 +1805,7 @@
- EOF
-   if compile_object "" ; then
-       if has readelf; then
--          if readelf --syms $TMPO 2>/dev/null |grep -q "IFUNC.*foo"; then
-+          if readelf --syms $TMPO 2>/dev/null |grep -q "IFUNC.*foo" && ldd $TMPO >/dev/null 2>&1; then
-               avx2_opt="yes"
-           fi
-       fi
diff --git a/main/qemu/fix-sigevent-and-sigval_t.patch b/main/qemu/fix-sigevent-and-sigval_t.patch
index 04853a7b8a..1f99eacb60 100644
--- a/main/qemu/fix-sigevent-and-sigval_t.patch
+++ b/main/qemu/fix-sigevent-and-sigval_t.patch
@@ -22,14 +22,3 @@
      struct target_sigevent *target_sevp;
  
      if (!lock_user_struct(VERIFY_READ, target_sevp, target_addr, 1)) {
---- qemu-2.2.1/linux-user/syscall_defs.h.orig	2015-04-10 07:41:35.410380624 +0000
-+++ qemu-2.2.1/linux-user/syscall_defs.h	2015-04-10 07:42:30.401391516 +0000
-@@ -2589,7 +2589,7 @@
-         int32_t _tid;
- 
-         struct {
--            void (*_function)(sigval_t);
-+            void (*_function)(union sigval);
-             void *_attribute;
-         } _sigev_thread;
-     } _sigev_un;
diff --git a/main/qemu/musl-F_SHLCK-and-F_EXLCK.patch b/main/qemu/musl-F_SHLCK-and-F_EXLCK.patch
index 92157a7764..316819afab 100644
--- a/main/qemu/musl-F_SHLCK-and-F_EXLCK.patch
+++ b/main/qemu/musl-F_SHLCK-and-F_EXLCK.patch
@@ -1,11 +1,9 @@
 This patch was not upstreamed to qemu as those should probably be
 defined in musl libc.
 
-diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index c8989b6..00ed747 100644
---- a/linux-user/syscall.c
-+++ b/linux-user/syscall.c
-@@ -114,6 +114,13 @@ int __clone2(int (*fn)(void *), void *child_stack_base,
+--- ./linux-user/syscall.c.orig
++++ ./linux-user/syscall.c
+@@ -114,6 +114,13 @@
  
  #include "qemu.h"
  
@@ -16,6 +14,6 @@ index c8989b6..00ed747 100644
 +#define F_EXLCK 4
 +#endif
 +
- #define CLONE_NPTL_FLAGS2 (CLONE_SETTLS | \
-     CLONE_PARENT_SETTID | CLONE_CHILD_SETTID | CLONE_CHILD_CLEARTID)
- 
+ #ifndef CLONE_IO
+ #define CLONE_IO                0x80000000      /* Clone io context */
+ #endif
diff --git a/main/qemu/xattr_size_max.patch b/main/qemu/xattr_size_max.patch
new file mode 100644
index 0000000000..1a33cbf5e8
--- /dev/null
+++ b/main/qemu/xattr_size_max.patch
@@ -0,0 +1,15 @@
+diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c
+index faebd91..a0f15b6 100644
+--- a/hw/9pfs/9p.c
++++ b/hw/9pfs/9p.c
+@@ -25,6 +25,10 @@
+ #include "trace.h"
+ #include "migration/migration.h"
+ 
++#ifdef __linux__
++#include <linux/limits.h> /* for XATTR_SIZE_MAX */
++#endif
++
+ int open_fd_hw;
+ int total_open_fd;
+ static int open_fd_rc;