Bunch of changes. Mostly RISC-V. Pipewire addition.
https://wiki.qemu.org/ChangeLog/8.1
* Plugs CVEs:
CVE-2023-2861, CVE-2023-4135
* Forward patchset with minor line changes.
* Add pipewire support.
* Remove deprecated configure options and set others.
* Disable build system auto-download option.
Signed-off-by: Christian Melki <christian.me...@t2data.com>
---
...ow-real-symlinks-for-security_model-mapped-f.patch | 4 ++--
.../0101-let-ninja-use-the-jobserver.patch | 4 ++--
patches/{qemu-8.0.4 => qemu-8.1.0}/series | 0
rules/qemu.in | 7 +++++++
rules/qemu.make | 11 ++++++-----
5 files changed, 17 insertions(+), 9 deletions(-)
rename patches/{qemu-8.0.4 =>
qemu-8.1.0}/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch
(97%)
rename patches/{qemu-8.0.4 =>
qemu-8.1.0}/0101-let-ninja-use-the-jobserver.patch (90%)
rename patches/{qemu-8.0.4 => qemu-8.1.0}/series (100%)
diff --git
a/patches/qemu-8.0.4/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch
b/patches/qemu-8.1.0/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch
similarity index 97%
rename from
patches/qemu-8.0.4/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch
rename to
patches/qemu-8.1.0/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch
index 15f297782..46b75f8a9 100644
---
a/patches/qemu-8.0.4/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch
+++
b/patches/qemu-8.1.0/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch
@@ -11,7 +11,7 @@ Signed-off-by: Michael Olbrich <m.olbr...@pengutronix.de>
1 file changed, 27 insertions(+), 13 deletions(-)
diff --git a/hw/9pfs/9p-local.c b/hw/9pfs/9p-local.c
-index 9d07620235c2..376d5b095c76 100644
+index 1b1f3b9ec81e..d900dccaacb1 100644
--- a/hw/9pfs/9p-local.c
+++ b/hw/9pfs/9p-local.c
@@ -462,8 +462,7 @@ static ssize_t local_readlink(FsContext *fs_ctx, V9fsPath
*fs_path,
@@ -81,5 +81,5 @@ index 9d07620235c2..376d5b095c76 100644
+ goto err_end;
+ }
}
- /* Set cleint credentials in symlink's xattr */
+ /* Set client credentials in symlink's xattr */
credp->fc_mode = credp->fc_mode | S_IFLNK;
diff --git a/patches/qemu-8.0.4/0101-let-ninja-use-the-jobserver.patch
b/patches/qemu-8.1.0/0101-let-ninja-use-the-jobserver.patch
similarity index 90%
rename from patches/qemu-8.0.4/0101-let-ninja-use-the-jobserver.patch
rename to patches/qemu-8.1.0/0101-let-ninja-use-the-jobserver.patch
index 92fdb14b6..a1524c1d9 100644
--- a/patches/qemu-8.0.4/0101-let-ninja-use-the-jobserver.patch
+++ b/patches/qemu-8.1.0/0101-let-ninja-use-the-jobserver.patch
@@ -11,10 +11,10 @@ Signed-off-by: Michael Olbrich <m.olbr...@pengutronix.de>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
-index e421f8a1f4f7..0028d9996cdc 100644
+index 5d48dfac18a3..61a291a95903 100644
--- a/Makefile
+++ b/Makefile
-@@ -145,7 +145,7 @@ MAKE.k = $(findstring k,$(firstword $(filter-out
--%,$(MAKEFLAGS))))
+@@ -142,7 +142,7 @@ MAKE.k = $(findstring k,$(firstword $(filter-out
--%,$(MAKEFLAGS))))
MAKE.q = $(findstring q,$(firstword $(filter-out --%,$(MAKEFLAGS))))
MAKE.nq = $(if $(word 2, $(MAKE.n) $(MAKE.q)),nq)
NINJAFLAGS = $(if $V,-v) $(if $(MAKE.n), -n) $(if $(MAKE.k), -k0) \
diff --git a/patches/qemu-8.0.4/series b/patches/qemu-8.1.0/series
similarity index 100%
rename from patches/qemu-8.0.4/series
rename to patches/qemu-8.1.0/series
diff --git a/rules/qemu.in b/rules/qemu.in
index 6524013e6..24089c7b5 100644
--- a/rules/qemu.in
+++ b/rules/qemu.in
@@ -17,6 +17,7 @@ menuconfig QEMU
select PIXMAN if QEMU_SYS
select PULSEAUDIO if QEMU_PULSEAUDIO
select ALSA_LIB if QEMU_ALSA
+ select PIPEWIRE if QEMU_PIPEWIRE
help
QEMU is a generic and open source machine emulator and
virtualizer.
@@ -56,6 +57,12 @@ config QEMU_ALSA
help
Say y to build with alsa support.
+config QEMU_PIPEWIRE
+ bool
+ prompt "Enable pipewire audio output support."
+ help
+ Say y to build with pipewire support.
+
config QEMU_TOOLS
bool
prompt "Enable tools"
diff --git a/rules/qemu.make b/rules/qemu.make
index a0039fba4..25d3564f6 100644
--- a/rules/qemu.make
+++ b/rules/qemu.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_QEMU) += qemu
#
# Paths and names
#
-QEMU_VERSION := 8.0.4
-QEMU_MD5 := 8f840abde4713da2a50e041cc07a9409
+QEMU_VERSION := 8.1.0
+QEMU_MD5 := 7dd9ff5a92cf81cfce6cda1f6e271f3a
QEMU := qemu-$(QEMU_VERSION)
QEMU_SUFFIX := tar.xz
QEMU_URL := https://download.qemu.org/$(QEMU).$(QEMU_SUFFIX)
@@ -38,6 +38,7 @@ QEMU_USR_TARGETS := $(foreach target, $(QEMU_TARGETS),
$(patsubst %,%-linux-user
QEMU_AUDIO_DRIVER-y :=
QEMU_AUDIO_DRIVER-$(PTXCONF_QEMU_ALSA) += alsa
QEMU_AUDIO_DRIVER-$(PTXCONF_QEMU_PULSEAUDIO) += pa
+QEMU_AUDIO_DRIVER-$(PTXCONF_QEMU_PIPEWIRE) += pipewire
QEMU_CONF_TOOL := autoconf
# Note: not really autoconf:
@@ -48,14 +49,13 @@ QEMU_CONF_OPT := \
$(call ptx/ifdef, PTXCONF_QEMU_SYS,$(QEMU_SYS_TARGETS),) \
$(call ptx/ifdef, PTXCONF_QEMU_USR,$(QEMU_USR_TARGETS),))) \
--cross-prefix=$(CROSS_COMPILE) \
- --meson=meson \
--ninja=ninja \
- --with-git-submodules=ignore \
+ --disable-download \
--disable-sanitizers \
--disable-tsan \
--disable-werror \
--enable-stack-protector \
- --with-coroutine= \
+ --with-coroutine=auto \
--disable-plugins \
--disable-containers \
--audio-drv-list=$(subst $(space),$(comma),$(strip
$(QEMU_AUDIO_DRIVER-y))) \
@@ -137,6 +137,7 @@ QEMU_CONF_OPT := \
--disable-opengl \
--disable-oss \
--$(call ptx/endis, PTXCONF_QEMU_PULSEAUDIO)-pa \
+ --$(call ptx/endis, PTXCONF_QEMU_PIPEWIRE)-pipewire \
--disable-parallels \
--disable-png \
--disable-pvrdma \
--
2.34.1
