diff options
| author | Muhammad Moinur Rahman <bofh@FreeBSD.org> | 2024-01-29 20:14:36 +0100 |
|---|---|---|
| committer | Muhammad Moinur Rahman <bofh@FreeBSD.org> | 2024-01-29 20:54:23 +0100 |
| commit | 4927ace0dd70205553c501b36f585e5494d55dac (patch) | |
| tree | 738e5ab693704349f56aae6471baa333ebdd9797 /emulators/qemu-devel/files | |
| parent | cad/verilator: Moved man to share/man (diff) | |
Diffstat (limited to 'emulators/qemu-devel/files')
| -rw-r--r-- | emulators/qemu-devel/files/patch-util_cpuinfo-ppc.c | 11 | ||||
| -rw-r--r-- | emulators/qemu-devel/files/patch-util_meson.build | 10 |
2 files changed, 12 insertions, 9 deletions
diff --git a/emulators/qemu-devel/files/patch-util_cpuinfo-ppc.c b/emulators/qemu-devel/files/patch-util_cpuinfo-ppc.c index 499de6e86db0..ae39b6c3f4ae 100644 --- a/emulators/qemu-devel/files/patch-util_cpuinfo-ppc.c +++ b/emulators/qemu-devel/files/patch-util_cpuinfo-ppc.c @@ -1,13 +1,16 @@ ---- util/cpuinfo-ppc.c.orig 2023-08-29 11:28:39 UTC +--- util/cpuinfo-ppc.c.orig 2024-01-26 18:16:35 UTC +++ util/cpuinfo-ppc.c -@@ -9,8 +9,14 @@ +@@ -6,11 +6,17 @@ + #include "qemu/osdep.h" + #include "host/cpuinfo.h" + +-#include <asm/cputable.h> #ifdef CONFIG_GETAUXVAL # include <sys/auxv.h> - #else --# include <asm/cputable.h> +# ifdef __linux__ +# include <asm/cputable.h> +# endif + #else # include "elf.h" +#endif + diff --git a/emulators/qemu-devel/files/patch-util_meson.build b/emulators/qemu-devel/files/patch-util_meson.build index 1d5e2986b7dd..abc95426e00a 100644 --- a/emulators/qemu-devel/files/patch-util_meson.build +++ b/emulators/qemu-devel/files/patch-util_meson.build @@ -1,6 +1,6 @@ ---- util/meson.build.orig 2023-12-27 10:15:32 UTC +--- util/meson.build.orig 2024-01-26 18:16:35 UTC +++ util/meson.build -@@ -102,11 +102,7 @@ if have_block +@@ -103,11 +103,7 @@ if have_block util_ss.add(files('readline.c')) util_ss.add(files('throttle.c')) util_ss.add(files('timed-average.c')) @@ -10,6 +10,6 @@ - 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')) - util_ss.add(when: 'CONFIG_LINUX', if_true: files('chardev_open.c')) - endif + if host_os == 'linux' + util_ss.add(files('vhost-user-server.c'), vhost_user) + util_ss.add(files('vfio-helpers.c')) |