summaryrefslogtreecommitdiff
path: root/emulators/qemu/files
diff options
context:
space:
mode:
authorMuhammad Moinur Rahman <bofh@FreeBSD.org>2022-04-23 19:40:24 -0500
committerMuhammad Moinur Rahman <bofh@FreeBSD.org>2022-04-23 19:40:24 -0500
commit7eac6b77c16b3a2552a94e0f14e6fcf471e27a9e (patch)
tree79e8ce3b0d74e67cbb3902779bfdc904e2a4f955 /emulators/qemu/files
parentnet/phpldapadmin: Use predefined commands (diff)
emulators/qemu: Update version 6.2.0=>7.0.0
Users who want to stick with 6.X branch please check UPDATING or use qemu6. As previous qemu comes with three flavors: the default with X11 support, -nox11 without X11 support and -tools which instals only a subset of entire qemu. Relnotes: https://wiki.qemu.org/ChangeLog/7.0
Diffstat (limited to 'emulators/qemu/files')
-rw-r--r--emulators/qemu/files/patch-block_export_fuse.c25
-rw-r--r--emulators/qemu/files/patch-meson.build14
-rw-r--r--emulators/qemu/files/patch-util_meson.build14
3 files changed, 38 insertions, 15 deletions
diff --git a/emulators/qemu/files/patch-block_export_fuse.c b/emulators/qemu/files/patch-block_export_fuse.c
index af18e3c3d9f0..5fbb0dd9a040 100644
--- a/emulators/qemu/files/patch-block_export_fuse.c
+++ b/emulators/qemu/files/patch-block_export_fuse.c
@@ -1,14 +1,24 @@
---- block/export/fuse.c.orig 2021-12-10 19:29:04 UTC
+--- block/export/fuse.c.orig 2022-04-22 18:57:58 UTC
+++ block/export/fuse.c
-@@ -618,47 +618,7 @@ static void fuse_fallocate(fuse_req_t req, fuse_ino_t
+@@ -637,12 +637,6 @@ static void fuse_fallocate(fuse_req_t req, fuse_ino_t
return;
}
+-#ifdef CONFIG_FALLOCATE_PUNCH_HOLE
- if (mode & FALLOC_FL_KEEP_SIZE) {
- length = MIN(length, blk_len - offset);
- }
+-#endif /* CONFIG_FALLOCATE_PUNCH_HOLE */
-
-- if (mode & FALLOC_FL_PUNCH_HOLE) {
+ if (!mode) {
+ /* We can only fallocate at the EOF with a truncate */
+ if (offset < blk_len) {
+@@ -662,44 +656,6 @@ static void fuse_fallocate(fuse_req_t req, fuse_ino_t
+ ret = fuse_do_truncate(exp, offset + length, true,
+ PREALLOC_MODE_FALLOC);
+ }
+-#ifdef CONFIG_FALLOCATE_PUNCH_HOLE
+- else if (mode & FALLOC_FL_PUNCH_HOLE) {
- if (!(mode & FALLOC_FL_KEEP_SIZE)) {
- fuse_reply_err(req, EINVAL);
- return;
@@ -22,6 +32,7 @@
- length -= size;
- } while (ret == 0 && length > 0);
- }
+-#endif /* CONFIG_FALLOCATE_PUNCH_HOLE */
-#ifdef CONFIG_FALLOCATE_ZERO_RANGE
- else if (mode & FALLOC_FL_ZERO_RANGE) {
- if (!(mode & FALLOC_FL_KEEP_SIZE) && offset + length > blk_len) {
@@ -44,8 +55,6 @@
- } while (ret == 0 && length > 0);
- }
-#endif /* CONFIG_FALLOCATE_ZERO_RANGE */
-- else if (!mode) {
-+ if (!mode) {
- /* We can only fallocate at the EOF with a truncate */
- if (offset < blk_len) {
- fuse_reply_err(req, EOPNOTSUPP);
+ else {
+ ret = -EOPNOTSUPP;
+ }
diff --git a/emulators/qemu/files/patch-meson.build b/emulators/qemu/files/patch-meson.build
index 5359dd16ef0e..e701a096e957 100644
--- a/emulators/qemu/files/patch-meson.build
+++ b/emulators/qemu/files/patch-meson.build
@@ -1,7 +1,7 @@
---- meson.build.orig 2021-12-10 18:55:23 UTC
+--- meson.build.orig 2022-04-19 19:10:27 UTC
+++ meson.build
-@@ -1901,14 +1901,10 @@ fdt_opt = get_option('fdt')
- if have_system
+@@ -2505,14 +2505,10 @@ if have_system
+ fdt_opt = get_option('fdt')
if fdt_opt in ['enabled', 'auto', 'system']
have_internal = fs.exists(meson.current_source_dir() / 'dtc/libfdt/Makefile.libfdt')
- fdt = cc.find_library('fdt', kwargs: static_kwargs,
@@ -11,10 +11,10 @@
- if fdt.found() and cc.links('''
- #include <libfdt.h>
- #include <libfdt_env.h>
-- int main(void) { fdt_check_full(NULL, 0); return 0; }''',
+- int main(void) { fdt_find_max_phandle(NULL, NULL); return 0; }''',
- dependencies: fdt)
-+ fdt_opt == 'enabled' )
++ fdt_opt == 'enabled')
+ if fdt.found()
fdt_opt = 'system'
- elif have_internal
- fdt_opt = 'internal'
+ elif fdt_opt == 'system'
+ error('system libfdt requested, but it is too old (1.5.1 or newer required)')
diff --git a/emulators/qemu/files/patch-util_meson.build b/emulators/qemu/files/patch-util_meson.build
new file mode 100644
index 000000000000..590b1f5a0592
--- /dev/null
+++ b/emulators/qemu/files/patch-util_meson.build
@@ -0,0 +1,14 @@
+--- util/meson.build.orig 2022-04-23 11:59:28 UTC
++++ util/meson.build
+@@ -87,10 +87,6 @@ if have_block
+ util_ss.add(files('readline.c'))
+ util_ss.add(files('throttle.c'))
+ util_ss.add(files('timed-average.c'))
+- if config_host_data.get('CONFIG_INOTIFY1')
+- util_ss.add(files('filemonitor-inotify.c'))
+- else
+- util_ss.add(files('filemonitor-stub.c'))
+- endif
++ util_ss.add(files('filemonitor-stub.c'))
+ util_ss.add(when: 'CONFIG_LINUX', if_true: files('vfio-helpers.c'))
+ endif