[qemu-usermode] linux-user: Support f_flags in statfs64 when availabl…

…e. JB#48738

rpm/0001-Revert-linux-user-Use-safe_syscall-for-open-and-open.patch

@@ -1,7 +1,7 @@
-From 39cd8ca6a0314c5e44bd8265d76ab3304b2c56f0 Mon Sep 17 00:00:00 2001
+From c5ee3e5707dcf49d62b4b7d4714d9861153a900d Mon Sep 17 00:00:00 2001
 From: Frajo Haider <f_haider@gmx.at>
 Date: Wed, 22 Jan 2020 10:47:20 +0200
-Subject: [PATCH 01/16] Revert "linux-user: Use safe_syscall for open and
+Subject: [PATCH 01/18] Revert "linux-user: Use safe_syscall for open and
  openat system calls"
 
 This reverts commit c10a07387b77b94d8f7233f3b5bb559211d4e49a.

rpm/0002-Revert-linux-user-Use-safe_syscall-for-execve-syscal.patch

@@ -1,7 +1,7 @@
-From 12799301407de446fa6e5737fc13f2ff1b7ba5dd Mon Sep 17 00:00:00 2001
+From 8a45f877babcdddc8061026924923bb42ad97bd0 Mon Sep 17 00:00:00 2001
 From: Frajo Haider <f_haider@gmx.at>
 Date: Wed, 22 Jan 2020 10:48:18 +0200
-Subject: [PATCH 02/16] Revert "linux-user: Use safe_syscall for execve
+Subject: [PATCH 02/18] Revert "linux-user: Use safe_syscall for execve
  syscall"
 
 This reverts commit ffdcbe223d23461669869e85786145cce65e1e8c.

rpm/0003-Revert-linux-user-Use-safe_syscall-wrapper-for-send-.patch

@@ -1,7 +1,7 @@
-From e3b9af32def2b414035233bbb9cb623635318171 Mon Sep 17 00:00:00 2001
+From 8ddd86705568ebc51a4dbac9a5070ea5707dc066 Mon Sep 17 00:00:00 2001
 From: Frajo Haider <f_haider@gmx.at>
 Date: Wed, 22 Jan 2020 10:57:53 +0200
-Subject: [PATCH 03/16] Revert "linux-user: Use safe_syscall wrapper for send*
+Subject: [PATCH 03/18] Revert "linux-user: Use safe_syscall wrapper for send*
  and recv* syscalls"
 
 This reverts commit 666875306e03e1f94e1d4c808502585c10abc69a.

rpm/0004-Revert-linux-user-Use-safe_syscall-wrapper-for-accep.patch

@@ -1,7 +1,7 @@
-From 10b5ebe56a71913eb00241978ac6956e9e33a997 Mon Sep 17 00:00:00 2001
+From c097e9d61af51fedf44d5a8b4eea41a50a72bd8c Mon Sep 17 00:00:00 2001
 From: Frajo Haider <f_haider@gmx.at>
 Date: Wed, 22 Jan 2020 10:59:47 +0200
-Subject: [PATCH 04/16] Revert "linux-user: Use safe_syscall wrapper for accept
+Subject: [PATCH 04/18] Revert "linux-user: Use safe_syscall wrapper for accept
  and accept4 syscalls"
 
 This reverts commit ff6dc130794bcd5b2033bc50262a7720285a74c7.

rpm/0005-Revert-linux-user-Use-safe_syscall-for-wait-system-c.patch

@@ -1,7 +1,7 @@
-From b92a3ef5f94971bc51ac0890279980cb8b75756c Mon Sep 17 00:00:00 2001
+From 7bc5b415e9b39961d01ed6cb7b6b6f77c0108ebb Mon Sep 17 00:00:00 2001
 From: Frajo Haider <f_haider@gmx.at>
 Date: Wed, 22 Jan 2020 11:00:44 +0200
-Subject: [PATCH 05/16] Revert "linux-user: Use safe_syscall for wait system
+Subject: [PATCH 05/18] Revert "linux-user: Use safe_syscall for wait system
  calls"
 
 This reverts commit 4af80a3783950380df85ecca78aea3e3bad2e846.

rpm/0006-Revert-linux-user-Use-safe_syscall-wrapper-for-conne.patch

@@ -1,7 +1,7 @@
-From e03333501ddbe3687578d021b9f61b7011cf40de Mon Sep 17 00:00:00 2001
+From fc481085c58c1add1bc1b6980c4e0713964e06a9 Mon Sep 17 00:00:00 2001
 From: Frajo Haider <f_haider@gmx.at>
 Date: Wed, 22 Jan 2020 11:13:13 +0200
-Subject: [PATCH 06/16] Revert "linux-user: Use safe_syscall wrapper for
+Subject: [PATCH 06/18] Revert "linux-user: Use safe_syscall wrapper for
  connect syscall"
 
 This reverts commit 2a3c7619288af9cfcc09a233dce911bf80849dfb.

rpm/0007-Revert-linux-user-Use-direct-syscall-for-utimensat.patch

@@ -1,7 +1,7 @@
-From 22f3a5a6d805bce44863e5ccb4319e7ecc6c51a0 Mon Sep 17 00:00:00 2001
+From 3ecf0acf5bc0e7be754bcd69f0535c3dadb2b8ae Mon Sep 17 00:00:00 2001
 From: Frajo Haider <f_haider@gmx.at>
 Date: Wed, 29 Jan 2020 12:49:43 +0200
-Subject: [PATCH 07/16] Revert "linux-user: Use direct syscall for utimensat"
+Subject: [PATCH 07/18] Revert "linux-user: Use direct syscall for utimensat"
 
 This reverts commit 700fa58e4b9100d6bd77df06d2e5d1f457720c4d.
 ---

rpm/0008-Revert-target-arm-Use-vector-operations-for-saturati.patch

@@ -1,7 +1,7 @@
-From 5c2aa1e2f83457d9fca017544b5c54442426b638 Mon Sep 17 00:00:00 2001
+From 95d2720faee2764ea069a076af66ac656b12f09b Mon Sep 17 00:00:00 2001
 From: Frajo Haider <f_haider@gmx.at>
 Date: Wed, 22 Jan 2020 23:59:11 +0200
-Subject: [PATCH 08/16] Revert "target/arm: Use vector operations for
+Subject: [PATCH 08/18] Revert "target/arm: Use vector operations for
  saturation"
 
 This reverts commit 89e68b575e138d0af1435f11a8ffcd8779c237bd.

rpm/0009-linux-user-Also-ignore-attempts-to-block-SIGTERM-SIG.patch

@@ -1,7 +1,7 @@
-From f1035bb69375180d64633c7ce4d4032fa9288e87 Mon Sep 17 00:00:00 2001
+From ec490a9455770826db836662414ad881be18919b Mon Sep 17 00:00:00 2001
 From: Frajo Haider <f_haider@gmx.at>
 Date: Thu, 23 Jan 2020 00:13:32 +0000
-Subject: [PATCH 09/16] linux-user: Also ignore attempts to block SIGTERM,
+Subject: [PATCH 09/18] linux-user: Also ignore attempts to block SIGTERM,
  SIGINT and SIGHUP
 
 ---

rpm/0010-Revert-tcg-i386-Fix-dupi-dupm-for-avx1-and-32-bit-ho.patch

@@ -1,7 +1,7 @@
-From a0ea1b3374840810908866708a80b9b19d0c7ca4 Mon Sep 17 00:00:00 2001
+From 95137fc3c609b0397ad0328ef42a589fac27a13c Mon Sep 17 00:00:00 2001
 From: Frajo Haider <f_haider@gmx.at>
 Date: Thu, 23 Jan 2020 14:28:06 +0000
-Subject: [PATCH 10/16] Revert "tcg/i386: Fix dupi/dupm for avx1 and 32-bit
+Subject: [PATCH 10/18] Revert "tcg/i386: Fix dupi/dupm for avx1 and 32-bit
  hosts"
 
 This reverts commit 7b60ef3264e9627ac6efb34e9a6130647e9b55c0.

rpm/0011-Revert-tcg-i386-Implement-tcg_out_dupm_vec.patch

@@ -1,7 +1,7 @@
-From b4f47da302e76c4c18d402e1bba7dff158433c08 Mon Sep 17 00:00:00 2001
+From 9da799e9e96bfe226af01142bb9c7f908bfe49f9 Mon Sep 17 00:00:00 2001
 From: Frajo Haider <f_haider@gmx.at>
 Date: Thu, 23 Jan 2020 14:29:04 +0000
-Subject: [PATCH 11/16] Revert "tcg/i386: Implement tcg_out_dupm_vec"
+Subject: [PATCH 11/18] Revert "tcg/i386: Implement tcg_out_dupm_vec"
 
 This reverts commit 1e262b49b5331441f697461e4305fe06719758a7.
 ---

rpm/0012-Revert-target-arm-Use-gvec-for-VSRI-VSLI.patch

@@ -1,7 +1,7 @@
-From 3d6ef81c2af3433a2abd5a1a91c94e87446864dc Mon Sep 17 00:00:00 2001
+From 0e5cc709d597b99113602700c0b6fef754ba059f Mon Sep 17 00:00:00 2001
 From: Frajo Haider <f_haider@gmx.at>
 Date: Thu, 23 Jan 2020 14:46:53 +0000
-Subject: [PATCH 12/16] Revert "target/arm: Use gvec for VSRI, VSLI"
+Subject: [PATCH 12/18] Revert "target/arm: Use gvec for VSRI, VSLI"
 
 This reverts commit f3cd8218d1d3e534877ce3f3cb61c6757d10f9df.
 

rpm/0013-crypto-check-if-getrandom-is-available-properly.patch

@@ -1,7 +1,7 @@
-From 27902ccf61f501962f5841602abcad9d99ea89f3 Mon Sep 17 00:00:00 2001
+From d2676f456e54504b18c31c936d6be4c298a694c2 Mon Sep 17 00:00:00 2001
 From: Frajo Haider <f_haider@gmx.at>
 Date: Mon, 27 Jan 2020 20:34:21 +0200
-Subject: [PATCH 13/16] crypto: check if getrandom is available properly
+Subject: [PATCH 13/18] crypto: check if getrandom is available properly
 
 ---
  crypto/random-platform.c | 16 ++++++++++++----

rpm/0014-Revert-tcg-Add-INDEX_op_dupm_vec.patch

@@ -1,7 +1,7 @@
-From 9d9a03c9bc6527ebdc6274dad224561059be0dfe Mon Sep 17 00:00:00 2001
+From 22bde562330bbad6149a6e6729a2490404dfdb43 Mon Sep 17 00:00:00 2001
 From: Frajo Haider <f_haider@gmx.at>
 Date: Tue, 28 Jan 2020 13:39:19 +0000
-Subject: [PATCH 14/16] Revert "tcg: Add INDEX_op_dupm_vec"
+Subject: [PATCH 14/18] Revert "tcg: Add INDEX_op_dupm_vec"
 
 This reverts commit 37ee55a081b7863ffab2151068dd1b2f11376914.
 

rpm/0015-qemu-usermode-make-sure-mode-is-passed-to-openat-if-.patch → rpm/0015-make-sure-mode-is-passed-to-openat-if-O_TMPFILE-is-s.patch

@@ -1,8 +1,8 @@
-From c8ca4f9ecc3c3f705b004d7e361a42be75d04184 Mon Sep 17 00:00:00 2001
+From 06305b5dd6c36a3ffd6189245aa7cf1da2a253e3 Mon Sep 17 00:00:00 2001
 From: Frajo Haider <f_haider@gmx.at>
 Date: Wed, 29 Jan 2020 11:12:24 +0000
-Subject: [PATCH 15/15] [qemu-usermode] make sure mode is passed to openat if
- O_TMPFILE is specified. JB#45765
+Subject: [PATCH 15/18] make sure mode is passed to openat if O_TMPFILE is
+ specified. JB#45765
 
 ---
  linux-user/syscall.c | 2 +-

rpm/0016-Revert-util-drop-old-utimensat-compat-code.patch

@@ -1,7 +1,7 @@
-From 1a464d4a8eec73e1a481c9b02787ce24ac9a79d3 Mon Sep 17 00:00:00 2001
+From 69ef874f2a2b6ce45c184905e22e0beb1475e8b0 Mon Sep 17 00:00:00 2001
 From: Frajo Haider <f_haider@gmx.at>
 Date: Wed, 29 Jan 2020 11:21:54 +0000
-Subject: [PATCH 16/16] Revert "util: drop old utimensat() compat code"
+Subject: [PATCH 16/18] Revert "util: drop old utimensat() compat code"
 
 This reverts commit fcdcf1eed2fd26bfe836080755ba4322d3c1f2cc.
 

rpm/0017-Revert-linux-user-Use-safe_syscall-wrapper-for-fcntl.patch

@@ -1,7 +1,7 @@
-From 4a3009c3e98c7c67cf3ba1aacca8a533f0b960e0 Mon Sep 17 00:00:00 2001
+From 0ffeb21b025cdc3b9f131f0e3deece6e8c0dff51 Mon Sep 17 00:00:00 2001
 From: Frajo Haider <f_haider@gmx.at>
 Date: Wed, 29 Jan 2020 12:42:08 +0000
-Subject: [PATCH 17/17] Revert "linux-user: Use safe_syscall wrapper for fcntl"
+Subject: [PATCH 17/18] Revert "linux-user: Use safe_syscall wrapper for fcntl"
 
 This reverts commit 435da5e7092aa54e12044b9401b42c4a9333c74d.
 

rpm/0018-linux-user-Support-f_flags-in-statfs64-when-availabl.patch

@@ -0,0 +1,28 @@
+From e03a3b91c40ba4d1fae1bd4325c784f797d4c7db Mon Sep 17 00:00:00 2001
+From: Frajo Haider <f_haider@gmx.at>
+Date: Thu, 30 Jan 2020 12:17:16 +0000
+Subject: [PATCH 18/18] linux-user: Support f_flags in statfs64 when available.
+
+---
+ linux-user/syscall.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/linux-user/syscall.c b/linux-user/syscall.c
+index 859cce2..709770b 100644
+--- a/linux-user/syscall.c
++++ b/linux-user/syscall.c
+@@ -8985,6 +8985,11 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
+             __put_user(stfs.f_fsid.__val[1], &target_stfs->f_fsid.val[1]);
+             __put_user(stfs.f_namelen, &target_stfs->f_namelen);
+             __put_user(stfs.f_frsize, &target_stfs->f_frsize);
++#ifdef _STATFS_F_FLAGS
++            __put_user(stfs.f_flags, &target_stfs->f_flags);
++#else
++            __put_user(0, &target_stfs->f_flags);
++#endif
+             memset(target_stfs->f_spare, 0, sizeof(target_stfs->f_spare));
+             unlock_user_struct(target_stfs, arg3, 1);
+         }
+-- 
+1.8.3-rc3
+

rpm/qemu-usermode.spec

@@ -33,11 +33,13 @@ Patch12: 0013-crypto-check-if-getrandom-is-available-properly.patch
 # fix libgcyrpt basic test with 4.2.0 (and probably other failures)
 Patch13: 0014-Revert-tcg-Add-INDEX_op_dupm_vec.patch
 # fix openat syscall (breaks e.g. bc build)
-Patch14: 0015-qemu-usermode-make-sure-mode-is-passed-to-openat-if-.patch
+Patch14: 0015-make-sure-mode-is-passed-to-openat-if-O_TMPFILE-is-s.patch
 # make sure utimensat from glibc is being used (see sb2 fixes above)
 Patch15: 0016-Revert-util-drop-old-utimensat-compat-code.patch
 # one more revert for sb2
 Patch16: 0017-Revert-linux-user-Use-safe_syscall-wrapper-for-fcntl.patch
+# fix f_flags in statfs64
+Patch17: 0018-linux-user-Support-f_flags-in-statfs64-when-availabl.patch
 
 BuildRequires:  pkgconfig(ext2fs)
 BuildRequires:  pkgconfig(glib-2.0)