Skip to content

Commit

Permalink
bump qemu-9.2.0-rc1
Browse files Browse the repository at this point in the history
- remove redundant patches
- rc1 includes wanted armeb patch:

    abb1565d3d863cf210f18f70c4a42b0f39b8ccdb
    linux-user/arm: Select vdso for be8 and be32 modes
  • Loading branch information
mikdusan committed Nov 22, 2024
1 parent 0f837ad commit f5efda9
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 257 deletions.
2 changes: 1 addition & 1 deletion command/base
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ HOST_OS=${HOST_OS_RAW,,}
HOST_ARCH=${HOST_ARCH_RAW,,}

QEMU_NAME="qemu"
QEMU_REV="9.1.0"
QEMU_REV="9.2.0-rc1"

# when not empty use `git clone` instead of downloading source tarball
QEMU_GIT_COMMIT=""
Expand Down
4 changes: 1 addition & 3 deletions command/patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,5 @@ set -e
. $(dirname $0)/base

WORKDIR "/work/src/${QEMU_SRC_BASENAME}"
RUN patch -p1 -i "${WORK_ROOT}/patch/configs__targets__aarch64_be-linux-user.mak.diff"
RUN patch -p1 -i "${WORK_ROOT}/patch/linux-user__sigrt.diff"
RUN patch -p1 -i "${WORK_ROOT}/patch/linux-user__syscall-lfs.diff"
RUN patch -p1 -i "${WORK_ROOT}/patch/linux-user__signal.diff"
RUN patch -p1 -i "${WORK_ROOT}/patch/linux-user__syscall.diff"
25 changes: 0 additions & 25 deletions patch/configs__targets__aarch64_be-linux-user.mak.diff

This file was deleted.

10 changes: 2 additions & 8 deletions patch/linux-user__sigrt.diff → patch/linux-user__signal.diff
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
commit f73d26228e00c7a768755d72f6a01e2fa80c5252
Author: Michael Dusan <[email protected]>
Date: Wed Jun 5 11:08:51 2024 -0400

signal.c

diff --git a/linux-user/signal.c b/linux-user/signal.c
index 05dc4afb52..c07727dff0 100644
index 9b6d772882..a4224e7abf 100644
--- a/linux-user/signal.c
+++ b/linux-user/signal.c
@@ -37,6 +37,13 @@
@@ -39,6 +39,13 @@
/* target_siginfo_t must fit in gdbstub's siginfo save area. */
QEMU_BUILD_BUG_ON(sizeof(target_siginfo_t) > MAX_SIGINFO_LENGTH);

Expand Down
210 changes: 0 additions & 210 deletions patch/linux-user__syscall-lfs.diff

This file was deleted.

14 changes: 4 additions & 10 deletions patch/linux-user__syscall.diff
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
commit 60406bafb9f2ed39c8187058900dfefaf43ef9e6
Author: Michael Dusan <[email protected]>
Date: Wed Jun 5 11:09:23 2024 -0400

syscall.c

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 3df2b94d9a..29420959bf 100644
index 59b2080b98..b6c6d461ec 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -144,6 +144,13 @@
Expand All @@ -22,7 +16,7 @@ index 3df2b94d9a..29420959bf 100644
#ifndef CLONE_IO
#define CLONE_IO 0x80000000 /* Clone io context */
#endif
@@ -3223,7 +3230,7 @@ static abi_long do_sendrecvmsg_locked(int fd, struct target_msghdr *msgp,
@@ -3245,7 +3252,7 @@ static abi_long do_sendrecvmsg_locked(int fd, struct target_msghdr *msgp,
int flags, int send)
{
abi_long ret, len;
Expand All @@ -31,7 +25,7 @@ index 3df2b94d9a..29420959bf 100644
abi_ulong count;
struct iovec *vec;
abi_ulong target_vec;
@@ -7526,9 +7533,20 @@ static inline abi_long host_to_target_timex64(abi_long target_addr,
@@ -7545,9 +7552,20 @@ static inline abi_long host_to_target_timex64(abi_long target_addr,
#define sigev_notify_thread_id _sigev_un._tid
#endif

Expand All @@ -53,7 +47,7 @@ index 3df2b94d9a..29420959bf 100644
struct target_sigevent *target_sevp;

if (!lock_user_struct(VERIFY_READ, target_sevp, target_addr, 1)) {
@@ -7546,7 +7564,7 @@ static inline abi_long target_to_host_sigevent(struct sigevent *host_sevp,
@@ -7565,7 +7583,7 @@ static inline abi_long target_to_host_sigevent(struct sigevent *host_sevp,
host_sevp->sigev_signo =
target_to_host_signal(tswap32(target_sevp->sigev_signo));
host_sevp->sigev_notify = tswap32(target_sevp->sigev_notify);
Expand Down

0 comments on commit f5efda9

Please sign in to comment.