summaryrefslogtreecommitdiff
path: root/emulators/qemu8/files
diff options
context:
space:
mode:
Diffstat (limited to 'emulators/qemu8/files')
-rw-r--r--emulators/qemu8/files/patch-block_export_fuse.c69
-rw-r--r--emulators/qemu8/files/patch-bsd-user_host_i386_host-signal.h10
-rw-r--r--emulators/qemu8/files/patch-util_cpuinfo-ppc.c34
-rw-r--r--emulators/qemu8/files/patch-util_meson.build15
-rw-r--r--emulators/qemu8/files/qemu-ifdown.sample2
-rw-r--r--emulators/qemu8/files/qemu-ifup.sample2
6 files changed, 0 insertions, 132 deletions
diff --git a/emulators/qemu8/files/patch-block_export_fuse.c b/emulators/qemu8/files/patch-block_export_fuse.c
deleted file mode 100644
index 03b9cc8b5994..000000000000
--- a/emulators/qemu8/files/patch-block_export_fuse.c
+++ /dev/null
@@ -1,69 +0,0 @@
---- block/export/fuse.c.orig 2023-12-19 21:24:34 UTC
-+++ block/export/fuse.c
-@@ -690,12 +690,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) {
- /* We can only fallocate at the EOF with a truncate */
- if (offset < blk_len) {
-@@ -715,53 +709,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;
-- }
--
-- do {
-- int size = MIN(length, BDRV_REQUEST_MAX_BYTES);
--
-- ret = blk_pwrite_zeroes(exp->common.blk, offset, size,
-- BDRV_REQ_MAY_UNMAP | BDRV_REQ_NO_FALLBACK);
-- if (ret == -ENOTSUP) {
-- /*
-- * fallocate() specifies to return EOPNOTSUPP for unsupported
-- * operations
-- */
-- ret = -EOPNOTSUPP;
-- }
--
-- offset += size;
-- 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) {
-- /* No need for zeroes, we are going to write them ourselves */
-- ret = fuse_do_truncate(exp, offset + length, false,
-- PREALLOC_MODE_OFF);
-- if (ret < 0) {
-- fuse_reply_err(req, -ret);
-- return;
-- }
-- }
--
-- do {
-- int size = MIN(length, BDRV_REQUEST_MAX_BYTES);
--
-- ret = blk_pwrite_zeroes(exp->common.blk,
-- offset, size, 0);
-- offset += size;
-- length -= size;
-- } while (ret == 0 && length > 0);
-- }
--#endif /* CONFIG_FALLOCATE_ZERO_RANGE */
- else {
- ret = -EOPNOTSUPP;
- }
diff --git a/emulators/qemu8/files/patch-bsd-user_host_i386_host-signal.h b/emulators/qemu8/files/patch-bsd-user_host_i386_host-signal.h
deleted file mode 100644
index 07d731fd4f54..000000000000
--- a/emulators/qemu8/files/patch-bsd-user_host_i386_host-signal.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- bsd-user/host/i386/host-signal.h.orig 2022-12-14 16:28:45 UTC
-+++ bsd-user/host/i386/host-signal.h
-@@ -12,6 +12,7 @@
- #include <sys/param.h>
- #include <sys/ucontext.h>
- #include <machine/trap.h>
-+#include <vm/vm.h>
- #include <vm/pmap.h>
- #include <machine/pmap.h>
-
diff --git a/emulators/qemu8/files/patch-util_cpuinfo-ppc.c b/emulators/qemu8/files/patch-util_cpuinfo-ppc.c
deleted file mode 100644
index af9999a22108..000000000000
--- a/emulators/qemu8/files/patch-util_cpuinfo-ppc.c
+++ /dev/null
@@ -1,34 +0,0 @@
---- util/cpuinfo-ppc.c.orig 2024-01-29 19:13:22 UTC
-+++ util/cpuinfo-ppc.c
-@@ -6,13 +6,21 @@
- #include "qemu/osdep.h"
- #include "host/cpuinfo.h"
-
--#include <asm/cputable.h>
- #ifdef CONFIG_GETAUXVAL
- # include <sys/auxv.h>
- #else
-+# ifdef __linux__
-+# include <asm/cputable.h>
-+# elif defined(__FreeBSD__)
-+# include <machine/cpu.h>
-+# endif
- # include "elf.h"
- #endif
-
-+#ifndef PPC_FEATURE2_ARCH_3_1
-+# define PPC_FEATURE2_ARCH_3_1 0x00040000
-+#endif
-+
- unsigned cpuinfo;
-
- /* Called both as constructor and (possibly) via other constructors. */
-@@ -53,7 +61,7 @@ unsigned __attribute__((constructor)) cpuinfo_init(voi
- * always have both anyway, since VSX came with Power7
- * and crypto came with Power8.
- */
-- if (hwcap2 & PPC_FEATURE2_VEC_CRYPTO) {
-+ if (hwcap2 & PPC_FEATURE2_HAS_VEC_CRYPTO) {
- info |= CPUINFO_CRYPTO;
- }
- }
diff --git a/emulators/qemu8/files/patch-util_meson.build b/emulators/qemu8/files/patch-util_meson.build
deleted file mode 100644
index 1e42351652d7..000000000000
--- a/emulators/qemu8/files/patch-util_meson.build
+++ /dev/null
@@ -1,15 +0,0 @@
---- util/meson.build.orig 2023-12-19 21:24:35 UTC
-+++ util/meson.build
-@@ -102,11 +102,7 @@ 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
-
diff --git a/emulators/qemu8/files/qemu-ifdown.sample b/emulators/qemu8/files/qemu-ifdown.sample
deleted file mode 100644
index 89d9a9bff436..000000000000
--- a/emulators/qemu8/files/qemu-ifdown.sample
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec true
diff --git a/emulators/qemu8/files/qemu-ifup.sample b/emulators/qemu8/files/qemu-ifup.sample
deleted file mode 100644
index 89d9a9bff436..000000000000
--- a/emulators/qemu8/files/qemu-ifup.sample
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec true
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-02 01:34:57 +0000