qemu: update to 2.8.0.

This commit is contained in:
Enno Boland 2016-12-21 16:01:27 +01:00
parent d3a6f71352
commit 5a8092f483
6 changed files with 29 additions and 43 deletions

View file

@ -1,6 +1,6 @@
--- qemu-seccomp.c --- qemu-seccomp.c.orig 2016-12-20 21:16:49.000000000 +0100
+++ qemu-seccomp.c +++ qemu-seccomp.c 2016-12-21 15:38:19.133450687 +0100
@@ -25,15 +25,21 @@ static const struct QemuSeccompSyscall seccomp_whitelist[] = { @@ -35,15 +35,21 @@ static const struct QemuSeccompSyscall s
{ SCMP_SYS(timer_settime), 255 }, { SCMP_SYS(timer_settime), 255 },
{ SCMP_SYS(timer_gettime), 254 }, { SCMP_SYS(timer_gettime), 254 },
{ SCMP_SYS(futex), 253 }, { SCMP_SYS(futex), 253 },
@ -24,7 +24,7 @@
{ SCMP_SYS(mprotect), 246 }, { SCMP_SYS(mprotect), 246 },
{ SCMP_SYS(execve), 245 }, { SCMP_SYS(execve), 245 },
{ SCMP_SYS(open), 245 }, { SCMP_SYS(open), 245 },
@@ -48,13 +54,11 @@ static const struct QemuSeccompSyscall seccomp_whitelist[] = { @@ -58,13 +64,11 @@ static const struct QemuSeccompSyscall s
{ SCMP_SYS(bind), 245 }, { SCMP_SYS(bind), 245 },
{ SCMP_SYS(listen), 245 }, { SCMP_SYS(listen), 245 },
{ SCMP_SYS(semget), 245 }, { SCMP_SYS(semget), 245 },
@ -35,10 +35,10 @@
{ SCMP_SYS(prctl), 245 }, { SCMP_SYS(prctl), 245 },
{ SCMP_SYS(signalfd), 245 }, { SCMP_SYS(signalfd), 245 },
- { SCMP_SYS(getrlimit), 245 }, - { SCMP_SYS(getrlimit), 245 },
{ SCMP_SYS(getrusage), 245 },
{ SCMP_SYS(set_tid_address), 245 }, { SCMP_SYS(set_tid_address), 245 },
{ SCMP_SYS(statfs), 245 }, { SCMP_SYS(statfs), 245 },
{ SCMP_SYS(unlink), 245 }, @@ -104,7 +108,6 @@ static const struct QemuSeccompSyscall s
@@ -93,7 +97,6 @@ static const struct QemuSeccompSyscall seccomp_whitelist[] = {
{ SCMP_SYS(times), 245 }, { SCMP_SYS(times), 245 },
{ SCMP_SYS(exit), 245 }, { SCMP_SYS(exit), 245 },
{ SCMP_SYS(clock_gettime), 245 }, { SCMP_SYS(clock_gettime), 245 },
@ -46,7 +46,7 @@
{ SCMP_SYS(restart_syscall), 245 }, { SCMP_SYS(restart_syscall), 245 },
{ SCMP_SYS(pwrite64), 245 }, { SCMP_SYS(pwrite64), 245 },
{ SCMP_SYS(nanosleep), 245 }, { SCMP_SYS(nanosleep), 245 },
@@ -182,7 +185,6 @@ static const struct QemuSeccompSyscall seccomp_whitelist[] = { @@ -194,7 +197,6 @@ static const struct QemuSeccompSyscall s
{ SCMP_SYS(lstat64), 241 }, { SCMP_SYS(lstat64), 241 },
{ SCMP_SYS(sendfile64), 241 }, { SCMP_SYS(sendfile64), 241 },
{ SCMP_SYS(ugetrlimit), 241 }, { SCMP_SYS(ugetrlimit), 241 },

View file

@ -0,0 +1,10 @@
--- hw/9pfs/9p.c.orig 2016-12-21 15:53:59.997900753 +0100
+++ hw/9pfs/9p.c 2016-12-21 15:54:03.006935717 +0100
@@ -11,6 +11,7 @@
*
*/
+#include <linux/limits.h>
#include "qemu/osdep.h"
#include <glib/gprintf.h>
#include "hw/virtio/virtio.h"

View file

@ -1,11 +1,9 @@
This patch was not upstreamed to qemu as those should probably be This patch was not upstreamed to qemu as those should probably be
defined in musl libc. defined in musl libc.
diff --git linux-user/syscall.c linux-user/syscall.c --- linux-user/syscall.c.orig 2016-12-21 15:42:53.453155713 +0100
index c8989b6..00ed747 100644 +++ linux-user/syscall.c 2016-12-21 15:43:34.995638423 +0100
--- linux-user/syscall.c @@ -114,6 +114,13 @@
+++ linux-user/syscall.c
@@ -114,6 +114,13 @@ int __clone2(int (*fn)(void *), void *child_stack_base,
#include "qemu.h" #include "qemu.h"
@ -16,5 +14,6 @@ index c8989b6..00ed747 100644
+#define F_EXLCK 4 +#define F_EXLCK 4
+#endif +#endif
+ +
#define CLONE_NPTL_FLAGS2 (CLONE_SETTLS | \ #ifndef CLONE_IO
CLONE_PARENT_SETTID | CLONE_CHILD_SETTID | CLONE_CHILD_CLEARTID) #define CLONE_IO 0x80000000 /* Clone io context */
#endif

View file

@ -22,15 +22,3 @@
struct target_sigevent *target_sevp; struct target_sigevent *target_sevp;
if (!lock_user_struct(VERIFY_READ, target_sevp, target_addr, 1)) { if (!lock_user_struct(VERIFY_READ, target_sevp, target_addr, 1)) {
--- linux-user/syscall_defs.h.orig 2015-04-10 07:41:35.410380624 +0000
+++ 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;

View file

@ -1,11 +0,0 @@
--- util/cutils.c.orig 2016-09-05 07:39:30.602027263 +0200
+++ util/cutils.c 2016-09-05 07:39:47.473230538 +0200
@@ -263,7 +263,7 @@ static size_t buffer_find_nonzero_offset
return i * sizeof(VECTYPE);
}
-#if defined CONFIG_AVX2_OPT
+#if defined(__GLIBC__) && defined CONFIG_AVX2_OPT && QEMU_GNUC_PREREQ(4, 9)
#pragma GCC push_options
#pragma GCC target("avx2")
#include <cpuid.h>

View file

@ -1,13 +1,13 @@
# Template file for 'qemu' # Template file for 'qemu'
pkgname=qemu pkgname=qemu
version=2.7.0 version=2.8.0
revision=5 revision=1
short_desc="Open Source Processor Emulator" short_desc="Open Source Processor Emulator"
maintainer="Juan RP <xtraeme@voidlinux.eu>" maintainer="Juan RP <xtraeme@voidlinux.eu>"
homepage="http://qemu.org" homepage="http://qemu.org"
license="GPL-2, LGPL-2.1" license="GPL-2, LGPL-2.1"
distfiles="http://wiki.qemu.org/download/qemu-${version}.tar.bz2" distfiles="http://wiki.qemu.org/download/qemu-${version}.tar.bz2"
checksum=326e739506ba690daf69fc17bd3913a6c313d9928d743bd8eddb82f403f81e53 checksum=dafd5d7f649907b6b617b822692f4c82e60cf29bc0fc58bc2036219b591e5e62
nostrip=yes nostrip=yes
hostmakedepends="pkg-config perl python automake libtool flex" hostmakedepends="pkg-config perl python automake libtool flex"
@ -21,7 +21,7 @@ makedepends="libpng-devel libjpeg-turbo-devel pixman-devel snappy-devel
$(vopt_if opengl 'libepoxy-devel libdrm-devel MesaLib-devel')" $(vopt_if opengl 'libepoxy-devel libdrm-devel MesaLib-devel')"
build_options="gtk opengl sdl sdl2 spice virgl" build_options="gtk opengl sdl sdl2 spice virgl"
build_options_default="opengl sdl virgl" build_options_default="opengl sdl2 virgl"
desc_option_gtk="Enable GTK display and use it by default" desc_option_gtk="Enable GTK display and use it by default"
desc_option_sdl="Use SDL (1.x) video output" desc_option_sdl="Use SDL (1.x) video output"
desc_option_sdl2="Use SDL (2.x) video output" desc_option_sdl2="Use SDL (2.x) video output"