index 4ebe25461a..0496674fbd 100644
--- a/accel/tcg/user-exec.c
+++ b/accel/tcg/user-exec.c
-@@ -536,7 +536,7 @@ int cpu_signal_handler(int host_signum, void *pinfo,
+@@ -540,7 +540,7 @@ int cpu_signal_handler(int host_signum, void *pinfo,
#if defined(__NetBSD__)
pc = uc->uc_mcontext.__gregs[_REG_R15];
index 6020c6f33a..e688c3e0a9 100644
--- a/contrib/vhost-user-input/main.c
+++ b/contrib/vhost-user-input/main.c
-@@ -17,6 +17,11 @@
+@@ -15,6 +15,11 @@
#include "standard-headers/linux/virtio_input.h"
#include "qapi/error.h"
enum {
VHOST_USER_INPUT_MAX_QUEUES = 2,
};
-@@ -115,13 +120,16 @@ vi_evdev_watch(VuDev *dev, int condition, void *data)
+@@ -113,13 +118,16 @@ vi_evdev_watch(VuDev *dev, int condition, void *data)
static void vi_handle_status(VuInput *vi, virtio_input_event *event)
{
struct input_event evdev;
+++ /dev/null
-From ecd615dfe328e3ab551cea3ba243d908936ed382 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Sun, 13 Dec 2020 21:27:31 +0100
-Subject: [PATCH] hw/usb/host-libusb.c: fix build with kernel < 5.0
-
-USBDEVFS_GET_SPEED is used since version 5.2.0 and
-https://gitlab.com/qemu-project/qemu/-/commit/202d69a715a4b1824dcd7ec1683d027ed2bae6d3
-resulting in the following build failure with kernel < 5.0:
-
-../hw/usb/host-libusb.c: In function 'usb_host_open':
-../hw/usb/host-libusb.c:953:32: error: 'USBDEVFS_GET_SPEED' undeclared (first use in this function); did you mean 'USBDEVFS_GETDRIVER'?
- int rc = ioctl(hostfd, USBDEVFS_GET_SPEED, NULL);
- ^~~~~~~~~~~~~~~~~~
- USBDEVFS_GETDRIVER
-
-A tentative was made to fix this build failure with
-https://gitlab.com/qemu-project/qemu/-/commit/4969e697c15ac536d5c0700381d5d026ef7f0588
-
-However, the assumtion that distros with old kernels also have old
-libusb is just wrong so also add a check for defined(USBDEVFS_GET_SPEED)
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Upstream status: sent to qemu-devel@nongnu.org]
----
- hw/usb/host-libusb.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c
-index b950501d10..0343300d3e 100644
---- a/hw/usb/host-libusb.c
-+++ b/hw/usb/host-libusb.c
-@@ -941,7 +941,7 @@ static int usb_host_open(USBHostDevice *s, libusb_device *dev, int hostfd)
- usb_host_ep_update(s);
-
- libusb_speed = libusb_get_device_speed(dev);
--#if LIBUSB_API_VERSION >= 0x01000107 && defined(CONFIG_LINUX)
-+#if LIBUSB_API_VERSION >= 0x01000107 && defined(CONFIG_LINUX) && defined(USBDEVFS_GET_SPEED)
- if (hostfd && libusb_speed == 0) {
- /*
- * Workaround libusb bug: libusb_get_device_speed() does not
---
-2.29.2
-
--- /dev/null
+From c24f6cc8f847a4f90cd8fe0f94604862c5ac4a5e Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@gmail.com>
+Date: Mon, 21 Dec 2020 22:12:14 +0100
+Subject: [PATCH] meson: add tests option
+
+tests/fp/fp-bench.c use fenv.h that is not always provided
+by the libc (uClibc).
+
+To workaround this issue, add an new meson option to
+disable tests while building Qemu.
+
+Fixes:
+http://autobuild.buildroot.net/results/53f5d8baa994d599b9da013ee643b82353366ec3/build-end.log
+
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+Signed-off-by: Adam Duskett <aduskett@gmail.com>
+Refresh for 6.0.0
+---
+ configure | 7 +++++++
+ meson.build | 5 ++++-
+ meson_options.txt | 2 ++
+ 3 files changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index 18c26e0389..7cceae4418 100755
+--- a/configure
++++ b/configure
+@@ -460,6 +460,7 @@ meson=""
+ ninja=""
+ skip_meson=no
+ gettext="auto"
++tests="auto"
+ fuse="auto"
+ fuse_lseek="auto"
+ multiprocess="auto"
+@@ -1549,6 +1550,10 @@ for opt do
+ ;;
+ --disable-libdaxctl) libdaxctl=no
+ ;;
++ --disable-tests) tests="disabled"
++ ;;
++ --enable-tests) tests="enabled"
++ ;;
+ --enable-fuse) fuse="enabled"
+ ;;
+ --disable-fuse) fuse="disabled"
+@@ -1915,6 +1920,7 @@ disabled with --disable-FEATURE, default is enabled if available
+ xkbcommon xkbcommon support
+ rng-none dummy RNG, avoid using /dev/(u)random and getrandom()
+ libdaxctl libdaxctl support
++ tests build tests
+ fuse FUSE block device export
+ fuse-lseek SEEK_HOLE/SEEK_DATA support for FUSE exports
+ multiprocess Out of process device emulation support
+@@ -6422,6 +6428,7 @@ NINJA=$ninja $meson setup \
+ -Dzstd=$zstd -Dseccomp=$seccomp -Dvirtfs=$virtfs -Dcap_ng=$cap_ng \
+ -Dattr=$attr -Ddefault_devices=$default_devices \
+ -Ddocs=$docs -Dsphinx_build=$sphinx_build -Dinstall_blobs=$blobs \
++ -Dtests=$tests \
+ -Dvhost_user_blk_server=$vhost_user_blk_server -Dmultiprocess=$multiprocess \
+ -Dfuse=$fuse -Dfuse_lseek=$fuse_lseek -Dguest_agent_msi=$guest_agent_msi \
+ $(if test "$default_features" = no; then echo "-Dauto_features=disabled"; fi) \
+diff --git a/meson.build b/meson.build
+index e3386196ba..7f4efdc347 100644
+--- a/meson.build
++++ b/meson.build
+@@ -2381,7 +2381,10 @@ subdir('scripts')
+ subdir('tools')
+ subdir('pc-bios')
+ subdir('docs')
+-subdir('tests')
++if get_option('tests').enabled()
++ subdir('tests')
++endif
++
+ if gtk.found()
+ subdir('po')
+ endif
+diff --git a/meson_options.txt b/meson_options.txt
+index f6f64785fe..81bffbfe87 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -111,6 +111,8 @@ option('fuse_lseek', type : 'feature', value : 'auto',
+
+ option('vhost_user_blk_server', type: 'feature', value: 'auto',
+ description: 'build vhost-user-blk server')
++option('tests', type : 'feature', value : 'auto',
++ description: 'Tests build support')
+ option('virtfs', type: 'feature', value: 'auto',
+ description: 'virtio-9p support')
+ option('virtiofsd', type: 'feature', value: 'auto',
+--
+2.29.2
+
+++ /dev/null
-From c24f6cc8f847a4f90cd8fe0f94604862c5ac4a5e Mon Sep 17 00:00:00 2001
-From: Romain Naour <romain.naour@gmail.com>
-Date: Mon, 21 Dec 2020 22:12:14 +0100
-Subject: [PATCH] meson: add tests option
-
-tests/fp/fp-bench.c use fenv.h that is not always provided
-by the libc (uClibc).
-
-To workaround this issue, add an new meson option to
-disable tests while building Qemu.
-
-Fixes:
-http://autobuild.buildroot.net/results/53f5d8baa994d599b9da013ee643b82353366ec3/build-end.log
-
-Signed-off-by: Romain Naour <romain.naour@gmail.com>
----
- configure | 7 +++++++
- meson.build | 5 ++++-
- meson_options.txt | 2 ++
- 3 files changed, 13 insertions(+), 1 deletion(-)
-
-diff --git a/configure b/configure
-index 18c26e0389..7cceae4418 100755
---- a/configure
-+++ b/configure
-@@ -449,6 +449,7 @@ meson=""
- ninja=""
- skip_meson=no
- gettext=""
-+tests="auto"
-
- bogus_os="no"
- malloc_trim="auto"
-@@ -1525,6 +1526,10 @@ for opt do
- ;;
- --disable-libdaxctl) libdaxctl=no
- ;;
-+ --disable-tests) tests="disabled"
-+ ;;
-+ --enable-tests) tests="enabled"
-+ ;;
- *)
- echo "ERROR: unknown option $opt"
- echo "Try '$0 --help' for more information"
-@@ -1850,6 +1855,7 @@ disabled with --disable-FEATURE, default is enabled if available:
- xkbcommon xkbcommon support
- rng-none dummy RNG, avoid using /dev/(u)random and getrandom()
- libdaxctl libdaxctl support
-+ tests build tests
-
- NOTE: The object files are built at the place where configure is launched
- EOF
-@@ -7014,6 +7020,7 @@ NINJA=$ninja $meson setup \
- -Diconv=$iconv -Dcurses=$curses -Dlibudev=$libudev\
- -Ddocs=$docs -Dsphinx_build=$sphinx_build -Dinstall_blobs=$blobs \
- -Dvhost_user_blk_server=$vhost_user_blk_server \
-+ -Dtests=$tests \
- $cross_arg \
- "$PWD" "$source_path"
-
-diff --git a/meson.build b/meson.build
-index e3386196ba..7f4efdc347 100644
---- a/meson.build
-+++ b/meson.build
-@@ -1944,7 +1944,10 @@ subdir('scripts')
- subdir('tools')
- subdir('pc-bios')
- subdir('docs')
--subdir('tests')
-+if get_option('tests').enabled()
-+ subdir('tests')
-+endif
-+
- if 'CONFIG_GTK' in config_host
- subdir('po')
- endif
-diff --git a/meson_options.txt b/meson_options.txt
-index f6f64785fe..81bffbfe87 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -66,6 +66,8 @@ option('virtiofsd', type: 'feature', value: 'auto',
- description: 'build virtiofs daemon (virtiofsd)')
- option('vhost_user_blk_server', type: 'feature', value: 'auto',
- description: 'build vhost-user-blk server')
-+option('tests', type : 'feature', value : 'auto',
-+ description: 'Tests build support')
-
- option('capstone', type: 'combo', value: 'auto',
- choices: ['disabled', 'enabled', 'auto', 'system', 'internal'],
---
-2.29.2
-
# Locally computed, tarball verified with GPG signature
-sha256 cb18d889b628fbe637672b0326789d9b0e3b8027e0445b936537c78549df17bc qemu-5.2.0.tar.xz
+sha256 87bc1a471ca24b97e7005711066007d443423d19aacda3d442558ae032fa30b9 qemu-6.0.0.tar.xz
sha256 6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100 COPYING
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB
#
################################################################################
-QEMU_VERSION = 5.2.0
+QEMU_VERSION = 6.0.0
QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz
QEMU_SITE = http://download.qemu.org
QEMU_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2-Clause, Others/BSD-1c
projects / buildroot.git / commitdiff