[PATCH] disas: Replace straggling CS_ARCH_SYSZ

[PATCH] disas: Replace straggling CS_ARCH_SYSZ

[Eric Farman]

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>
---
 disas/disas-host.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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__)
-- 
2.53.0

Re: [PATCH] disas: Replace straggling CS_ARCH_SYSZ

[Matthew Rosato]

On 8/24/26 10:30 AM, Eric Farman wrote:
> 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>

Thanks Eric, I just noticed the same compile error and this resolved it
for me.

Reviewed-by: Matthew Rosato <mjrosato@linux.ibm.com>

Re: [PATCH] disas: Replace straggling CS_ARCH_SYSZ

[Philippe Mathieu-Daudé]

On 24/8/26 16:30, Eric Farman wrote:
> 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>
> ---
>   disas/disas-host.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com>

Re: [PATCH] disas: Replace straggling CS_ARCH_SYSZ

[Richard Henderson]

On 8/24/26 07:30, Eric Farman wrote:
> 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>
> ---
>   disas/disas-host.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)

Whoops, sorry about that.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

r~

Re: [PATCH] disas: Replace straggling CS_ARCH_SYSZ

[Richard Henderson]

On 8/25/26 08:53, Richard Henderson wrote:
> On 8/24/26 07:30, Eric Farman wrote:
>> 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>
>> ---
>>   disas/disas-host.c | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> Whoops, sorry about that.
>
> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
>
> r~


Queued.


r~