diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-06-03 11:07:42 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-06-05 11:59:28 +0200 |
| commit | 264341aa9b523d5b40b759c8abb425fb67772357 (patch) | |
| tree | 3919b531d1c76cb54c577a6724d8bbe653692094 /patches | |
| parent | 90f2cf515e00d33b5ae0674b1ad5fdd1eddec5a3 (diff) | |
| download | ptxdist-264341aa9b523d5b40b759c8abb425fb67772357.tar.gz ptxdist-264341aa9b523d5b40b759c8abb425fb67772357.tar.xz | |
host-qemu: version bump 2.11.1 -> 2.12.0
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/qemu-2.11.1/0001-memfd-fix-configure-test.patch | 53 | ||||
| -rw-r--r-- | patches/qemu-2.11.1/series | 4 |
2 files changed, 0 insertions, 57 deletions
diff --git a/patches/qemu-2.11.1/0001-memfd-fix-configure-test.patch b/patches/qemu-2.11.1/0001-memfd-fix-configure-test.patch deleted file mode 100644 index 5cd83bc9d..000000000 --- a/patches/qemu-2.11.1/0001-memfd-fix-configure-test.patch +++ /dev/null @@ -1,53 +0,0 @@ -From: Paolo Bonzini <pbonzini@redhat.com> -Date: Tue, 28 Nov 2017 10:51:27 +0100 -Subject: [PATCH] memfd: fix configure test -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -memfd: fix configure test - -Recent glibc added memfd_create in sys/mman.h. This conflicts with -the definition in util/memfd.c: - - /builddir/build/BUILD/qemu-2.11.0-rc1/util/memfd.c:40:12: error: static declaration of memfd_create follows non-static declaration - -Fix the configure test, and remove the sys/memfd.h inclusion since the -file actually does not exist---it is a typo in the memfd_create(2) man -page. - -Cc: Marc-André Lureau <marcandre.lureau@redhat.com> -Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> ---- - configure | 2 +- - util/memfd.c | 4 +--- - 2 files changed, 2 insertions(+), 4 deletions(-) - -diff --git a/configure b/configure -index 0c6e7572dbab..087a82ac5078 100755 ---- a/configure -+++ b/configure -@@ -3920,7 +3920,7 @@ fi - # check if memfd is supported - memfd=no - cat > $TMPC << EOF --#include <sys/memfd.h> -+#include <sys/mman.h> - - int main(void) - { -diff --git a/util/memfd.c b/util/memfd.c -index 4571d1aba866..412e94a405fc 100644 ---- a/util/memfd.c -+++ b/util/memfd.c -@@ -31,9 +31,7 @@ - - #include "qemu/memfd.h" - --#ifdef CONFIG_MEMFD --#include <sys/memfd.h> --#elif defined CONFIG_LINUX -+#if defined CONFIG_LINUX && !defined CONFIG_MEMFD - #include <sys/syscall.h> - #include <asm/unistd.h> - diff --git a/patches/qemu-2.11.1/series b/patches/qemu-2.11.1/series deleted file mode 100644 index 5b788e769..000000000 --- a/patches/qemu-2.11.1/series +++ /dev/null @@ -1,4 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-memfd-fix-configure-test.patch -# a80cc11e888c6a195772f02f6db2ce56 - git-ptx-patches magic |