Commit dad35d0937 for qemu.org
commit dad35d0937ff84eff7be8ed63bebb14443564ace
Author: Eric Farman <farman@linux.ibm.com>
Date: Mon Aug 24 16:30:33 2026 +0200
disas: Replace straggling CS_ARCH_SYSZ
When updating to capstone v6, the define CS_ARCH_SYSZ was replaced
with CS_ARCH_SYSTEMZ, except here. On systems without capstone-devel
installed, this causes a compile error:
../disas/disas-host.c: In function ‘initialize_debug_host’:
../disas/disas-host.c:78:24: error: ‘CS_ARCH_SYSZ’ undeclared (first use in this function); did you mean ‘CS_ARCH_SH’?
78 | s->info.cap_arch = CS_ARCH_SYSZ;
| ^~~~~~~~~~~~
| CS_ARCH_SH
../disas/disas-host.c:78:24: note: each undeclared identifier is reported only once for each function it appears in
Rather than making capstone required, replace the constant
with the same one used elsewhere after that change.
Fixes: c8220a096f ("target/s390x: Update capstone disassembly to v6")
Signed-off-by: Eric Farman <farman@linux.ibm.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com>
Reviewed-by: Matthew Rosato <mjrosato@linux.ibm.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-ID: <20260824143033.306201-1-farman@linux.ibm.com>
diff --git a/disas/disas-host.c b/disas/disas-host.c
index d41235250a..799f5e86c4 100644
--- a/disas/disas-host.c
+++ b/disas/disas-host.c
@@ -75,7 +75,7 @@ static void initialize_debug_host(CPUDebug *s)
#elif defined(__m68k__)
s->info.print_insn = print_insn_m68k;
#elif defined(__s390x__)
- s->info.cap_arch = CS_ARCH_SYSZ;
+ s->info.cap_arch = CS_ARCH_SYSTEMZ;
s->info.cap_insn_unit = 2;
s->info.cap_insn_split = 6;
#elif defined(__hppa__)