From 02c14e13d4101543aeed4b3c605946a5e0749b76 Mon Sep 17 00:00:00 2001 From: Daniel P. Berrangé Date: Jun 15 2018 15:59:10 +0000 Subject: Pull in more build patches Signed-off-by: Daniel P. Berrangé --- diff --git a/patches/libvirt-2.1.0/0001-gnulib-mktime.patch b/patches/libvirt-2.1.0/0001-gnulib-mktime.patch new file mode 100644 index 0000000..29c6ba1 --- /dev/null +++ b/patches/libvirt-2.1.0/0001-gnulib-mktime.patch @@ -0,0 +1,18 @@ +diff -rup libvirt-2.2.0/gnulib/lib/intprops.h libvirt-2.2.0.new/gnulib/lib/intprops.h +--- libvirt-2.2.0/gnulib/lib/intprops.h 2016-07-27 13:53:13.407978999 +0100 ++++ libvirt-2.2.0.new/gnulib/lib/intprops.h 2018-02-08 11:00:40.387085929 +0000 +@@ -230,11 +230,11 @@ verify (TYPE_MAXIMUM (long long int) == + (e.g., A and B) have the same type as MIN and MAX. Instead, they assume + that the result (e.g., A + B) has that type. */ + #if _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL +-# define _GL_ADD_OVERFLOW(a, b, min, max) ++# define _GL_ADD_OVERFLOW(a, b, min, max) \ + __builtin_add_overflow (a, b, (__typeof__ ((a) + (b)) *) 0) +-# define _GL_SUBTRACT_OVERFLOW(a, b, min, max) ++# define _GL_SUBTRACT_OVERFLOW(a, b, min, max) \ + __builtin_sub_overflow (a, b, (__typeof__ ((a) - (b)) *) 0) +-# define _GL_MULTIPLY_OVERFLOW(a, b, min, max) ++# define _GL_MULTIPLY_OVERFLOW(a, b, min, max) \ + __builtin_mul_overflow (a, b, (__typeof__ ((a) * (b)) *) 0) + #else + # define _GL_ADD_OVERFLOW(a, b, min, max) \ diff --git a/patches/libvirt-2.2.0/0001-gnulib-mktime.patch b/patches/libvirt-2.2.0/0001-gnulib-mktime.patch new file mode 100644 index 0000000..29c6ba1 --- /dev/null +++ b/patches/libvirt-2.2.0/0001-gnulib-mktime.patch @@ -0,0 +1,18 @@ +diff -rup libvirt-2.2.0/gnulib/lib/intprops.h libvirt-2.2.0.new/gnulib/lib/intprops.h +--- libvirt-2.2.0/gnulib/lib/intprops.h 2016-07-27 13:53:13.407978999 +0100 ++++ libvirt-2.2.0.new/gnulib/lib/intprops.h 2018-02-08 11:00:40.387085929 +0000 +@@ -230,11 +230,11 @@ verify (TYPE_MAXIMUM (long long int) == + (e.g., A and B) have the same type as MIN and MAX. Instead, they assume + that the result (e.g., A + B) has that type. */ + #if _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL +-# define _GL_ADD_OVERFLOW(a, b, min, max) ++# define _GL_ADD_OVERFLOW(a, b, min, max) \ + __builtin_add_overflow (a, b, (__typeof__ ((a) + (b)) *) 0) +-# define _GL_SUBTRACT_OVERFLOW(a, b, min, max) ++# define _GL_SUBTRACT_OVERFLOW(a, b, min, max) \ + __builtin_sub_overflow (a, b, (__typeof__ ((a) - (b)) *) 0) +-# define _GL_MULTIPLY_OVERFLOW(a, b, min, max) ++# define _GL_MULTIPLY_OVERFLOW(a, b, min, max) \ + __builtin_mul_overflow (a, b, (__typeof__ ((a) * (b)) *) 0) + #else + # define _GL_ADD_OVERFLOW(a, b, min, max) \ diff --git a/patches/libvirt-3.4.0/0001-gnulib-getopt.patch b/patches/libvirt-3.4.0/0001-gnulib-getopt.patch new file mode 100644 index 0000000..c4cbb39 --- /dev/null +++ b/patches/libvirt-3.4.0/0001-gnulib-getopt.patch @@ -0,0 +1,30 @@ +diff -rup libvirt-3.4.0/gnulib/lib/getopt-pfx-core.h libvirt-3.4.0.new/gnulib/lib/getopt-pfx-core.h +--- libvirt-3.4.0/gnulib/lib/getopt-pfx-core.h 2017-05-27 17:19:29.321435467 +0100 ++++ libvirt-3.4.0.new/gnulib/lib/getopt-pfx-core.h 2018-02-08 13:17:13.294955489 +0000 +@@ -47,6 +47,11 @@ + # define opterr __GETOPT_ID (opterr) + # define optind __GETOPT_ID (optind) + # define optopt __GETOPT_ID (optopt) ++ ++/* The system's getopt.h may have already included getopt-core.h to ++ declare the unprefixed identifiers. Undef _GETOPT_CORE_H so that ++ getopt-core.h declares them with prefixes. */ ++# undef _GETOPT_CORE_H + #endif + + #include +diff -rup libvirt-3.4.0/gnulib/lib/getopt-pfx-ext.h libvirt-3.4.0.new/gnulib/lib/getopt-pfx-ext.h +--- libvirt-3.4.0/gnulib/lib/getopt-pfx-ext.h 2017-05-27 17:19:29.325435426 +0100 ++++ libvirt-3.4.0.new/gnulib/lib/getopt-pfx-ext.h 2018-02-08 13:17:13.294955489 +0000 +@@ -45,6 +45,11 @@ + # define getopt_long_only __GETOPT_ID (getopt_long_only) + # define option __GETOPT_ID (option) + # define _getopt_internal __GETOPT_ID (getopt_internal) ++ ++/* The system's getopt.h may have already included getopt-ext.h to ++ declare the unprefixed identifiers. Undef _GETOPT_EXT_H so that ++ getopt-ext.h declares them with prefixes. */ ++# undef _GETOPT_EXT_H + #endif + + /* Standalone applications get correct prototypes for getopt_long and diff --git a/patches/qemu-1.7.1/0001-scripts-text2pod.pl-Escape-left-brace.patch b/patches/qemu-1.7.1/0001-scripts-text2pod.pl-Escape-left-brace.patch new file mode 100644 index 0000000..0502a75 --- /dev/null +++ b/patches/qemu-1.7.1/0001-scripts-text2pod.pl-Escape-left-brace.patch @@ -0,0 +1,33 @@ +From aa5ccadcca3e6018ebd9d2e8b0a0604f7cb0cd59 Mon Sep 17 00:00:00 2001 +From: Fam Zheng +Date: Tue, 20 Oct 2015 15:38:46 +0800 +Subject: [PATCH] scripts/text2pod.pl: Escape left brace + +Latest perl now deprecates "{" literal in regex and print warnings like +"unescaped left brace in regex is deprecated". Add escapes to keep it +happy. + +Signed-off-by: Fam Zheng + +Message-Id: <1445326726-16031-1-git-send-email-famz@redhat.com> +Signed-off-by: Paolo Bonzini +--- + scripts/texi2pod.pl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/texi2pod.pl b/scripts/texi2pod.pl +index 94097fb065..8767662d30 100755 +--- a/scripts/texi2pod.pl ++++ b/scripts/texi2pod.pl +@@ -317,7 +317,7 @@ while(<$inf>) { + @columns = (); + for $column (split (/\s*\@tab\s*/, $1)) { + # @strong{...} is used a @headitem work-alike +- $column =~ s/^\@strong{(.*)}$/$1/; ++ $column =~ s/^\@strong\{(.*)\}$/$1/; + push @columns, $column; + } + $_ = "\n=item ".join (" : ", @columns)."\n"; +-- +2.14.3 + diff --git a/patches/qemu-2.10.0/0001-memfd-fix-configure-test.patch b/patches/qemu-2.10.0/0001-memfd-fix-configure-test.patch new file mode 100644 index 0000000..ef3e695 --- /dev/null +++ b/patches/qemu-2.10.0/0001-memfd-fix-configure-test.patch @@ -0,0 +1,55 @@ +From bc748893aaa27c122a96a212e8233bd5b8695a1a Mon Sep 17 00:00:00 2001 +From: Paolo Bonzini +Date: Tue, 28 Nov 2017 11:51:27 +0100 +Subject: [PATCH] memfd: fix configure test +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +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 +Signed-off-by: Paolo Bonzini +--- + configure | 2 +- + util/memfd.c | 4 +--- + 2 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/configure b/configure +index 0c6e7572db..087a82ac50 100755 +--- a/configure ++++ b/configure +@@ -3920,7 +3920,7 @@ fi + # check if memfd is supported + memfd=no + cat > $TMPC << EOF +-#include ++#include + + int main(void) + { +diff --git a/util/memfd.c b/util/memfd.c +index 4571d1aba8..412e94a405 100644 +--- a/util/memfd.c ++++ b/util/memfd.c +@@ -31,9 +31,7 @@ + + #include "qemu/memfd.h" + +-#ifdef CONFIG_MEMFD +-#include +-#elif defined CONFIG_LINUX ++#if defined CONFIG_LINUX && !defined CONFIG_MEMFD + #include + #include + +-- +2.17.0 + diff --git a/patches/qemu-2.10.1/0001-memfd-fix-configure-test.patch b/patches/qemu-2.10.1/0001-memfd-fix-configure-test.patch new file mode 100644 index 0000000..ef3e695 --- /dev/null +++ b/patches/qemu-2.10.1/0001-memfd-fix-configure-test.patch @@ -0,0 +1,55 @@ +From bc748893aaa27c122a96a212e8233bd5b8695a1a Mon Sep 17 00:00:00 2001 +From: Paolo Bonzini +Date: Tue, 28 Nov 2017 11:51:27 +0100 +Subject: [PATCH] memfd: fix configure test +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +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 +Signed-off-by: Paolo Bonzini +--- + configure | 2 +- + util/memfd.c | 4 +--- + 2 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/configure b/configure +index 0c6e7572db..087a82ac50 100755 +--- a/configure ++++ b/configure +@@ -3920,7 +3920,7 @@ fi + # check if memfd is supported + memfd=no + cat > $TMPC << EOF +-#include ++#include + + int main(void) + { +diff --git a/util/memfd.c b/util/memfd.c +index 4571d1aba8..412e94a405 100644 +--- a/util/memfd.c ++++ b/util/memfd.c +@@ -31,9 +31,7 @@ + + #include "qemu/memfd.h" + +-#ifdef CONFIG_MEMFD +-#include +-#elif defined CONFIG_LINUX ++#if defined CONFIG_LINUX && !defined CONFIG_MEMFD + #include + #include + +-- +2.17.0 + diff --git a/patches/qemu-2.10.2/0001-memfd-fix-configure-test.patch b/patches/qemu-2.10.2/0001-memfd-fix-configure-test.patch new file mode 100644 index 0000000..ef3e695 --- /dev/null +++ b/patches/qemu-2.10.2/0001-memfd-fix-configure-test.patch @@ -0,0 +1,55 @@ +From bc748893aaa27c122a96a212e8233bd5b8695a1a Mon Sep 17 00:00:00 2001 +From: Paolo Bonzini +Date: Tue, 28 Nov 2017 11:51:27 +0100 +Subject: [PATCH] memfd: fix configure test +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +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 +Signed-off-by: Paolo Bonzini +--- + configure | 2 +- + util/memfd.c | 4 +--- + 2 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/configure b/configure +index 0c6e7572db..087a82ac50 100755 +--- a/configure ++++ b/configure +@@ -3920,7 +3920,7 @@ fi + # check if memfd is supported + memfd=no + cat > $TMPC << EOF +-#include ++#include + + int main(void) + { +diff --git a/util/memfd.c b/util/memfd.c +index 4571d1aba8..412e94a405 100644 +--- a/util/memfd.c ++++ b/util/memfd.c +@@ -31,9 +31,7 @@ + + #include "qemu/memfd.h" + +-#ifdef CONFIG_MEMFD +-#include +-#elif defined CONFIG_LINUX ++#if defined CONFIG_LINUX && !defined CONFIG_MEMFD + #include + #include + +-- +2.17.0 + diff --git a/patches/qemu-2.11.0/0001-memfd-fix-configure-test.patch b/patches/qemu-2.11.0/0001-memfd-fix-configure-test.patch new file mode 100644 index 0000000..ef3e695 --- /dev/null +++ b/patches/qemu-2.11.0/0001-memfd-fix-configure-test.patch @@ -0,0 +1,55 @@ +From bc748893aaa27c122a96a212e8233bd5b8695a1a Mon Sep 17 00:00:00 2001 +From: Paolo Bonzini +Date: Tue, 28 Nov 2017 11:51:27 +0100 +Subject: [PATCH] memfd: fix configure test +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +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 +Signed-off-by: Paolo Bonzini +--- + configure | 2 +- + util/memfd.c | 4 +--- + 2 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/configure b/configure +index 0c6e7572db..087a82ac50 100755 +--- a/configure ++++ b/configure +@@ -3920,7 +3920,7 @@ fi + # check if memfd is supported + memfd=no + cat > $TMPC << EOF +-#include ++#include + + int main(void) + { +diff --git a/util/memfd.c b/util/memfd.c +index 4571d1aba8..412e94a405 100644 +--- a/util/memfd.c ++++ b/util/memfd.c +@@ -31,9 +31,7 @@ + + #include "qemu/memfd.h" + +-#ifdef CONFIG_MEMFD +-#include +-#elif defined CONFIG_LINUX ++#if defined CONFIG_LINUX && !defined CONFIG_MEMFD + #include + #include + +-- +2.17.0 + 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 new file mode 100644 index 0000000..ef3e695 --- /dev/null +++ b/patches/qemu-2.11.1/0001-memfd-fix-configure-test.patch @@ -0,0 +1,55 @@ +From bc748893aaa27c122a96a212e8233bd5b8695a1a Mon Sep 17 00:00:00 2001 +From: Paolo Bonzini +Date: Tue, 28 Nov 2017 11:51:27 +0100 +Subject: [PATCH] memfd: fix configure test +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +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 +Signed-off-by: Paolo Bonzini +--- + configure | 2 +- + util/memfd.c | 4 +--- + 2 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/configure b/configure +index 0c6e7572db..087a82ac50 100755 +--- a/configure ++++ b/configure +@@ -3920,7 +3920,7 @@ fi + # check if memfd is supported + memfd=no + cat > $TMPC << EOF +-#include ++#include + + int main(void) + { +diff --git a/util/memfd.c b/util/memfd.c +index 4571d1aba8..412e94a405 100644 +--- a/util/memfd.c ++++ b/util/memfd.c +@@ -31,9 +31,7 @@ + + #include "qemu/memfd.h" + +-#ifdef CONFIG_MEMFD +-#include +-#elif defined CONFIG_LINUX ++#if defined CONFIG_LINUX && !defined CONFIG_MEMFD + #include + #include + +-- +2.17.0 + diff --git a/patches/qemu-2.5.0/0001-memfd-fix-configure-test.patch b/patches/qemu-2.5.0/0001-memfd-fix-configure-test.patch new file mode 100644 index 0000000..ef3e695 --- /dev/null +++ b/patches/qemu-2.5.0/0001-memfd-fix-configure-test.patch @@ -0,0 +1,55 @@ +From bc748893aaa27c122a96a212e8233bd5b8695a1a Mon Sep 17 00:00:00 2001 +From: Paolo Bonzini +Date: Tue, 28 Nov 2017 11:51:27 +0100 +Subject: [PATCH] memfd: fix configure test +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +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 +Signed-off-by: Paolo Bonzini +--- + configure | 2 +- + util/memfd.c | 4 +--- + 2 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/configure b/configure +index 0c6e7572db..087a82ac50 100755 +--- a/configure ++++ b/configure +@@ -3920,7 +3920,7 @@ fi + # check if memfd is supported + memfd=no + cat > $TMPC << EOF +-#include ++#include + + int main(void) + { +diff --git a/util/memfd.c b/util/memfd.c +index 4571d1aba8..412e94a405 100644 +--- a/util/memfd.c ++++ b/util/memfd.c +@@ -31,9 +31,7 @@ + + #include "qemu/memfd.h" + +-#ifdef CONFIG_MEMFD +-#include +-#elif defined CONFIG_LINUX ++#if defined CONFIG_LINUX && !defined CONFIG_MEMFD + #include + #include + +-- +2.17.0 + diff --git a/patches/qemu-2.5.1.1/0001-memfd-fix-configure-test.patch b/patches/qemu-2.5.1.1/0001-memfd-fix-configure-test.patch new file mode 100644 index 0000000..ef3e695 --- /dev/null +++ b/patches/qemu-2.5.1.1/0001-memfd-fix-configure-test.patch @@ -0,0 +1,55 @@ +From bc748893aaa27c122a96a212e8233bd5b8695a1a Mon Sep 17 00:00:00 2001 +From: Paolo Bonzini +Date: Tue, 28 Nov 2017 11:51:27 +0100 +Subject: [PATCH] memfd: fix configure test +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +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 +Signed-off-by: Paolo Bonzini +--- + configure | 2 +- + util/memfd.c | 4 +--- + 2 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/configure b/configure +index 0c6e7572db..087a82ac50 100755 +--- a/configure ++++ b/configure +@@ -3920,7 +3920,7 @@ fi + # check if memfd is supported + memfd=no + cat > $TMPC << EOF +-#include ++#include + + int main(void) + { +diff --git a/util/memfd.c b/util/memfd.c +index 4571d1aba8..412e94a405 100644 +--- a/util/memfd.c ++++ b/util/memfd.c +@@ -31,9 +31,7 @@ + + #include "qemu/memfd.h" + +-#ifdef CONFIG_MEMFD +-#include +-#elif defined CONFIG_LINUX ++#if defined CONFIG_LINUX && !defined CONFIG_MEMFD + #include + #include + +-- +2.17.0 + diff --git a/patches/qemu-2.5.1/0001-memfd-fix-configure-test.patch b/patches/qemu-2.5.1/0001-memfd-fix-configure-test.patch new file mode 100644 index 0000000..ef3e695 --- /dev/null +++ b/patches/qemu-2.5.1/0001-memfd-fix-configure-test.patch @@ -0,0 +1,55 @@ +From bc748893aaa27c122a96a212e8233bd5b8695a1a Mon Sep 17 00:00:00 2001 +From: Paolo Bonzini +Date: Tue, 28 Nov 2017 11:51:27 +0100 +Subject: [PATCH] memfd: fix configure test +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +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 +Signed-off-by: Paolo Bonzini +--- + configure | 2 +- + util/memfd.c | 4 +--- + 2 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/configure b/configure +index 0c6e7572db..087a82ac50 100755 +--- a/configure ++++ b/configure +@@ -3920,7 +3920,7 @@ fi + # check if memfd is supported + memfd=no + cat > $TMPC << EOF +-#include ++#include + + int main(void) + { +diff --git a/util/memfd.c b/util/memfd.c +index 4571d1aba8..412e94a405 100644 +--- a/util/memfd.c ++++ b/util/memfd.c +@@ -31,9 +31,7 @@ + + #include "qemu/memfd.h" + +-#ifdef CONFIG_MEMFD +-#include +-#elif defined CONFIG_LINUX ++#if defined CONFIG_LINUX && !defined CONFIG_MEMFD + #include + #include + +-- +2.17.0 + diff --git a/patches/qemu-2.6.0/0001-memfd-fix-configure-test.patch b/patches/qemu-2.6.0/0001-memfd-fix-configure-test.patch new file mode 100644 index 0000000..ef3e695 --- /dev/null +++ b/patches/qemu-2.6.0/0001-memfd-fix-configure-test.patch @@ -0,0 +1,55 @@ +From bc748893aaa27c122a96a212e8233bd5b8695a1a Mon Sep 17 00:00:00 2001 +From: Paolo Bonzini +Date: Tue, 28 Nov 2017 11:51:27 +0100 +Subject: [PATCH] memfd: fix configure test +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +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 +Signed-off-by: Paolo Bonzini +--- + configure | 2 +- + util/memfd.c | 4 +--- + 2 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/configure b/configure +index 0c6e7572db..087a82ac50 100755 +--- a/configure ++++ b/configure +@@ -3920,7 +3920,7 @@ fi + # check if memfd is supported + memfd=no + cat > $TMPC << EOF +-#include ++#include + + int main(void) + { +diff --git a/util/memfd.c b/util/memfd.c +index 4571d1aba8..412e94a405 100644 +--- a/util/memfd.c ++++ b/util/memfd.c +@@ -31,9 +31,7 @@ + + #include "qemu/memfd.h" + +-#ifdef CONFIG_MEMFD +-#include +-#elif defined CONFIG_LINUX ++#if defined CONFIG_LINUX && !defined CONFIG_MEMFD + #include + #include + +-- +2.17.0 + diff --git a/patches/qemu-2.6.1/0001-memfd-fix-configure-test.patch b/patches/qemu-2.6.1/0001-memfd-fix-configure-test.patch new file mode 100644 index 0000000..ef3e695 --- /dev/null +++ b/patches/qemu-2.6.1/0001-memfd-fix-configure-test.patch @@ -0,0 +1,55 @@ +From bc748893aaa27c122a96a212e8233bd5b8695a1a Mon Sep 17 00:00:00 2001 +From: Paolo Bonzini +Date: Tue, 28 Nov 2017 11:51:27 +0100 +Subject: [PATCH] memfd: fix configure test +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +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 +Signed-off-by: Paolo Bonzini +--- + configure | 2 +- + util/memfd.c | 4 +--- + 2 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/configure b/configure +index 0c6e7572db..087a82ac50 100755 +--- a/configure ++++ b/configure +@@ -3920,7 +3920,7 @@ fi + # check if memfd is supported + memfd=no + cat > $TMPC << EOF +-#include ++#include + + int main(void) + { +diff --git a/util/memfd.c b/util/memfd.c +index 4571d1aba8..412e94a405 100644 +--- a/util/memfd.c ++++ b/util/memfd.c +@@ -31,9 +31,7 @@ + + #include "qemu/memfd.h" + +-#ifdef CONFIG_MEMFD +-#include +-#elif defined CONFIG_LINUX ++#if defined CONFIG_LINUX && !defined CONFIG_MEMFD + #include + #include + +-- +2.17.0 + diff --git a/patches/qemu-2.6.2/0001-memfd-fix-configure-test.patch b/patches/qemu-2.6.2/0001-memfd-fix-configure-test.patch new file mode 100644 index 0000000..ef3e695 --- /dev/null +++ b/patches/qemu-2.6.2/0001-memfd-fix-configure-test.patch @@ -0,0 +1,55 @@ +From bc748893aaa27c122a96a212e8233bd5b8695a1a Mon Sep 17 00:00:00 2001 +From: Paolo Bonzini +Date: Tue, 28 Nov 2017 11:51:27 +0100 +Subject: [PATCH] memfd: fix configure test +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +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 +Signed-off-by: Paolo Bonzini +--- + configure | 2 +- + util/memfd.c | 4 +--- + 2 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/configure b/configure +index 0c6e7572db..087a82ac50 100755 +--- a/configure ++++ b/configure +@@ -3920,7 +3920,7 @@ fi + # check if memfd is supported + memfd=no + cat > $TMPC << EOF +-#include ++#include + + int main(void) + { +diff --git a/util/memfd.c b/util/memfd.c +index 4571d1aba8..412e94a405 100644 +--- a/util/memfd.c ++++ b/util/memfd.c +@@ -31,9 +31,7 @@ + + #include "qemu/memfd.h" + +-#ifdef CONFIG_MEMFD +-#include +-#elif defined CONFIG_LINUX ++#if defined CONFIG_LINUX && !defined CONFIG_MEMFD + #include + #include + +-- +2.17.0 + diff --git a/patches/qemu-2.7.0/0001-memfd-fix-configure-test.patch b/patches/qemu-2.7.0/0001-memfd-fix-configure-test.patch new file mode 100644 index 0000000..ef3e695 --- /dev/null +++ b/patches/qemu-2.7.0/0001-memfd-fix-configure-test.patch @@ -0,0 +1,55 @@ +From bc748893aaa27c122a96a212e8233bd5b8695a1a Mon Sep 17 00:00:00 2001 +From: Paolo Bonzini +Date: Tue, 28 Nov 2017 11:51:27 +0100 +Subject: [PATCH] memfd: fix configure test +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +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 +Signed-off-by: Paolo Bonzini +--- + configure | 2 +- + util/memfd.c | 4 +--- + 2 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/configure b/configure +index 0c6e7572db..087a82ac50 100755 +--- a/configure ++++ b/configure +@@ -3920,7 +3920,7 @@ fi + # check if memfd is supported + memfd=no + cat > $TMPC << EOF +-#include ++#include + + int main(void) + { +diff --git a/util/memfd.c b/util/memfd.c +index 4571d1aba8..412e94a405 100644 +--- a/util/memfd.c ++++ b/util/memfd.c +@@ -31,9 +31,7 @@ + + #include "qemu/memfd.h" + +-#ifdef CONFIG_MEMFD +-#include +-#elif defined CONFIG_LINUX ++#if defined CONFIG_LINUX && !defined CONFIG_MEMFD + #include + #include + +-- +2.17.0 + diff --git a/patches/qemu-2.7.1/0001-memfd-fix-configure-test.patch b/patches/qemu-2.7.1/0001-memfd-fix-configure-test.patch new file mode 100644 index 0000000..ef3e695 --- /dev/null +++ b/patches/qemu-2.7.1/0001-memfd-fix-configure-test.patch @@ -0,0 +1,55 @@ +From bc748893aaa27c122a96a212e8233bd5b8695a1a Mon Sep 17 00:00:00 2001 +From: Paolo Bonzini +Date: Tue, 28 Nov 2017 11:51:27 +0100 +Subject: [PATCH] memfd: fix configure test +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +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 +Signed-off-by: Paolo Bonzini +--- + configure | 2 +- + util/memfd.c | 4 +--- + 2 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/configure b/configure +index 0c6e7572db..087a82ac50 100755 +--- a/configure ++++ b/configure +@@ -3920,7 +3920,7 @@ fi + # check if memfd is supported + memfd=no + cat > $TMPC << EOF +-#include ++#include + + int main(void) + { +diff --git a/util/memfd.c b/util/memfd.c +index 4571d1aba8..412e94a405 100644 +--- a/util/memfd.c ++++ b/util/memfd.c +@@ -31,9 +31,7 @@ + + #include "qemu/memfd.h" + +-#ifdef CONFIG_MEMFD +-#include +-#elif defined CONFIG_LINUX ++#if defined CONFIG_LINUX && !defined CONFIG_MEMFD + #include + #include + +-- +2.17.0 + diff --git a/patches/qemu-2.8.0/0001-memfd-fix-configure-test.patch b/patches/qemu-2.8.0/0001-memfd-fix-configure-test.patch new file mode 100644 index 0000000..ef3e695 --- /dev/null +++ b/patches/qemu-2.8.0/0001-memfd-fix-configure-test.patch @@ -0,0 +1,55 @@ +From bc748893aaa27c122a96a212e8233bd5b8695a1a Mon Sep 17 00:00:00 2001 +From: Paolo Bonzini +Date: Tue, 28 Nov 2017 11:51:27 +0100 +Subject: [PATCH] memfd: fix configure test +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +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 +Signed-off-by: Paolo Bonzini +--- + configure | 2 +- + util/memfd.c | 4 +--- + 2 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/configure b/configure +index 0c6e7572db..087a82ac50 100755 +--- a/configure ++++ b/configure +@@ -3920,7 +3920,7 @@ fi + # check if memfd is supported + memfd=no + cat > $TMPC << EOF +-#include ++#include + + int main(void) + { +diff --git a/util/memfd.c b/util/memfd.c +index 4571d1aba8..412e94a405 100644 +--- a/util/memfd.c ++++ b/util/memfd.c +@@ -31,9 +31,7 @@ + + #include "qemu/memfd.h" + +-#ifdef CONFIG_MEMFD +-#include +-#elif defined CONFIG_LINUX ++#if defined CONFIG_LINUX && !defined CONFIG_MEMFD + #include + #include + +-- +2.17.0 + diff --git a/patches/qemu-2.8.1.1/0001-memfd-fix-configure-test.patch b/patches/qemu-2.8.1.1/0001-memfd-fix-configure-test.patch new file mode 100644 index 0000000..ef3e695 --- /dev/null +++ b/patches/qemu-2.8.1.1/0001-memfd-fix-configure-test.patch @@ -0,0 +1,55 @@ +From bc748893aaa27c122a96a212e8233bd5b8695a1a Mon Sep 17 00:00:00 2001 +From: Paolo Bonzini +Date: Tue, 28 Nov 2017 11:51:27 +0100 +Subject: [PATCH] memfd: fix configure test +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +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 +Signed-off-by: Paolo Bonzini +--- + configure | 2 +- + util/memfd.c | 4 +--- + 2 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/configure b/configure +index 0c6e7572db..087a82ac50 100755 +--- a/configure ++++ b/configure +@@ -3920,7 +3920,7 @@ fi + # check if memfd is supported + memfd=no + cat > $TMPC << EOF +-#include ++#include + + int main(void) + { +diff --git a/util/memfd.c b/util/memfd.c +index 4571d1aba8..412e94a405 100644 +--- a/util/memfd.c ++++ b/util/memfd.c +@@ -31,9 +31,7 @@ + + #include "qemu/memfd.h" + +-#ifdef CONFIG_MEMFD +-#include +-#elif defined CONFIG_LINUX ++#if defined CONFIG_LINUX && !defined CONFIG_MEMFD + #include + #include + +-- +2.17.0 + diff --git a/patches/qemu-2.8.1/0001-memfd-fix-configure-test.patch b/patches/qemu-2.8.1/0001-memfd-fix-configure-test.patch new file mode 100644 index 0000000..ef3e695 --- /dev/null +++ b/patches/qemu-2.8.1/0001-memfd-fix-configure-test.patch @@ -0,0 +1,55 @@ +From bc748893aaa27c122a96a212e8233bd5b8695a1a Mon Sep 17 00:00:00 2001 +From: Paolo Bonzini +Date: Tue, 28 Nov 2017 11:51:27 +0100 +Subject: [PATCH] memfd: fix configure test +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +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 +Signed-off-by: Paolo Bonzini +--- + configure | 2 +- + util/memfd.c | 4 +--- + 2 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/configure b/configure +index 0c6e7572db..087a82ac50 100755 +--- a/configure ++++ b/configure +@@ -3920,7 +3920,7 @@ fi + # check if memfd is supported + memfd=no + cat > $TMPC << EOF +-#include ++#include + + int main(void) + { +diff --git a/util/memfd.c b/util/memfd.c +index 4571d1aba8..412e94a405 100644 +--- a/util/memfd.c ++++ b/util/memfd.c +@@ -31,9 +31,7 @@ + + #include "qemu/memfd.h" + +-#ifdef CONFIG_MEMFD +-#include +-#elif defined CONFIG_LINUX ++#if defined CONFIG_LINUX && !defined CONFIG_MEMFD + #include + #include + +-- +2.17.0 + diff --git a/patches/qemu-2.9.0/0001-memfd-fix-configure-test.patch b/patches/qemu-2.9.0/0001-memfd-fix-configure-test.patch new file mode 100644 index 0000000..ef3e695 --- /dev/null +++ b/patches/qemu-2.9.0/0001-memfd-fix-configure-test.patch @@ -0,0 +1,55 @@ +From bc748893aaa27c122a96a212e8233bd5b8695a1a Mon Sep 17 00:00:00 2001 +From: Paolo Bonzini +Date: Tue, 28 Nov 2017 11:51:27 +0100 +Subject: [PATCH] memfd: fix configure test +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +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 +Signed-off-by: Paolo Bonzini +--- + configure | 2 +- + util/memfd.c | 4 +--- + 2 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/configure b/configure +index 0c6e7572db..087a82ac50 100755 +--- a/configure ++++ b/configure +@@ -3920,7 +3920,7 @@ fi + # check if memfd is supported + memfd=no + cat > $TMPC << EOF +-#include ++#include + + int main(void) + { +diff --git a/util/memfd.c b/util/memfd.c +index 4571d1aba8..412e94a405 100644 +--- a/util/memfd.c ++++ b/util/memfd.c +@@ -31,9 +31,7 @@ + + #include "qemu/memfd.h" + +-#ifdef CONFIG_MEMFD +-#include +-#elif defined CONFIG_LINUX ++#if defined CONFIG_LINUX && !defined CONFIG_MEMFD + #include + #include + +-- +2.17.0 + diff --git a/patches/qemu-2.9.1/0001-memfd-fix-configure-test.patch b/patches/qemu-2.9.1/0001-memfd-fix-configure-test.patch new file mode 100644 index 0000000..ef3e695 --- /dev/null +++ b/patches/qemu-2.9.1/0001-memfd-fix-configure-test.patch @@ -0,0 +1,55 @@ +From bc748893aaa27c122a96a212e8233bd5b8695a1a Mon Sep 17 00:00:00 2001 +From: Paolo Bonzini +Date: Tue, 28 Nov 2017 11:51:27 +0100 +Subject: [PATCH] memfd: fix configure test +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +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 +Signed-off-by: Paolo Bonzini +--- + configure | 2 +- + util/memfd.c | 4 +--- + 2 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/configure b/configure +index 0c6e7572db..087a82ac50 100755 +--- a/configure ++++ b/configure +@@ -3920,7 +3920,7 @@ fi + # check if memfd is supported + memfd=no + cat > $TMPC << EOF +-#include ++#include + + int main(void) + { +diff --git a/util/memfd.c b/util/memfd.c +index 4571d1aba8..412e94a405 100644 +--- a/util/memfd.c ++++ b/util/memfd.c +@@ -31,9 +31,7 @@ + + #include "qemu/memfd.h" + +-#ifdef CONFIG_MEMFD +-#include +-#elif defined CONFIG_LINUX ++#if defined CONFIG_LINUX && !defined CONFIG_MEMFD + #include + #include + +-- +2.17.0 +