Thanks, applied as dcfd85a4ffb9d0e5e3f8a3365d221180e1194346. Michael
[sent from post-receive hook] On Mon, 18 May 2026 09:54:16 +0200, Christian Melki <[email protected]> wrote: > A bunch of changes. 32-bit host support has been dropped. > https://wiki.qemu.org/ChangeLog/11.0 > > * Make QEMU build on 64-bit host only. > > * Remove 32-bit host option, not applicable any more. > > * Adjust install. linuxboot.bin is deprecated in favor of linuxboot_dma.bin. > > * Forward patchset, adjust for offsets. > > Signed-off-by: Christian Melki <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git > a/patches/qemu-10.2.2/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch > > b/patches/qemu-11.0.0/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch > similarity index 89% > rename from > patches/qemu-10.2.2/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch > rename to > patches/qemu-11.0.0/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch > index edd4e9d10bca..ac80a6e1fa88 100644 > --- > a/patches/qemu-10.2.2/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch > +++ > b/patches/qemu-11.0.0/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch > @@ -11,10 +11,10 @@ Signed-off-by: Michael Olbrich <[email protected]> > 1 file changed, 27 insertions(+), 13 deletions(-) > > diff --git a/hw/9pfs/9p-local.c b/hw/9pfs/9p-local.c > -index 31e216227cb9..1815a99c9da4 100644 > +index 24cb1da90ae0..9827cefbe12a 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, > +@@ -463,8 +463,7 @@ static ssize_t local_readlink(FsContext *fs_ctx, > V9fsPath *fs_path, > { > ssize_t tsize = -1; > > @@ -24,15 +24,15 @@ index 31e216227cb9..1815a99c9da4 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, > +@@ -477,6 +476,7 @@ static ssize_t local_readlink(FsContext *fs_ctx, > V9fsPath *fs_path, > tsize = RETRY_ON_EINTR(read(fd, (void *)buf, bufsz)); > close_preserve_errno(fd); > } else if ((fs_ctx->export_flags & V9FS_SM_PASSTHROUGH) || > + (fs_ctx->export_flags & V9FS_SM_MAPPED_FILE) || > (fs_ctx->export_flags & V9FS_SM_NONE)) { > + native_symlink:; > 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, > +@@ -489,6 +489,17 @@ static ssize_t local_readlink(FsContext *fs_ctx, > V9fsPath *fs_path, > } > > tsize = readlinkat(dirfd, name, buf, bufsz); > @@ -50,7 +50,7 @@ index 31e216227cb9..1815a99c9da4 100644 > close_preserve_errno(dirfd); > out: > g_free(name); > -@@ -902,18 +913,21 @@ static int local_symlink(FsContext *fs_ctx, const char > *oldpath, > +@@ -907,18 +918,21 @@ static int local_symlink(FsContext *fs_ctx, const char > *oldpath, > int fd; > ssize_t oldpath_size, write_size; > > diff --git a/patches/qemu-10.2.2/series b/patches/qemu-11.0.0/series > similarity index 100% > rename from patches/qemu-10.2.2/series > rename to patches/qemu-11.0.0/series > diff --git a/rules/qemu.make b/rules/qemu.make > index d44a7239e8d2..5831362d6563 100644 > --- a/rules/qemu.make > +++ b/rules/qemu.make > @@ -7,15 +7,15 @@ > # > > # > -# We provide this package > +# QEMU is 64-bit host only since 11.0 > # > -PACKAGES-$(PTXCONF_QEMU) += qemu > +PACKAGES-$(PTXCONF_ARCH_LP64)-$(PTXCONF_QEMU) += qemu > > # > # Paths and names > # > -QEMU_VERSION := 10.2.2 > -QEMU_MD5 := 33ab8e30348d5fd797521dd5041eb511 > +QEMU_VERSION := 11.0.0 > +QEMU_MD5 := d6e6ace0bb621419fd8586c5384ffe8b > QEMU := qemu-$(QEMU_VERSION) > QEMU_SUFFIX := tar.xz > QEMU_URL := https://download.qemu.org/$(QEMU).$(QEMU_SUFFIX) > @@ -31,10 +31,6 @@ QEMU_BUILD_OOT := YES > QEMU_MAKE_OPT := V=$(filter 1,$(PTXDIST_VERBOSE)) > > QEMU_TARGETS := $(call remove_quotes,$(PTXCONF_QEMU_TARGETS)) > -ifndef PTXCONF_ARCH_LP64 > -# 64-bit targets are not supported on 32-bit hosts > -QEMU_TARGETS := $(filter-out %64,$(QEMU_TARGETS)) > -endif > > QEMU_SYS_TARGETS := $(foreach target, $(QEMU_TARGETS), $(patsubst > %,%-softmmu,$(target))) > QEMU_USR_TARGETS := $(foreach target, $(QEMU_TARGETS), $(patsubst > %,%-linux-user,$(target))) > @@ -279,7 +275,6 @@ ifdef PTXCONF_QEMU_EDK2_FIRMWARE > @$(call install_copy, qemu, 0, 0, 0644, -, > /usr/share/qemu/edk2-x86_64-code.fd) > @$(call install_copy, qemu, 0, 0, 0644, -, > /usr/share/qemu/edk2-x86_64-secure-code.fd) > endif > - @$(call install_copy, qemu, 0, 0, 0644, -, > /usr/share/qemu/linuxboot.bin) > @$(call install_copy, qemu, 0, 0, 0644, -, > /usr/share/qemu/linuxboot_dma.bin) > @$(call install_copy, qemu, 0, 0, 0644, -, > /usr/share/qemu/pxe-e1000.rom) > @$(call install_copy, qemu, 0, 0, 0644, -, > /usr/share/qemu/pxe-eepro100.rom)
