community/qemu: upgrade to 6.0.0

add hw-s390x-virtio-gpu-ccw module
remove patches applied upstream
fix guest-agent-shutdown.patch

community/qemu/APKBUILD

@@ -3,8 +3,8 @@
 # Contributor: Jakub Jirutka <jakub@jirutka.cz>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=qemu
-pkgver=5.2.0
+pkgver=6.0.0
-pkgrel=4
+pkgrel=0
 pkgdesc="QEMU is a generic machine emulator and virtualizer"
 url="https://qemu.org/"
 arch="all"
@@ -151,6 +151,7 @@ _modules="
 	hw-display-virtio-gpu-pci
 	hw-display-virtio-gpu
 	hw-display-virtio-vga
+	hw-s390x-virtio-gpu-ccw
 	ui-egl-headless
 	ui-opengl
 	ui-spice-core
@@ -171,10 +172,7 @@ source="https://wiki.qemu-project.org/download/qemu-$pkgver.tar.xz
 	0001-linux-user-fix-build-with-musl-on-ppc64le.patch
 	MAP_SYNC-fix.patch
 	fix-sockios-header.patch
-	test-crypto-ivgen-skip-essiv.patch
 	guest-agent-shutdown.patch
-	mips-softfloat.patch
-	fix-sendmsg.patch
 
 	0001-virtio-host-input-use-safe-64-bit-time-accessors-for.patch
 	0002-virtio-user-input-use-safe-64-bit-time-accessors-for.patch
@@ -397,7 +395,7 @@ _all_modules() {
 	mkdir -p "$subpkgdir"
 }
 
-sha512sums="bddd633ce111471ebc651e03080251515178808556b49a308a724909e55dac0be0cc0c79c536ac12d239678ae94c60100dc124be9b9d9538340c03a2f27177f3  qemu-5.2.0.tar.xz
+sha512sums="ee3ff00aebec4d8891d2ff6dabe4e667e510b2a4fe3f6190aa34673a91ea32dcd2db2e9bf94c2f1bf05aa79788f17cfbbedc6027c0988ea08a92587b79ee05e4  qemu-6.0.0.tar.xz
 98db5e23397cfad4a7210f9f7e1c5fa5c48f065785439521c5b39325c429f2dc367c40925adff6aa8677b3192a1a98a30e93d5b9c879df523deb019c40edd9d9  0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch
 1ac043312864309e19f839a699ab2485bca51bbf3d5fdb39f1a87b87e3cbdd8cbda1a56e6b5c9ffccd65a8ac2f600da9ceb8713f4dbba26f245bc52bcd8a1c56  0001-linux-user-fix-build-with-musl-on-aarch64.patch
 224f5b44da749921e8a821359478c5238d8b6e24a9c0b4c5738c34e82f3062ec4639d495b8b5883d304af4a0d567e38aa6623aac1aa3a7164a5757c036528ac0  musl-F_SHLCK-and-F_EXLCK.patch
@@ -406,10 +404,7 @@ sha512sums="bddd633ce111471ebc651e03080251515178808556b49a308a724909e55dac0be0cc
 d8933df9484158c2b4888254e62117d78f8ed7c18527b249419f39c2b2ab1afa148010884b40661f8965f1ef3105580fceffdfddbb2c9221dc1c62066722ba65  0001-linux-user-fix-build-with-musl-on-ppc64le.patch
 d7de79ea74e36702cac4a59e472564a55f0a663be7e63c3755e32b4b5dfbc04b390ee79f09f43f6ae706ee2aec9e005eade3c0fd4a202db60d11f436874a17d7  MAP_SYNC-fix.patch
 39590476a4ebd7c1e79a4f0451b24c75b1817a2a83abaa1f71bb60b225d772152f0af8f3e51ff65645e378c536ffa6ff551dade52884d03a14b7c6a19c5c97d4  fix-sockios-header.patch
-8b8db136f78bd26b5da171effa9e11016ec2bc3e2fc8107228b5543b47aa370978ed883794aa4f917f334e284a5b49e82070e1da2d31d49301195b6713a48eff  test-crypto-ivgen-skip-essiv.patch
+d6b81846cefd46b8fd1fb04450d4898f97dc77d11e049fb1bc8e2553bbb88c8325151d0e4bec70cc6820a5863c1d1749b99100b4747d91182856c3ca1946cb28  guest-agent-shutdown.patch
-b8e58bcc409f25cc6ff59967ed68f4de0a8656ec4db71ab663cc77761f8210b3f85c475fceb32dec934dc02a5c4f679a8313edbcf84e149692a81764c8904f67  guest-agent-shutdown.patch
-d9e299e1658b1a1e9304b3fcf0da8ab665fa334629e5e462354f20079cf6fae330297cbc28e1d546f8e6837abc6f515c836167c32c5a061a30ae88c4b195d1b0  mips-softfloat.patch
-5ad9a42ea0c6936ffdae5c94973894930987feb7374b7daf91c2f88b31519e5d68686d4a0de560f6980930eec57852a7e651afceb85ac1485c7385ae168d5818  fix-sendmsg.patch
 9541a94685cfe411120c4073e6714fd3e307d8a4954e7a760532224b3b018fc8948ee03f2338edbb6626b20b751263249c731ac1de83333048d80982371e1874  0001-virtio-host-input-use-safe-64-bit-time-accessors-for.patch
 be84d316ebe4ec883e4d02a05721be5b5d478aaa5897bb8cf25431a893397b6834e46253f139b7b94d0f4186c0c90bba78968deb47a82fc06865097f8f4d7a1a  0002-virtio-user-input-use-safe-64-bit-time-accessors-for.patch
 d90c034cae3f9097466854ed1a9f32ab4b02089fcdf7320e8f4da13b2b1ff65067233f48809911485e4431d7ec1a22448b934121bc9522a2dc489009e87e2b1f  qemu-guest-agent.confd

community/qemu/fix-sendmsg.patch

@@ -1,13 +0,0 @@
-diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index 389ec09764..116d5eaff5 100644
---- a/linux-user/syscall.c
-+++ b/linux-user/syscall.c
-@@ -3337,7 +3337,7 @@ static abi_long do_sendrecvmsg_locked(int fd, struct target_msghdr *msgp,
-                                       int flags, int send)
- {
-     abi_long ret, len;
--    struct msghdr msg;
-+    struct msghdr msg = {};
-     abi_ulong count;
-     struct iovec *vec;
-     abi_ulong target_vec;

community/qemu/guest-agent-shutdown.patch

@@ -1,8 +1,6 @@
-diff --git a/qga/commands-posix.c b/qga/commands-posix.c
+--- a/qga/commands-posix.c	2021-04-30 14:07:31.202337082 +0000
-index 1877976..7915aab 100644
++++ b/qga/commands-posix.c	2021-04-30 14:10:05.253272361 +0000
---- a/qga/commands-posix.c
+@@ -84,6 +84,7 @@ static void ga_wait_child(pid_t pid, int
-+++ b/qga/commands-posix.c
-@@ -82,6 +82,7 @@ static void ga_wait_child(pid_t pid, int *status, Error **errp)
  void qmp_guest_shutdown(bool has_mode, const char *mode, Error **errp)
  {
      const char *shutdown_flag;
@@ -10,7 +8,7 @@ index 1877976..7915aab 100644
      Error *local_err = NULL;
      pid_t pid;
      int status;
-@@ -89,10 +90,13 @@ void qmp_guest_shutdown(bool has_mode, const char *mode, Error **errp)
+@@ -91,10 +92,13 @@ void qmp_guest_shutdown(bool has_mode, c
      slog("guest-shutdown called, mode: %s", mode);
      if (!has_mode || strcmp(mode, "powerdown") == 0) {
          shutdown_flag = "-P";
@@ -24,10 +22,10 @@ index 1877976..7915aab 100644
      } else {
          error_setg(errp,
                     "mode is invalid (valid values are: halt|powerdown|reboot");
-@@ -109,6 +113,7 @@ void qmp_guest_shutdown(bool has_mode, const char *mode, Error **errp)
+@@ -111,6 +115,7 @@ void qmp_guest_shutdown(bool has_mode, c
  
          execle("/sbin/shutdown", "shutdown", "-h", shutdown_flag, "+0",
-                "hypervisor initiated shutdown", (char*)NULL, environ);
+                "hypervisor initiated shutdown", (char *)NULL, environ);
 +        execle(fallback_cmd, fallback_cmd, (char*)NULL, environ);
          _exit(EXIT_FAILURE);
      } else if (pid < 0) {

community/qemu/mips-softfloat.patch

@@ -1,32 +0,0 @@
-diff --git a/tests/fp/fp-bench.c b/tests/fp/fp-bench.c
-index 4ba5e1d..313256c 100644
---- a/tests/fp/fp-bench.c
-+++ b/tests/fp/fp-bench.c
-@@ -479,6 +479,7 @@ static void QEMU_NORETURN die_host_rounding(enum rounding rounding)
-     exit(EXIT_FAILURE);
- }
- 
-+#ifndef __mips_soft_float
- static void set_host_precision(enum rounding rounding)
- {
-     int rhost;
-@@ -507,6 +508,7 @@ static void set_host_precision(enum rounding rounding)
-         die_host_rounding(rounding);
-     }
- }
-+#endif
- 
- static void set_soft_precision(enum rounding rounding)
- {
-@@ -596,9 +598,11 @@ static void parse_args(int argc, char *argv[])
- 
-     /* set precision and rounding mode based on the tester */
-     switch (tester) {
-+#ifndef __mips_soft_float
-     case TESTER_HOST:
-         set_host_precision(rounding);
-         break;
-+#endif
-     case TESTER_SOFT:
-         set_soft_precision(rounding);
-         switch (precision) {

community/qemu/test-crypto-ivgen-skip-essiv.patch

@@ -1,54 +0,0 @@
-These tests fail with Illegal instruction and I don't have a clue why,
-so skip them for now.
-
---- a/tests/test-crypto-ivgen.c
-+++ b/tests/test-crypto-ivgen.c
-@@ -88,48 +88,6 @@
-                                "\x00\x00\x00\x00\x00\x00\x00\x00",
-         .niv = 16,
-     },
--    /* Small */
--    {
--        "/crypto/ivgen/essiv/1",
--        .sector = 0x1,
--        .ivalg = QCRYPTO_IVGEN_ALG_ESSIV,
--        .cipheralg = QCRYPTO_CIPHER_ALG_AES_128,
--        .hashalg = QCRYPTO_HASH_ALG_SHA256,
--        .key = (const uint8_t *)"\x00\x01\x02\x03\x04\x05\x06\x07"
--                                "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",
--        .nkey = 16,
--        .iv = (const uint8_t *)"\xd4\x83\x71\xb2\xa1\x94\x53\x88"
--                               "\x1c\x7a\x2d\06\x2d\x0b\x65\x46",
--        .niv = 16,
--    },
--    /* Big ! */
--    {
--        "/crypto/ivgen/essiv/1f2e3d4c",
--        .sector = 0x1f2e3d4cULL,
--        .ivalg = QCRYPTO_IVGEN_ALG_ESSIV,
--        .cipheralg = QCRYPTO_CIPHER_ALG_AES_128,
--        .hashalg = QCRYPTO_HASH_ALG_SHA256,
--        .key = (const uint8_t *)"\x00\x01\x02\x03\x04\x05\x06\x07"
--                                "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",
--        .nkey = 16,
--        .iv = (const uint8_t *)"\x5d\x36\x09\x5d\xc6\x9e\x5e\xe9"
--                               "\xe3\x02\x8d\xd8\x7a\x3d\xe7\x8f",
--        .niv = 16,
--    },
--    /* No Truncation */
--    {
--        "/crypto/ivgen/essiv/1f2e3d4c5b6a7988",
--        .sector = 0x1f2e3d4c5b6a7988ULL,
--        .ivalg = QCRYPTO_IVGEN_ALG_ESSIV,
--        .cipheralg = QCRYPTO_CIPHER_ALG_AES_128,
--        .hashalg = QCRYPTO_HASH_ALG_SHA256,
--        .key = (const uint8_t *)"\x00\x01\x02\x03\x04\x05\x06\x07"
--                                "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",
--        .nkey = 16,
--        .iv = (const uint8_t *)"\x58\xbb\x81\x94\x51\x83\x23\x23"
--                               "\x7a\x08\x93\xa9\xdc\xd2\xd9\xab",
--        .niv = 16,
--    },
- };
- 
-