diff options
Diffstat (limited to 'patches')
4 files changed, 0 insertions, 146 deletions
diff --git a/patches/qemu-2.10.1/0001-virtfs-proxy-helper-make-sure-sys-xattr.h-is-include.patch b/patches/qemu-2.10.1/0001-virtfs-proxy-helper-make-sure-sys-xattr.h-is-include.patch deleted file mode 100644 index 809a475..0000000 --- a/patches/qemu-2.10.1/0001-virtfs-proxy-helper-make-sure-sys-xattr.h-is-include.patch +++ /dev/null @@ -1,37 +0,0 @@ -From: Michael Olbrich <m.olbrich@pengutronix.de> -Date: Tue, 12 Jul 2016 09:20:19 +0200 -Subject: [PATCH] virtfs-proxy-helper: make sure sys/xattr.h is included first - -Otherwise building with older glibc versions fails with: - -In file included from [...]/include/qemu/xattr.h:26:0, - from fsdev/virtfs-proxy-helper.c:26: -/usr/include/i386-linux-gnu/sys/xattr.h:32:3: error: expected identifier before numeric constant -make[1]: *** [fsdev/virtfs-proxy-helper.o] Error 1 -make[1]: *** Waiting for unfinished jobs.... - -Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> ---- - fsdev/virtfs-proxy-helper.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/fsdev/virtfs-proxy-helper.c b/fsdev/virtfs-proxy-helper.c -index 6c066ec9a0ce..dd1801ce8589 100644 ---- a/fsdev/virtfs-proxy-helper.c -+++ b/fsdev/virtfs-proxy-helper.c -@@ -9,6 +9,7 @@ - * the COPYING file in the top-level directory. - */ - -+#include "qemu/xattr.h" - #include "qemu/osdep.h" - #include <sys/resource.h> - #include <getopt.h> -@@ -23,7 +24,6 @@ - #endif - #include "qemu-common.h" - #include "qemu/sockets.h" --#include "qemu/xattr.h" - #include "9p-iov-marshal.h" - #include "hw/9pfs/9p-proxy.h" - #include "fsdev/9p-iov-marshal.h" diff --git a/patches/qemu-2.10.1/0002-hw-sd-fix-out-of-bounds-check-for-multi-block-reads.patch b/patches/qemu-2.10.1/0002-hw-sd-fix-out-of-bounds-check-for-multi-block-reads.patch deleted file mode 100644 index d29493d..0000000 --- a/patches/qemu-2.10.1/0002-hw-sd-fix-out-of-bounds-check-for-multi-block-reads.patch +++ /dev/null @@ -1,50 +0,0 @@ -From: Michael Olbrich <m.olbrich@pengutronix.de> -Date: Fri, 6 Oct 2017 16:46:47 +0100 -Subject: [PATCH] hw/sd: fix out-of-bounds check for multi block reads - -The current code checks if the next block exceeds the size of the card. -This generates an error while reading the last block of the card. -Do the out-of-bounds check when starting to read a new block to fix this. - -This issue became visible with increased error checking in Linux 4.13. - -Cc: qemu-stable@nongnu.org -Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> -Reviewed-by: Alistair Francis <alistair.francis@xilinx.com> -Message-id: 20170916091611.10241-1-m.olbrich@pengutronix.de -Signed-off-by: Peter Maydell <peter.maydell@linaro.org> ---- - hw/sd/sd.c | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/hw/sd/sd.c b/hw/sd/sd.c -index ba47bff4db80..35347a5bbcde 100644 ---- a/hw/sd/sd.c -+++ b/hw/sd/sd.c -@@ -1797,8 +1797,13 @@ uint8_t sd_read_data(SDState *sd) - break; - - case 18: /* CMD18: READ_MULTIPLE_BLOCK */ -- if (sd->data_offset == 0) -+ if (sd->data_offset == 0) { -+ if (sd->data_start + io_len > sd->size) { -+ sd->card_status |= ADDRESS_ERROR; -+ return 0x00; -+ } - BLK_READ_BLOCK(sd->data_start, io_len); -+ } - ret = sd->data[sd->data_offset ++]; - - if (sd->data_offset >= io_len) { -@@ -1812,11 +1817,6 @@ uint8_t sd_read_data(SDState *sd) - break; - } - } -- -- if (sd->data_start + io_len > sd->size) { -- sd->card_status |= ADDRESS_ERROR; -- break; -- } - } - break; - diff --git a/patches/qemu-2.10.1/0003-memfd-fix-configure-test.patch b/patches/qemu-2.10.1/0003-memfd-fix-configure-test.patch deleted file mode 100644 index 760bb97..0000000 --- a/patches/qemu-2.10.1/0003-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 dd73cce62f9d..53581d787dac 100755 ---- a/configure -+++ b/configure -@@ -3855,7 +3855,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.10.1/series b/patches/qemu-2.10.1/series deleted file mode 100644 index 4d4c6e5..0000000 --- a/patches/qemu-2.10.1/series +++ /dev/null @@ -1,6 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-virtfs-proxy-helper-make-sure-sys-xattr.h-is-include.patch -0002-hw-sd-fix-out-of-bounds-check-for-multi-block-reads.patch -0003-memfd-fix-configure-test.patch -# ae7f94af2198ed5ebb1e8182429e973d - git-ptx-patches magic |