<pre style='margin:0'>
Rainer Müller (raimue) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a7716041f73f0a96b387099695f3c102ae276896">https://github.com/macports/macports-ports/commit/a7716041f73f0a96b387099695f3c102ae276896</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new a7716041f73 qemu: update to 7.0.0
</span>a7716041f73 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a7716041f73f0a96b387099695f3c102ae276896
</span>Author: Sriranga Veeraraghavan <srirangav@users.noreply.github.com>
AuthorDate: Thu Apr 21 17:46:53 2022 -0700
<span style='display:block; white-space:pre;color:#404040;'> qemu: update to 7.0.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * update to version 7.0.0
</span><span style='display:block; white-space:pre;color:#404040;'> * enable virtfs by default
</span><span style='display:block; white-space:pre;color:#404040;'> * add dbus variant
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/65051
</span>---
emulators/qemu/Portfile | 30 +++---
emulators/qemu/files/patch-qemu-7f6c295.diff | 32 ------
emulators/qemu/files/patch-qemu-ad99f64.diff | 107 ---------------------
...diff => patch-qemu-include-qemu-madvise_h.diff} | 6 +-
.../files/patch-qemu-scripts-entitlements.diff | 11 ---
5 files changed, 18 insertions(+), 168 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/qemu/Portfile b/emulators/qemu/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c928556064a..7cc80e476da 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/qemu/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/qemu/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,8 +8,8 @@ PortGroup legacysupport 1.1
</span> legacysupport.newest_darwin_requires_legacy 15
name qemu
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 6.2.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 7.0.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories emulators
license GPL-2+
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,9 +26,9 @@ homepage https://www.qemu.org
</span> master_sites https://download.qemu.org/
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 1860d0ab3729a6e247ef69543249d60278d8496e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 68e15d8e45ac56326e0b9a4afa8b49a3dfe8aba3488221d098c84698bca65b45 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 115667324
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 7da5fae7e6c059bb5f3effc6efd3816dc6021480 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f6b375c7951f728402798b0baabb2d86478ca53d44cedbefabbe1c46bf46f839 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 125117636
</span>
depends_build port:texinfo \
port:libtool \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,23 +52,15 @@ patchfiles-append patch-qemu-configure.diff
</span> # "error: unknown type name 'fpunchhole_t'" pre-10.12.4
patchfiles-append patch-qemu-punchhole.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# "cp: illegal option -- a"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-qemu-scripts-entitlements.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # IPPROTO workarounds
patchfiles-append patch-qemu-net-colo.diff
# MADV_DONTNEED workaround
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-qemu-include-qemu-osdep.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-qemu-include-qemu-madvise_h.diff
</span>
# MAP_JIT workaround
patchfiles-append patch-qemu-tcg-region.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Backports from QEMU 7 which are necessary for newer Linux guests on ARM
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# See https://gitlab.com/qemu-project/qemu/-/issues/899
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-qemu-ad99f64.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-qemu-7f6c295.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # "ERROR: You need at least GCC v7.5 or Clang v6.0 (or XCode Clang v10.0)"
compiler.blacklist {clang < 1000} {macports-clang-[3-5].*} {macports-gcc-[56]} {*gcc-[34].*}
if {${os.platform} eq "darwin" && ${os.major} < 11 && [string match *clang* ${configure.compiler}]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -128,7 +120,9 @@ configure.args-append --disable-cocoa \
</span> --disable-snappy \
--disable-lzo \
--disable-lzfse \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-zstd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-zstd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-dbus-display \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-virtfs
</span>
# Hypervisor.framework introduced in 10.10
if {${os.platform} eq "darwin" && ${os.major} < 14} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -260,6 +254,12 @@ variant ssh description {Support remote block devices over SSH} {
</span> depends_lib-append port:libssh
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant dbus description {Export the VM display through D-Bus} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --disable-dbus-display --enable-dbus-display
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --enable-modules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:glib2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Default universal variant does not work
universal_variant no
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/qemu/files/patch-qemu-7f6c295.diff b/emulators/qemu/files/patch-qemu-7f6c295.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index d9295077827..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/qemu/files/patch-qemu-7f6c295.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,32 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git target/arm/hvf/hvf.c target/arm/hvf/hvf.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 808c96da8ccbd8d191f5b78ed397d39463aa3809..4d4ddab348a7d73c4c99ca18705dc3257aebfa8a 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- target/arm/hvf/hvf.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ target/arm/hvf/hvf.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -754,6 +754,15 @@ static bool hvf_handle_psci_call(CPUState *cpu)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return true;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static bool is_id_sysreg(uint32_t reg)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return SYSREG_OP0(reg) == 3 &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SYSREG_OP1(reg) == 0 &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SYSREG_CRN(reg) == 0 &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SYSREG_CRM(reg) >= 1 &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SYSREG_CRM(reg) < 8;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static int hvf_sysreg_read(CPUState *cpu, uint32_t reg, uint32_t rt)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ARMCPU *arm_cpu = ARM_CPU(cpu);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -806,6 +815,11 @@ static int hvf_sysreg_read(CPUState *cpu, uint32_t reg, uint32_t rt)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Dummy register */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (is_id_sysreg(reg)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* ID system registers read as RES0 */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ val = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cpu_synchronize_state(cpu);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- trace_hvf_unhandled_sysreg_read(env->pc, reg,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SYSREG_OP0(reg),
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/qemu/files/patch-qemu-ad99f64.diff b/emulators/qemu/files/patch-qemu-ad99f64.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 1a53f3c4e8d..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/qemu/files/patch-qemu-ad99f64.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,107 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git target/arm/hvf/hvf.c target/arm/hvf/hvf.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0dc96560d3469316907f70efcc971b540687a570..808c96da8ccbd8d191f5b78ed397d39463aa3809 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- target/arm/hvf/hvf.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ target/arm/hvf/hvf.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -35,9 +35,34 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ENCODE_AA64_CP_REG(CP_REG_ARM64_SYSREG_CP, crn, crm, op0, op1, op2)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define PL1_WRITE_MASK 0x4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define SYSREG_OP0_SHIFT 20
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define SYSREG_OP0_MASK 0x3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define SYSREG_OP0(sysreg) ((sysreg >> SYSREG_OP0_SHIFT) & SYSREG_OP0_MASK)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define SYSREG_OP1_SHIFT 14
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define SYSREG_OP1_MASK 0x7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define SYSREG_OP1(sysreg) ((sysreg >> SYSREG_OP1_SHIFT) & SYSREG_OP1_MASK)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define SYSREG_CRN_SHIFT 10
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define SYSREG_CRN_MASK 0xf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define SYSREG_CRN(sysreg) ((sysreg >> SYSREG_CRN_SHIFT) & SYSREG_CRN_MASK)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define SYSREG_CRM_SHIFT 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define SYSREG_CRM_MASK 0xf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define SYSREG_CRM(sysreg) ((sysreg >> SYSREG_CRM_SHIFT) & SYSREG_CRM_MASK)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define SYSREG_OP2_SHIFT 17
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define SYSREG_OP2_MASK 0x7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define SYSREG_OP2(sysreg) ((sysreg >> SYSREG_OP2_SHIFT) & SYSREG_OP2_MASK)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define SYSREG(op0, op1, crn, crm, op2) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ((op0 << 20) | (op2 << 17) | (op1 << 14) | (crn << 10) | (crm << 1))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define SYSREG_MASK SYSREG(0x3, 0x7, 0xf, 0xf, 0x7)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ((op0 << SYSREG_OP0_SHIFT) | \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (op1 << SYSREG_OP1_SHIFT) | \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (crn << SYSREG_CRN_SHIFT) | \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (crm << SYSREG_CRM_SHIFT) | \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (op2 << SYSREG_OP2_SHIFT))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define SYSREG_MASK \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SYSREG(SYSREG_OP0_MASK, \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SYSREG_OP1_MASK, \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SYSREG_CRN_MASK, \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SYSREG_CRM_MASK, \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SYSREG_OP2_MASK)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define SYSREG_OSLAR_EL1 SYSREG(2, 0, 1, 0, 4)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define SYSREG_OSLSR_EL1 SYSREG(2, 0, 1, 1, 4)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define SYSREG_OSDLR_EL1 SYSREG(2, 0, 1, 3, 4)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -783,21 +808,21 @@ static int hvf_sysreg_read(CPUState *cpu, uint32_t reg, uint32_t rt)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cpu_synchronize_state(cpu);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- trace_hvf_unhandled_sysreg_read(env->pc, reg,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (reg >> 20) & 0x3,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (reg >> 14) & 0x7,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (reg >> 10) & 0xf,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (reg >> 1) & 0xf,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (reg >> 17) & 0x7);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SYSREG_OP0(reg),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SYSREG_OP1(reg),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SYSREG_CRN(reg),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SYSREG_CRM(reg),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SYSREG_OP2(reg));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- hvf_raise_exception(cpu, EXCP_UDEF, syn_uncategorized());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- trace_hvf_sysreg_read(reg,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (reg >> 20) & 0x3,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (reg >> 14) & 0x7,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (reg >> 10) & 0xf,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (reg >> 1) & 0xf,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (reg >> 17) & 0x7,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SYSREG_OP0(reg),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SYSREG_OP1(reg),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SYSREG_CRN(reg),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SYSREG_CRM(reg),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SYSREG_OP2(reg),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- val);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- hvf_set_reg(cpu, rt, val);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -886,11 +911,11 @@ static int hvf_sysreg_write(CPUState *cpu, uint32_t reg, uint64_t val)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPUARMState *env = &arm_cpu->env;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- trace_hvf_sysreg_write(reg,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (reg >> 20) & 0x3,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (reg >> 14) & 0x7,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (reg >> 10) & 0xf,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (reg >> 1) & 0xf,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (reg >> 17) & 0x7,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SYSREG_OP0(reg),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SYSREG_OP1(reg),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SYSREG_CRN(reg),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SYSREG_CRM(reg),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SYSREG_OP2(reg),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- val);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- switch (reg) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -960,11 +985,11 @@ static int hvf_sysreg_write(CPUState *cpu, uint32_t reg, uint64_t val)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cpu_synchronize_state(cpu);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- trace_hvf_unhandled_sysreg_write(env->pc, reg,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (reg >> 20) & 0x3,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (reg >> 14) & 0x7,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (reg >> 10) & 0xf,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (reg >> 1) & 0xf,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (reg >> 17) & 0x7);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SYSREG_OP0(reg),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SYSREG_OP1(reg),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SYSREG_CRN(reg),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SYSREG_CRM(reg),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SYSREG_OP2(reg));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- hvf_raise_exception(cpu, EXCP_UDEF, syn_uncategorized());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/qemu/files/patch-qemu-include-qemu-osdep.diff b/emulators/qemu/files/patch-qemu-include-qemu-madvise_h.diff
</span>similarity index 64%
rename from emulators/qemu/files/patch-qemu-include-qemu-osdep.diff
rename to emulators/qemu/files/patch-qemu-include-qemu-madvise_h.diff
<span style='display:block; white-space:pre;color:#808080;'>index c81cb4f43bd..9e89f04023c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/qemu/files/patch-qemu-include-qemu-osdep.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/qemu/files/patch-qemu-include-qemu-madvise_h.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- include/qemu/osdep.h.orig 2021-11-28 17:26:47.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/qemu/osdep.h 2021-11-28 17:27:26.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -430,7 +430,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- include/qemu/madvise.h.orig 2022-04-21 16:24:08.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ include/qemu/madvise.h 2022-04-21 16:24:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -13,7 +13,11 @@
</span> #if defined(CONFIG_MADVISE)
#define QEMU_MADV_WILLNEED MADV_WILLNEED
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/qemu/files/patch-qemu-scripts-entitlements.diff b/emulators/qemu/files/patch-qemu-scripts-entitlements.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index dfb9eb64f51..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/qemu/files/patch-qemu-scripts-entitlements.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- scripts/entitlement.sh.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ scripts/entitlement.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15,7 +15,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if $in_place; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- trap 'rm "$DST.tmp"' exit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cp -af "$SRC" "$DST.tmp"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cp -pPf "$SRC" "$DST.tmp"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SRC="$DST.tmp"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cd "$MESON_INSTALL_DESTDIR_PREFIX"
</span></pre><pre style='margin:0'>
</pre>