pyrox.dev
qemu: Fix statfs flag.
Compile-tested the right package this time...
+14
-17
pkgs/applications/virtualization/qemu/statfs-flags.patch
+14
-17
pkgs/applications/virtualization/qemu/statfs-flags.patch
···
1
-
commit d3282d2512774dc5027c98930a3852b2b6e8407a
2
Author: Shea Levy <shea@shealevy.com>
3
Date: Sun Feb 18 13:50:11 2018 -0500
4
···
59
unlock_user_struct(target_stfs, arg2, 1);
60
}
61
diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
62
-
index a35c52a60a..9f90451caf 100644
63
--- a/linux-user/syscall_defs.h
64
+++ b/linux-user/syscall_defs.h
65
@@ -362,7 +362,14 @@ struct kernel_statfs {
···
77
};
78
79
struct target_dirent {
80
-
@@ -2223,7 +2230,13 @@ struct target_statfs {
81
/* Linux specials */
82
target_fsid_t f_fsid;
83
int32_t f_namelen;
84
+#ifdef HAVE_STATFS_FLAGS
85
-
+ int32_t f_frsize;
86
+ int32_t f_flags;
87
-
+ int32_t f_spare[4];
88
+#else
89
int32_t f_spare[6];
90
+#endif
91
};
92
#else
93
struct target_statfs {
94
-
@@ -2239,7 +2252,13 @@ struct target_statfs {
95
/* Linux specials */
96
target_fsid_t f_fsid;
97
abi_long f_namelen;
98
+#ifdef HAVE_STATFS_FLAGS
99
-
+ abi_long f_frsize;
100
+ abi_long f_flags;
101
-
+ abi_long f_spare[4];
102
+#else
103
abi_long f_spare[6];
104
+#endif
105
};
106
#endif
107
108
-
@@ -2255,7 +2274,13 @@ struct target_statfs64 {
109
uint64_t f_bavail;
110
target_fsid_t f_fsid;
111
uint32_t f_namelen;
112
+#ifdef HAVE_STATFS_FLAGS
113
-
+ uint32_t f_frsize;
114
+ uint32_t f_flags;
115
-
+ uint32_t f_spare[4];
116
+#else
117
uint32_t f_spare[6];
118
+#endif
119
};
120
#elif (defined(TARGET_PPC64) || defined(TARGET_X86_64) || \
121
defined(TARGET_SPARC64) || defined(TARGET_AARCH64)) && \
122
-
@@ -2271,7 +2296,12 @@ struct target_statfs {
123
target_fsid_t f_fsid;
124
abi_long f_namelen;
125
abi_long f_frsize;
···
132
};
133
134
struct target_statfs64 {
135
-
@@ -2285,7 +2315,12 @@ struct target_statfs64 {
136
target_fsid_t f_fsid;
137
abi_long f_namelen;
138
abi_long f_frsize;
···
145
};
146
#elif defined(TARGET_S390X)
147
struct target_statfs {
148
-
@@ -2299,7 +2334,13 @@ struct target_statfs {
149
kernel_fsid_t f_fsid;
150
int32_t f_namelen;
151
int32_t f_frsize;
···
159
};
160
161
struct target_statfs64 {
162
-
@@ -2313,7 +2354,12 @@ struct target_statfs64 {
163
kernel_fsid_t f_fsid;
164
int32_t f_namelen;
165
int32_t f_frsize;
···
172
};
173
#else
174
struct target_statfs {
175
-
@@ -2327,7 +2373,12 @@ struct target_statfs {
176
target_fsid_t f_fsid;
177
uint32_t f_namelen;
178
uint32_t f_frsize;
···
185
};
186
187
struct target_statfs64 {
188
-
@@ -2341,7 +2392,12 @@ struct target_statfs64 {
189
target_fsid_t f_fsid;
190
uint32_t f_namelen;
191
uint32_t f_frsize;
···
1
+
commit 909fe47c7009aa9a75fe9470c5f8d3dd5b50917a
2
Author: Shea Levy <shea@shealevy.com>
3
Date: Sun Feb 18 13:50:11 2018 -0500
4
···
59
unlock_user_struct(target_stfs, arg2, 1);
60
}
61
diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
62
+
index a35c52a60a..64aa49d3c5 100644
63
--- a/linux-user/syscall_defs.h
64
+++ b/linux-user/syscall_defs.h
65
@@ -362,7 +362,14 @@ struct kernel_statfs {
···
77
};
78
79
struct target_dirent {
80
+
@@ -2223,7 +2230,12 @@ struct target_statfs {
81
/* Linux specials */
82
target_fsid_t f_fsid;
83
int32_t f_namelen;
84
+#ifdef HAVE_STATFS_FLAGS
85
+ int32_t f_flags;
86
+
+ int32_t f_spare[5];
87
+#else
88
int32_t f_spare[6];
89
+#endif
90
};
91
#else
92
struct target_statfs {
93
+
@@ -2239,7 +2251,12 @@ struct target_statfs {
94
/* Linux specials */
95
target_fsid_t f_fsid;
96
abi_long f_namelen;
97
+#ifdef HAVE_STATFS_FLAGS
98
+ abi_long f_flags;
99
+
+ abi_long f_spare[5];
100
+#else
101
abi_long f_spare[6];
102
+#endif
103
};
104
#endif
105
106
+
@@ -2255,7 +2272,12 @@ struct target_statfs64 {
107
uint64_t f_bavail;
108
target_fsid_t f_fsid;
109
uint32_t f_namelen;
110
+#ifdef HAVE_STATFS_FLAGS
111
+ uint32_t f_flags;
112
+
+ uint32_t f_spare[5];
113
+#else
114
uint32_t f_spare[6];
115
+#endif
116
};
117
#elif (defined(TARGET_PPC64) || defined(TARGET_X86_64) || \
118
defined(TARGET_SPARC64) || defined(TARGET_AARCH64)) && \
119
+
@@ -2271,7 +2293,12 @@ struct target_statfs {
120
target_fsid_t f_fsid;
121
abi_long f_namelen;
122
abi_long f_frsize;
···
129
};
130
131
struct target_statfs64 {
132
+
@@ -2285,7 +2312,12 @@ struct target_statfs64 {
133
target_fsid_t f_fsid;
134
abi_long f_namelen;
135
abi_long f_frsize;
···
142
};
143
#elif defined(TARGET_S390X)
144
struct target_statfs {
145
+
@@ -2299,7 +2331,13 @@ struct target_statfs {
146
kernel_fsid_t f_fsid;
147
int32_t f_namelen;
148
int32_t f_frsize;
···
156
};
157
158
struct target_statfs64 {
159
+
@@ -2313,7 +2351,12 @@ struct target_statfs64 {
160
kernel_fsid_t f_fsid;
161
int32_t f_namelen;
162
int32_t f_frsize;
···
169
};
170
#else
171
struct target_statfs {
172
+
@@ -2327,7 +2370,12 @@ struct target_statfs {
173
target_fsid_t f_fsid;
174
uint32_t f_namelen;
175
uint32_t f_frsize;
···
182
};
183
184
struct target_statfs64 {
185
+
@@ -2341,7 +2389,12 @@ struct target_statfs64 {
186
target_fsid_t f_fsid;
187
uint32_t f_namelen;
188
uint32_t f_frsize;