Skip to content

Commit f5efda9

Browse files
committed
bump qemu-9.2.0-rc1
- remove redundant patches - rc1 includes wanted armeb patch: abb1565d3d863cf210f18f70c4a42b0f39b8ccdb linux-user/arm: Select vdso for be8 and be32 modes
1 parent 0f837ad commit f5efda9

6 files changed

+8
-257
lines changed

command/base

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ HOST_OS=${HOST_OS_RAW,,}
77
HOST_ARCH=${HOST_ARCH_RAW,,}
88

99
QEMU_NAME="qemu"
10-
QEMU_REV="9.1.0"
10+
QEMU_REV="9.2.0-rc1"
1111

1212
# when not empty use `git clone` instead of downloading source tarball
1313
QEMU_GIT_COMMIT=""

command/patch

+1-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,5 @@ set -e
55
. $(dirname $0)/base
66

77
WORKDIR "/work/src/${QEMU_SRC_BASENAME}"
8-
RUN patch -p1 -i "${WORK_ROOT}/patch/configs__targets__aarch64_be-linux-user.mak.diff"
9-
RUN patch -p1 -i "${WORK_ROOT}/patch/linux-user__sigrt.diff"
10-
RUN patch -p1 -i "${WORK_ROOT}/patch/linux-user__syscall-lfs.diff"
8+
RUN patch -p1 -i "${WORK_ROOT}/patch/linux-user__signal.diff"
119
RUN patch -p1 -i "${WORK_ROOT}/patch/linux-user__syscall.diff"

patch/configs__targets__aarch64_be-linux-user.mak.diff

-25
This file was deleted.

patch/linux-user__sigrt.diff patch/linux-user__signal.diff

+2-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
1-
commit f73d26228e00c7a768755d72f6a01e2fa80c5252
2-
Author: Michael Dusan <[email protected]>
3-
Date: Wed Jun 5 11:08:51 2024 -0400
4-
5-
signal.c
6-
71
diff --git a/linux-user/signal.c b/linux-user/signal.c
8-
index 05dc4afb52..c07727dff0 100644
2+
index 9b6d772882..a4224e7abf 100644
93
--- a/linux-user/signal.c
104
+++ b/linux-user/signal.c
11-
@@ -37,6 +37,13 @@
5+
@@ -39,6 +39,13 @@
126
/* target_siginfo_t must fit in gdbstub's siginfo save area. */
137
QEMU_BUILD_BUG_ON(sizeof(target_siginfo_t) > MAX_SIGINFO_LENGTH);
148

patch/linux-user__syscall-lfs.diff

-210
This file was deleted.

patch/linux-user__syscall.diff

+4-10
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
1-
commit 60406bafb9f2ed39c8187058900dfefaf43ef9e6
2-
Author: Michael Dusan <[email protected]>
3-
Date: Wed Jun 5 11:09:23 2024 -0400
4-
5-
syscall.c
6-
71
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
8-
index 3df2b94d9a..29420959bf 100644
2+
index 59b2080b98..b6c6d461ec 100644
93
--- a/linux-user/syscall.c
104
+++ b/linux-user/syscall.c
115
@@ -144,6 +144,13 @@
@@ -22,7 +16,7 @@ index 3df2b94d9a..29420959bf 100644
2216
#ifndef CLONE_IO
2317
#define CLONE_IO 0x80000000 /* Clone io context */
2418
#endif
25-
@@ -3223,7 +3230,7 @@ static abi_long do_sendrecvmsg_locked(int fd, struct target_msghdr *msgp,
19+
@@ -3245,7 +3252,7 @@ static abi_long do_sendrecvmsg_locked(int fd, struct target_msghdr *msgp,
2620
int flags, int send)
2721
{
2822
abi_long ret, len;
@@ -31,7 +25,7 @@ index 3df2b94d9a..29420959bf 100644
3125
abi_ulong count;
3226
struct iovec *vec;
3327
abi_ulong target_vec;
34-
@@ -7526,9 +7533,20 @@ static inline abi_long host_to_target_timex64(abi_long target_addr,
28+
@@ -7545,9 +7552,20 @@ static inline abi_long host_to_target_timex64(abi_long target_addr,
3529
#define sigev_notify_thread_id _sigev_un._tid
3630
#endif
3731

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

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

0 commit comments

Comments
 (0)