From 2dc83c18f293bd2f32ae62d42f22ef9213b0f5b4 Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Wed, 25 Aug 2021 22:25:39 +0300 Subject: [PATCH] qemu: update 0009-fix-mman.h-defs.patch Not really necessary, but on some configs build fails if patch was not updated. --- .../0009-fix-mman.h-defs.patch | 257 ++++++++++-------- 1 file changed, 145 insertions(+), 112 deletions(-) diff --git a/packages/qemu-system-x86-64-headless/0009-fix-mman.h-defs.patch b/packages/qemu-system-x86-64-headless/0009-fix-mman.h-defs.patch index 6ccf9b17c..55553cdb4 100644 --- a/packages/qemu-system-x86-64-headless/0009-fix-mman.h-defs.patch +++ b/packages/qemu-system-x86-64-headless/0009-fix-mman.h-defs.patch @@ -1,18 +1,18 @@ -diff -uNr qemu-5.1.0/accel/tcg/translate-all.c qemu-5.1.0.mod/accel/tcg/translate-all.c ---- qemu-5.1.0/accel/tcg/translate-all.c 2020-08-11 22:17:15.000000000 +0300 -+++ qemu-5.1.0.mod/accel/tcg/translate-all.c 2020-09-05 17:06:07.327115262 +0300 -@@ -47,6 +47,8 @@ +diff -uNr qemu-6.1.0/accel/tcg/translate-all.c qemu-6.1.0.mod/accel/tcg/translate-all.c +--- qemu-6.1.0/accel/tcg/translate-all.c 2021-08-24 20:35:40.000000000 +0300 ++++ qemu-6.1.0.mod/accel/tcg/translate-all.c 2021-08-25 18:17:55.882330894 +0300 +@@ -45,6 +45,8 @@ #include "exec/ram_addr.h" #endif +#include + #include "exec/cputlb.h" - #include "exec/tb-hash.h" - #include "translate-all.h" -diff -uNr qemu-5.1.0/audio/ossaudio.c qemu-5.1.0.mod/audio/ossaudio.c ---- qemu-5.1.0/audio/ossaudio.c 2020-09-05 16:58:18.803736540 +0300 -+++ qemu-5.1.0.mod/audio/ossaudio.c 2020-09-05 17:06:07.327115262 +0300 + #include "exec/translate-all.h" + #include "qemu/bitmap.h" +diff -uNr qemu-6.1.0/audio/ossaudio.c qemu-6.1.0.mod/audio/ossaudio.c +--- qemu-6.1.0/audio/ossaudio.c 2021-08-25 18:17:08.257953420 +0300 ++++ qemu-6.1.0.mod/audio/ossaudio.c 2021-08-25 18:17:55.886330925 +0300 @@ -31,6 +31,8 @@ #include "audio.h" #include "trace.h" @@ -22,10 +22,10 @@ diff -uNr qemu-5.1.0/audio/ossaudio.c qemu-5.1.0.mod/audio/ossaudio.c #define AUDIO_CAP "oss" #include "audio_int.h" -diff -uNr qemu-5.1.0/block/file-posix.c qemu-5.1.0.mod/block/file-posix.c ---- qemu-5.1.0/block/file-posix.c 2020-08-11 22:17:15.000000000 +0300 -+++ qemu-5.1.0.mod/block/file-posix.c 2020-09-05 17:06:07.327115262 +0300 -@@ -59,6 +59,7 @@ +diff -uNr qemu-6.1.0/block/file-posix.c qemu-6.1.0.mod/block/file-posix.c +--- qemu-6.1.0/block/file-posix.c 2021-08-24 20:35:40.000000000 +0300 ++++ qemu-6.1.0.mod/block/file-posix.c 2021-08-25 18:17:55.886330925 +0300 +@@ -63,6 +63,7 @@ #include #endif #ifdef __linux__ @@ -33,20 +33,20 @@ diff -uNr qemu-5.1.0/block/file-posix.c qemu-5.1.0.mod/block/file-posix.c #include #include #include -diff -uNr qemu/subprojects/libvhost-user/libvhost-user.c qemu.mod/subprojects/libvhost-user/libvhost-user.c ---- qemu/subprojects/libvhost-user/libvhost-user.c 2020-08-11 22:17:15.000000000 +0300 -+++ qemu.mod/subprojects/libvhost-user/libvhost-user.c 2020-09-05 17:06:07.327115262 +0300 -@@ -29,6 +29,7 @@ - #include "qemu/compiler.h" +diff -uNr qemu-6.1.0/hw/display/virtio-gpu-udmabuf.c qemu-6.1.0.mod/hw/display/virtio-gpu-udmabuf.c +--- qemu-6.1.0/hw/display/virtio-gpu-udmabuf.c 2021-08-24 20:35:40.000000000 +0300 ++++ qemu-6.1.0.mod/hw/display/virtio-gpu-udmabuf.c 2021-08-25 18:24:11.565310557 +0300 +@@ -11,6 +11,7 @@ + * See the COPYING file in the top-level directory. + */ - #if defined(__linux__) +#include - #include - #include - #include -diff -uNr qemu-5.1.0/hw/vfio/common.c qemu-5.1.0.mod/hw/vfio/common.c ---- qemu-5.1.0/hw/vfio/common.c 2020-08-11 22:17:15.000000000 +0300 -+++ qemu-5.1.0.mod/hw/vfio/common.c 2020-09-05 17:06:07.331115270 +0300 + #include "qemu/osdep.h" + #include "qemu/units.h" + #include "qemu-common.h" +diff -uNr qemu-6.1.0/hw/vfio/common.c qemu-6.1.0.mod/hw/vfio/common.c +--- qemu-6.1.0/hw/vfio/common.c 2021-08-24 20:35:40.000000000 +0300 ++++ qemu-6.1.0.mod/hw/vfio/common.c 2021-08-25 18:17:55.886330925 +0300 @@ -24,6 +24,7 @@ #include #endif @@ -55,9 +55,9 @@ diff -uNr qemu-5.1.0/hw/vfio/common.c qemu-5.1.0.mod/hw/vfio/common.c #include "hw/vfio/vfio-common.h" #include "hw/vfio/vfio.h" -diff -uNr qemu-5.1.0/hw/vfio/pci-quirks.c qemu-5.1.0.mod/hw/vfio/pci-quirks.c ---- qemu-5.1.0/hw/vfio/pci-quirks.c 2020-08-11 22:17:15.000000000 +0300 -+++ qemu-5.1.0.mod/hw/vfio/pci-quirks.c 2020-09-05 17:07:16.623274533 +0300 +diff -uNr qemu-6.1.0/hw/vfio/pci-quirks.c qemu-6.1.0.mod/hw/vfio/pci-quirks.c +--- qemu-6.1.0/hw/vfio/pci-quirks.c 2021-08-24 20:35:40.000000000 +0300 ++++ qemu-6.1.0.mod/hw/vfio/pci-quirks.c 2021-08-25 18:17:55.886330925 +0300 @@ -27,6 +27,8 @@ #include "pci.h" #include "trace.h" @@ -67,10 +67,10 @@ diff -uNr qemu-5.1.0/hw/vfio/pci-quirks.c qemu-5.1.0.mod/hw/vfio/pci-quirks.c /* * List of device ids/vendor ids for which to disable * option rom loading. This avoids the guest hangs during rom -diff -uNr qemu-5.1.0/hw/virtio/vhost-user.c qemu-5.1.0.mod/hw/virtio/vhost-user.c ---- qemu-5.1.0/hw/virtio/vhost-user.c 2020-08-11 22:17:15.000000000 +0300 -+++ qemu-5.1.0.mod/hw/virtio/vhost-user.c 2020-09-05 17:06:07.331115270 +0300 -@@ -32,6 +32,7 @@ +diff -uNr qemu-6.1.0/hw/virtio/vhost-user.c qemu-6.1.0.mod/hw/virtio/vhost-user.c +--- qemu-6.1.0/hw/virtio/vhost-user.c 2021-08-24 20:35:40.000000000 +0300 ++++ qemu-6.1.0.mod/hw/virtio/vhost-user.c 2021-08-25 18:17:55.886330925 +0300 +@@ -33,6 +33,7 @@ #include "standard-headers/linux/vhost_types.h" #ifdef CONFIG_LINUX @@ -78,9 +78,20 @@ diff -uNr qemu-5.1.0/hw/virtio/vhost-user.c qemu-5.1.0.mod/hw/virtio/vhost-user. #include #endif -diff -uNr qemu-5.1.0/linux-user/elfload.c qemu-5.1.0.mod/linux-user/elfload.c ---- qemu-5.1.0/linux-user/elfload.c 2020-09-05 17:01:16.823064611 +0300 -+++ qemu-5.1.0.mod/linux-user/elfload.c 2020-09-05 17:06:07.331115270 +0300 +diff -uNr qemu-6.1.0/hw/virtio/vhost-vdpa.c qemu-6.1.0.mod/hw/virtio/vhost-vdpa.c +--- qemu-6.1.0/hw/virtio/vhost-vdpa.c 2021-08-24 20:35:40.000000000 +0300 ++++ qemu-6.1.0.mod/hw/virtio/vhost-vdpa.c 2021-08-25 18:20:52.511731435 +0300 +@@ -12,6 +12,7 @@ + #include "qemu/osdep.h" + #include + #include ++#include + #include + #include + #include "hw/virtio/vhost.h" +diff -uNr qemu-6.1.0/linux-user/elfload.c qemu-6.1.0.mod/linux-user/elfload.c +--- qemu-6.1.0/linux-user/elfload.c 2021-08-25 18:17:08.281953611 +0300 ++++ qemu-6.1.0.mod/linux-user/elfload.c 2021-08-25 18:17:55.886330925 +0300 @@ -2,6 +2,8 @@ #include "qemu/osdep.h" #include @@ -90,9 +101,9 @@ diff -uNr qemu-5.1.0/linux-user/elfload.c qemu-5.1.0.mod/linux-user/elfload.c #include #include -diff -uNr qemu-5.1.0/linux-user/flatload.c qemu-5.1.0.mod/linux-user/flatload.c ---- qemu-5.1.0/linux-user/flatload.c 2020-08-11 22:17:15.000000000 +0300 -+++ qemu-5.1.0.mod/linux-user/flatload.c 2020-09-05 17:06:07.331115270 +0300 +diff -uNr qemu-6.1.0/linux-user/flatload.c qemu-6.1.0.mod/linux-user/flatload.c +--- qemu-6.1.0/linux-user/flatload.c 2021-08-24 20:35:41.000000000 +0300 ++++ qemu-6.1.0.mod/linux-user/flatload.c 2021-08-25 18:17:55.886330925 +0300 @@ -35,6 +35,8 @@ #include "qemu/osdep.h" @@ -102,9 +113,9 @@ diff -uNr qemu-5.1.0/linux-user/flatload.c qemu-5.1.0.mod/linux-user/flatload.c #include "qemu.h" #include "flat.h" #include "target_flat.h" -diff -uNr qemu-5.1.0/linux-user/i386/cpu_loop.c qemu-5.1.0.mod/linux-user/i386/cpu_loop.c ---- qemu-5.1.0/linux-user/i386/cpu_loop.c 2020-08-11 22:17:14.000000000 +0300 -+++ qemu-5.1.0.mod/linux-user/i386/cpu_loop.c 2020-09-05 17:06:07.335115279 +0300 +diff -uNr qemu-6.1.0/linux-user/i386/cpu_loop.c qemu-6.1.0.mod/linux-user/i386/cpu_loop.c +--- qemu-6.1.0/linux-user/i386/cpu_loop.c 2021-08-24 20:35:41.000000000 +0300 ++++ qemu-6.1.0.mod/linux-user/i386/cpu_loop.c 2021-08-25 18:17:55.890330957 +0300 @@ -22,6 +22,8 @@ #include "qemu.h" #include "cpu_loop-common.h" @@ -114,9 +125,9 @@ diff -uNr qemu-5.1.0/linux-user/i386/cpu_loop.c qemu-5.1.0.mod/linux-user/i386/c /***********************************************************/ /* CPUX86 core interface */ -diff -uNr qemu-5.1.0/linux-user/mmap.c qemu-5.1.0.mod/linux-user/mmap.c ---- qemu-5.1.0/linux-user/mmap.c 2020-08-11 22:17:15.000000000 +0300 -+++ qemu-5.1.0.mod/linux-user/mmap.c 2020-09-05 17:06:40.807186551 +0300 +diff -uNr qemu-6.1.0/linux-user/mmap.c qemu-6.1.0.mod/linux-user/mmap.c +--- qemu-6.1.0/linux-user/mmap.c 2021-08-24 20:35:41.000000000 +0300 ++++ qemu-6.1.0.mod/linux-user/mmap.c 2021-08-25 18:17:55.890330957 +0300 @@ -21,6 +21,8 @@ #include "exec/log.h" #include "qemu.h" @@ -126,9 +137,9 @@ diff -uNr qemu-5.1.0/linux-user/mmap.c qemu-5.1.0.mod/linux-user/mmap.c static pthread_mutex_t mmap_mutex = PTHREAD_MUTEX_INITIALIZER; static __thread int mmap_lock_count; -diff -uNr qemu-5.1.0/linux-user/syscall.c qemu-5.1.0.mod/linux-user/syscall.c ---- qemu-5.1.0/linux-user/syscall.c 2020-09-05 17:02:57.910949156 +0300 -+++ qemu-5.1.0.mod/linux-user/syscall.c 2020-09-05 17:06:07.335115279 +0300 +diff -uNr qemu-6.1.0/linux-user/syscall.c qemu-6.1.0.mod/linux-user/syscall.c +--- qemu-6.1.0/linux-user/syscall.c 2021-08-25 18:17:08.285953643 +0300 ++++ qemu-6.1.0.mod/linux-user/syscall.c 2021-08-25 18:17:55.890330957 +0300 @@ -36,6 +36,7 @@ #include #include @@ -137,78 +148,21 @@ diff -uNr qemu-5.1.0/linux-user/syscall.c qemu-5.1.0.mod/linux-user/syscall.c #include #include #include -diff -uNr qemu-5.1.0/migration/postcopy-ram.c qemu-5.1.0.mod/migration/postcopy-ram.c ---- qemu-5.1.0/migration/postcopy-ram.c 2020-08-11 22:17:15.000000000 +0300 -+++ qemu-5.1.0.mod/migration/postcopy-ram.c 2020-09-05 17:06:07.335115279 +0300 -@@ -31,6 +31,8 @@ - #include "trace.h" +diff -uNr qemu-6.1.0/migration/postcopy-ram.c qemu-6.1.0.mod/migration/postcopy-ram.c +--- qemu-6.1.0/migration/postcopy-ram.c 2021-08-24 20:35:41.000000000 +0300 ++++ qemu-6.1.0.mod/migration/postcopy-ram.c 2021-08-25 18:17:55.894330989 +0300 +@@ -33,6 +33,8 @@ #include "hw/boards.h" + #include "exec/ramblock.h" +#include + /* Arbitrary limit on size of each discard command, * keeps them around ~200 bytes */ -diff -uNr qemu-5.1.0/util/memfd.c qemu-5.1.0.mod/util/memfd.c ---- qemu-5.1.0/util/memfd.c 2020-08-11 22:17:15.000000000 +0300 -+++ qemu-5.1.0.mod/util/memfd.c 2020-09-05 17:06:07.335115279 +0300 -@@ -32,6 +32,7 @@ - #include "qemu/host-utils.h" - - #if defined CONFIG_LINUX && !defined CONFIG_MEMFD -+#include - #include - #include - -diff -uNr qemu-5.1.0/util/mmap-alloc.c qemu-5.1.0.mod/util/mmap-alloc.c ---- qemu-5.1.0/util/mmap-alloc.c 2020-08-11 22:17:15.000000000 +0300 -+++ qemu-5.1.0.mod/util/mmap-alloc.c 2020-09-05 17:06:07.335115279 +0300 -@@ -10,7 +10,7 @@ - * later. See the COPYING file in the top-level directory. - */ - --#ifdef CONFIG_LINUX -+#ifdef __linux__ - #include - #else /* !CONFIG_LINUX */ - #define MAP_SYNC 0x0 -diff -uNr qemu-5.1.0/util/oslib-posix.c qemu-5.1.0.mod/util/oslib-posix.c ---- qemu-5.1.0/util/oslib-posix.c 2020-08-11 22:17:15.000000000 +0300 -+++ qemu-5.1.0.mod/util/oslib-posix.c 2020-09-05 17:06:07.335115279 +0300 -@@ -41,6 +41,7 @@ - #include "qemu/cutils.h" - - #ifdef CONFIG_LINUX -+#include - #include - #endif - -diff -uNr qemu-5.1.0/util/vfio-helpers.c qemu-5.1.0.mod/util/vfio-helpers.c ---- qemu-5.1.0/util/vfio-helpers.c 2020-08-11 22:17:15.000000000 +0300 -+++ qemu-5.1.0.mod/util/vfio-helpers.c 2020-09-05 17:06:07.335115279 +0300 -@@ -13,6 +13,7 @@ - #include "qemu/osdep.h" - #include - #include -+#include - #include "qapi/error.h" - #include "exec/ramlist.h" - #include "exec/cpu-common.h" -diff -uNr qemu-5.2.0/tests/vhost-user-bridge.c qemu-5.2.0.mod/tests/vhost-user-bridge.c ---- qemu-5.2.0/tests/vhost-user-bridge.c 2020-12-08 18:59:44.000000000 +0200 -+++ qemu-5.2.0.mod/tests/vhost-user-bridge.c 2020-12-09 17:31:52.039910511 +0200 -@@ -29,6 +29,8 @@ - - #define _FILE_OFFSET_BITS 64 - -+#include -+ - #include "qemu/osdep.h" - #include "qemu/atomic.h" - #include "qemu/ctype.h" -diff -uNr qemu-5.2.0/softmmu/physmem.c qemu-5.2.0.mod/softmmu/physmem.c ---- qemu-5.2.0/softmmu/physmem.c 2020-12-08 18:59:44.000000000 +0200 -+++ qemu-5.2.0.mod/softmmu/physmem.c 2020-12-09 17:05:25.872459520 +0200 +diff -uNr qemu-6.1.0/softmmu/physmem.c qemu-6.1.0.mod/softmmu/physmem.c +--- qemu-6.1.0/softmmu/physmem.c 2021-08-24 20:35:41.000000000 +0300 ++++ qemu-6.1.0.mod/softmmu/physmem.c 2021-08-25 18:17:55.894330989 +0300 @@ -17,6 +17,8 @@ * License along with this library; if not, see . */ @@ -218,3 +172,82 @@ diff -uNr qemu-5.2.0/softmmu/physmem.c qemu-5.2.0.mod/softmmu/physmem.c #include "qemu/osdep.h" #include "qemu-common.h" #include "qapi/error.h" +diff -uNr qemu-6.1.0/subprojects/libvhost-user/libvhost-user.c qemu-6.1.0.mod/subprojects/libvhost-user/libvhost-user.c +--- qemu-6.1.0/subprojects/libvhost-user/libvhost-user.c 2021-08-24 20:35:41.000000000 +0300 ++++ qemu-6.1.0.mod/subprojects/libvhost-user/libvhost-user.c 2021-08-25 18:17:55.886330925 +0300 +@@ -29,6 +29,7 @@ + #include + + #if defined(__linux__) ++#include + #include + #include + #include +diff -uNr qemu-6.1.0/tcg/region.c qemu-6.1.0.mod/tcg/region.c +--- qemu-6.1.0/tcg/region.c 2021-08-24 20:35:41.000000000 +0300 ++++ qemu-6.1.0.mod/tcg/region.c 2021-08-25 18:17:46.146253714 +0300 +@@ -22,6 +22,7 @@ + * THE SOFTWARE. + */ + ++#include + #include "qemu/osdep.h" + #include "qemu/units.h" + #include "qapi/error.h" +diff -uNr qemu-6.1.0/tests/vhost-user-bridge.c qemu-6.1.0.mod/tests/vhost-user-bridge.c +--- qemu-6.1.0/tests/vhost-user-bridge.c 2021-08-24 20:35:41.000000000 +0300 ++++ qemu-6.1.0.mod/tests/vhost-user-bridge.c 2021-08-25 18:17:55.894330989 +0300 +@@ -29,6 +29,8 @@ + + #define _FILE_OFFSET_BITS 64 + ++#include ++ + #include "qemu/osdep.h" + #include "qemu/atomic.h" + #include "qemu/ctype.h" +diff -uNr qemu-6.1.0/util/memfd.c qemu-6.1.0.mod/util/memfd.c +--- qemu-6.1.0/util/memfd.c 2021-08-24 20:35:41.000000000 +0300 ++++ qemu-6.1.0.mod/util/memfd.c 2021-08-25 18:17:55.894330989 +0300 +@@ -32,6 +32,7 @@ + #include "qemu/host-utils.h" + + #if defined CONFIG_LINUX && !defined CONFIG_MEMFD ++#include + #include + #include + +diff -uNr qemu-6.1.0/util/mmap-alloc.c qemu-6.1.0.mod/util/mmap-alloc.c +--- qemu-6.1.0/util/mmap-alloc.c 2021-08-24 20:35:41.000000000 +0300 ++++ qemu-6.1.0.mod/util/mmap-alloc.c 2021-08-25 18:17:55.894330989 +0300 +@@ -10,7 +10,7 @@ + * later. See the COPYING file in the top-level directory. + */ + +-#ifdef CONFIG_LINUX ++#ifdef __linux__ + #include + #else /* !CONFIG_LINUX */ + #define MAP_SYNC 0x0 +diff -uNr qemu-6.1.0/util/oslib-posix.c qemu-6.1.0.mod/util/oslib-posix.c +--- qemu-6.1.0/util/oslib-posix.c 2021-08-24 20:35:41.000000000 +0300 ++++ qemu-6.1.0.mod/util/oslib-posix.c 2021-08-25 18:17:55.894330989 +0300 +@@ -42,6 +42,7 @@ + #include "qemu/compiler.h" + + #ifdef CONFIG_LINUX ++#include + #include + #endif + +diff -uNr qemu-6.1.0/util/vfio-helpers.c qemu-6.1.0.mod/util/vfio-helpers.c +--- qemu-6.1.0/util/vfio-helpers.c 2021-08-24 20:35:41.000000000 +0300 ++++ qemu-6.1.0.mod/util/vfio-helpers.c 2021-08-25 18:17:55.894330989 +0300 +@@ -13,6 +13,7 @@ + #include "qemu/osdep.h" + #include + #include ++#include + #include "qapi/error.h" + #include "exec/ramlist.h" + #include "exec/cpu-common.h"