A new major release of qemu. https://wiki.qemu.org/ChangeLog/7.0
Plugs CVEs: CVE-2021-20295, CVE-2022-1050, CVE-2022-26353, CVE-2022-26354 and CVE-2022-0358. * Remove deleted configure options libxml2, xfsctl. * Disable block replication. Wouldn't build, investigation ongoing. * Forward ptxdist patches to this version. * Delete old patch set. Signed-off-by: Christian Melki <[email protected]> --- ...low-real-symlinks-for-security_model-mapped-f.patch | 10 +++++----- .../0002-let-ninja-use-the-jobserver.patch | 4 ++-- patches/{qemu-6.2.0 => qemu-7.0.0}/series | 0 rules/qemu.make | 8 +++----- 4 files changed, 10 insertions(+), 12 deletions(-) rename patches/{qemu-6.2.0 => qemu-7.0.0}/0001-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch (91%) rename patches/{qemu-6.2.0 => qemu-7.0.0}/0002-let-ninja-use-the-jobserver.patch (88%) rename patches/{qemu-6.2.0 => qemu-7.0.0}/series (100%) diff --git a/patches/qemu-6.2.0/0001-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch b/patches/qemu-7.0.0/0001-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch similarity index 91% rename from patches/qemu-6.2.0/0001-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch rename to patches/qemu-7.0.0/0001-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch index 27fea6364..6299ba1f6 100644 --- a/patches/qemu-6.2.0/0001-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch +++ b/patches/qemu-7.0.0/0001-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch @@ -11,10 +11,10 @@ Signed-off-by: Michael Olbrich <[email protected]> 1 file changed, 29 insertions(+), 15 deletions(-) diff --git a/hw/9pfs/9p-local.c b/hw/9pfs/9p-local.c -index 210d9e7705df..92ecfec34b1c 100644 +index d42ce6d8b822..559573008eec 100644 --- a/hw/9pfs/9p-local.c +++ b/hw/9pfs/9p-local.c -@@ -460,8 +460,7 @@ static ssize_t local_readlink(FsContext *fs_ctx, V9fsPath *fs_path, +@@ -462,8 +462,7 @@ static ssize_t local_readlink(FsContext *fs_ctx, V9fsPath *fs_path, { ssize_t tsize = -1; @@ -24,7 +24,7 @@ index 210d9e7705df..92ecfec34b1c 100644 int fd; fd = local_open_nofollow(fs_ctx, fs_path->data, O_RDONLY, 0); -@@ -473,6 +472,7 @@ static ssize_t local_readlink(FsContext *fs_ctx, V9fsPath *fs_path, +@@ -475,6 +474,7 @@ static ssize_t local_readlink(FsContext *fs_ctx, V9fsPath *fs_path, } while (tsize == -1 && errno == EINTR); close_preserve_errno(fd); } else if ((fs_ctx->export_flags & V9FS_SM_PASSTHROUGH) || @@ -32,7 +32,7 @@ index 210d9e7705df..92ecfec34b1c 100644 (fs_ctx->export_flags & V9FS_SM_NONE)) { char *dirpath = g_path_get_dirname(fs_path->data); char *name = g_path_get_basename(fs_path->data); -@@ -484,6 +484,17 @@ static ssize_t local_readlink(FsContext *fs_ctx, V9fsPath *fs_path, +@@ -486,6 +486,17 @@ static ssize_t local_readlink(FsContext *fs_ctx, V9fsPath *fs_path, } tsize = readlinkat(dirfd, name, buf, bufsz); @@ -50,7 +50,7 @@ index 210d9e7705df..92ecfec34b1c 100644 close_preserve_errno(dirfd); out: g_free(name); -@@ -886,20 +897,23 @@ static int local_symlink(FsContext *fs_ctx, const char *oldpath, +@@ -901,20 +912,23 @@ static int local_symlink(FsContext *fs_ctx, const char *oldpath, int fd; ssize_t oldpath_size, write_size; diff --git a/patches/qemu-6.2.0/0002-let-ninja-use-the-jobserver.patch b/patches/qemu-7.0.0/0002-let-ninja-use-the-jobserver.patch similarity index 88% rename from patches/qemu-6.2.0/0002-let-ninja-use-the-jobserver.patch rename to patches/qemu-7.0.0/0002-let-ninja-use-the-jobserver.patch index 5df864c39..14559418f 100644 --- a/patches/qemu-6.2.0/0002-let-ninja-use-the-jobserver.patch +++ b/patches/qemu-7.0.0/0002-let-ninja-use-the-jobserver.patch @@ -11,7 +11,7 @@ Signed-off-by: Michael Olbrich <[email protected]> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 74c5b46d38b5..4b3e390e8947 100644 +index e5fd1ebdf619..23128172d02a 100644 --- a/Makefile +++ b/Makefile @@ -142,7 +142,7 @@ MAKE.k = $(findstring k,$(firstword $(filter-out --%,$(MAKEFLAGS)))) @@ -22,4 +22,4 @@ index 74c5b46d38b5..4b3e390e8947 100644 + $(filter-out -j, $(lastword $(filter -l% -j%, $(MAKEFLAGS)))) \ ninja-cmd-goals = $(or $(MAKECMDGOALS), all) - ninja-cmd-goals += $(foreach t, $(.tests), $(.test.deps.$t)) + ninja-cmd-goals += $(foreach t, $(.check.build-suites), $(.check-$t.deps)) diff --git a/patches/qemu-6.2.0/series b/patches/qemu-7.0.0/series similarity index 100% rename from patches/qemu-6.2.0/series rename to patches/qemu-7.0.0/series diff --git a/rules/qemu.make b/rules/qemu.make index fad87903f..6e8445124 100644 --- a/rules/qemu.make +++ b/rules/qemu.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_QEMU) += qemu # # Paths and names # -QEMU_VERSION := 6.2.0 -QEMU_MD5 := a077669ce58b6ee07ec355e54aad25be +QEMU_VERSION := 7.0.0 +QEMU_MD5 := bfb5b09a0d1f887c8c42a6d5f26971ab QEMU := qemu-$(QEMU_VERSION) QEMU_SUFFIX := tar.xz QEMU_URL := https://download.qemu.org/$(QEMU).$(QEMU_SUFFIX) @@ -101,7 +101,6 @@ QEMU_CONF_OPT := \ --disable-libpmem \ --disable-libudev \ --$(call ptx/endis, PTXCONF_QEMU_SYS)-libusb \ - --disable-libxml2 \ --disable-linux-aio \ --disable-linux-io-uring \ --disable-lzfse \ @@ -169,9 +168,8 @@ QEMU_CONF_OPT := \ --disable-tpm \ --disable-libssh \ --disable-numa \ - --enable-replication \ + --disable-replication \ --disable-opengl \ - --disable-xfsctl \ --disable-qom-cast-debug \ --$(call ptx/endis, PTXCONF_QEMU_TOOLS)-tools \ --disable-bochs \ -- 2.34.1
