From: oreo639 <oreo639@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] qemu: update to 8.1.5.
Date: Sun, 18 Feb 2024 03:06:27 +0100 [thread overview]
Message-ID: <20240218020627.6AB232B53A@inbox.vuxu.org> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-48789@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1240 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages qemu
https://github.com/void-linux/void-packages/pull/48789
qemu: update to 8.1.5.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/48789.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qemu-48789.patch --]
[-- Type: text/x-diff, Size: 4839 bytes --]
From d878c229d7dfb8f03fffe3783bfac93344e9d7d6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 16 Feb 2024 23:31:30 -0800
Subject: [PATCH 1/2] qemu: update to 8.1.5.
---
srcpkgs/qemu/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template
index 92df1dcb9de25..fe70489fbc352 100644
--- a/srcpkgs/qemu/template
+++ b/srcpkgs/qemu/template
@@ -1,7 +1,7 @@
# Template file for 'qemu'
# This package should be updated together with qemu-user-static
pkgname=qemu
-version=8.1.3
+version=8.1.5
revision=1
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec --localstatedir=/var
@@ -28,7 +28,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only, LGPL-2.1-only"
homepage="https://www.qemu.org"
distfiles="https://wiki.qemu.org/download/qemu-${version}.tar.bz2"
-checksum=0e448fb68f3a3bf43a3206e72a91e69136283b430b5996156dd7dfc64e55c998
+checksum=a12e9b5cdf41a3eeb534fa1467b81946fb57b5b27bcabc2ec0e450e7e0e785ba
ignore_elf_dirs="/usr/share/qemu"
nostrip_files="hppa-firmware.img openbios-ppc openbios-sparc32 openbios-sparc64
palcode-clipper s390-ccw.img s390-netboot.img u-boot.e500 opensbi-riscv32-generic-fw_dynamic.elf
From 454a7e49afe711472a88b1bef9b487e886d49c98 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 16 Feb 2024 23:31:55 -0800
Subject: [PATCH 2/2] qemu-user-static: update to 8.1.5.
Re-add patch removed in 147fb2841cdd6532a73009079f73cf0568ada885 to avoid
deadlock when when cross compiling to arm musl.
This was noticed in webkit2, with the WebKit2 gir executable causing
qemu-user-static to become stuck.
---
srcpkgs/qemu-user-static/template | 4 +-
srcpkgs/qemu/patches/mmap-mremap-efault.patch | 42 +++++++++++++++++++
2 files changed, 44 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/qemu/patches/mmap-mremap-efault.patch
diff --git a/srcpkgs/qemu-user-static/template b/srcpkgs/qemu-user-static/template
index 0674a92878a80..edb2b1fe60baf 100644
--- a/srcpkgs/qemu-user-static/template
+++ b/srcpkgs/qemu-user-static/template
@@ -1,7 +1,7 @@
# Template file for 'qemu-user-static'
# This package should be updated together with qemu
pkgname=qemu-user-static
-version=8.1.3
+version=8.1.5
revision=1
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only, LGPL-2.1-only"
homepage="https://www.qemu.org"
distfiles="https://wiki.qemu.org/download/qemu-${version}.tar.bz2"
-checksum=0e448fb68f3a3bf43a3206e72a91e69136283b430b5996156dd7dfc64e55c998
+checksum=a12e9b5cdf41a3eeb534fa1467b81946fb57b5b27bcabc2ec0e450e7e0e785ba
_fmts="aarch64 aarch64_be alpha arm armeb cris hppa i386 m68k microblaze
microblazeel mips mipsel mips64 mips64el mipsn32 mipsn32el or1k
diff --git a/srcpkgs/qemu/patches/mmap-mremap-efault.patch b/srcpkgs/qemu/patches/mmap-mremap-efault.patch
new file mode 100644
index 0000000000000..5a70e9658b300
--- /dev/null
+++ b/srcpkgs/qemu/patches/mmap-mremap-efault.patch
@@ -0,0 +1,42 @@
+Source: @pullmoll
+Upstream: no
+Reason: errno=EFAULT when the address passed to mremap(2) is not valid
+
+See Rich Felker's comment at https://www.openwall.com/lists/musl/2017/06/21/2 for
+why we need to return errno as described in man mremap(2) from qemu-user-static.
+Also speed up the loop when checking for increasing the mappings size to go
+in steps of TARGET_PAGE_SIZE and OR-in a check for the very last byte of the range.
+diff --git linux-user/mmap.c linux-user/mmap.c
+index 7e3b245..1e8d0f1 100644
+--- a/linux-user/mmap.c
++++ b/linux-user/mmap.c
+@@ -738,7 +738,7 @@ abi_long target_mremap(abi_ulong old_addr, abi_ulong old_size,
+ !guest_range_valid_untagged(new_addr, new_size)) ||
+ ((flags & MREMAP_MAYMOVE) == 0 &&
+ !guest_range_valid_untagged(old_addr, new_size))) {
+- errno = ENOMEM;
++ errno = EFAULT;
+ return -1;
+ }
+
+@@ -775,9 +775,10 @@ abi_long target_mremap(abi_ulong old_addr, abi_ulong old_size,
+ abi_ulong addr;
+ for (addr = old_addr + old_size;
+ addr < old_addr + new_size;
+- addr++) {
++ addr += TARGET_PAGE_SIZE) {
+ prot |= page_get_flags(addr);
+ }
++ prot |= page_get_flags(old_addr + new_size - 1);
+ }
+ if (prot == 0) {
+ host_addr = mremap(g2h_untagged(old_addr),
+@@ -796,7 +797,7 @@ abi_long target_mremap(abi_ulong old_addr, abi_ulong old_size,
+ }
+ }
+ } else {
+- errno = ENOMEM;
++ errno = EFAULT;
+ host_addr = MAP_FAILED;
+ }
+ }
next prev parent reply other threads:[~2024-02-18 2:06 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-17 7:42 [PR PATCH] " oreo639
2024-02-18 1:59 ` [PR PATCH] [Updated] " oreo639
2024-02-18 2:06 ` oreo639 [this message]
2024-02-18 10:47 ` chrysos349
2024-02-18 10:48 ` chrysos349
2024-02-18 21:36 ` [PR PATCH] [Updated] " oreo639
2024-02-18 23:37 ` [PR PATCH] [Merged]: " oreo639
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240218020627.6AB232B53A@inbox.vuxu.org \
--to=oreo639@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).