Re: [PR PATCH] [Updated] qemu: Fix padding in host_sigevent

[ismaell <ismaell@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 799 bytes --]

There is an updated pull request by ismaell against master on the void-packages repository

https://github.com/ismaell/void-packages patch-1
https://github.com/void-linux/void-packages/pull/32897

qemu: Fix padding in host_sigevent
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

A patch file from https://github.com/void-linux/void-packages/pull/32897.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-patch-1-32897.patch --]
[-- Type: text/x-diff, Size: 2232 bytes --]

From eed91170c607fee478d3c5bf093e4a75c3e4a628 Mon Sep 17 00:00:00 2001
From: Ismael Luceno <ismael@iodev.co.uk>
Date: Thu, 9 Sep 2021 23:15:02 +0200
Subject: [PATCH] qemu: Fix padding in host_sigevent

The struct should be padded to 64 bytes but instead it was padded to
(sizeof(int) * (64 - 2 * sizeof(int) + sizeof(union sigval))).

Assuming both int and pointer types are 64 bits, that leads to a padding
of 448 bytes.
---
 .../patches/musl-fix-sigevent-and-sigval_t.patch     | 12 +++++++-----
 srcpkgs/qemu/template                                |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/qemu/patches/musl-fix-sigevent-and-sigval_t.patch b/srcpkgs/qemu/patches/musl-fix-sigevent-and-sigval_t.patch
index c51fca6cf432..8bed0c8d7ee9 100644
--- a/srcpkgs/qemu/patches/musl-fix-sigevent-and-sigval_t.patch
+++ b/srcpkgs/qemu/patches/musl-fix-sigevent-and-sigval_t.patch
@@ -1,16 +1,18 @@
---- a/linux-user/syscall.c.orig    2015-04-10 07:10:06.305662505 +0000
-+++ b/linux-user/syscall.c 2015-04-10 07:36:53.801871968 +0000
+Note: Remove this patch with musl 1.2.2
+
+--- a/linux-user/syscall.c
++++ b/linux-user/syscall.c
 @@ -5020,9 +5020,20 @@
      return 0;
  }
-
+ 
 -static inline abi_long target_to_host_sigevent(struct sigevent *host_sevp,
 +struct host_sigevent {
 +    union sigval sigev_value;
 +    int sigev_signo;
 +    int sigev_notify;
 +    union {
-+       int _pad[64-sizeof(int) * 2 + sizeof(union sigval)];
++       char _pad[64 - sizeof(int) * 2 - sizeof(union sigval)];
 +       int _tid;
 +    } _sigev_un;
 +};
@@ -20,5 +22,5 @@
  {
 +    struct host_sigevent *host_sevp = (struct host_sigevent *) sevp;
      struct target_sigevent *target_sevp;
-
+ 
      if (!lock_user_struct(VERIFY_READ, target_sevp, target_addr, 1)) {
diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template
index 186609607a74..cbb6bd8b89d2 100644
--- a/srcpkgs/qemu/template
+++ b/srcpkgs/qemu/template
@@ -2,7 +2,7 @@
 # This package should be updated together with qemu-user-static
 pkgname=qemu
 version=6.1.0
-revision=2
+revision=3
 build_style=configure
 hostmakedepends="gettext pkg-config perl python3 automake libtool flex
  python3-Sphinx python3-sphinx_rtd_theme texinfo ninja"