* [PATCH] disas: Fix build against Capstone v6
@ 2024-07-15 21:39 Gustavo Romero
2024-07-15 22:53 ` Richard Henderson
2024-07-16 8:48 ` Paolo Bonzini
0 siblings, 2 replies; 4+ messages in thread
From: Gustavo Romero @ 2024-07-15 21:39 UTC (permalink / raw)
To: qemu-devel, peter.maydell; +Cc: alex.bennee, gustavo.romero
Capstone v6 made major changes, such as renaming for AArch64, which
broke programs using the old headers, like QEMU. However, Capstone v6
provides the CAPSTONE_AARCH64_COMPAT_HEADER compatibility definition
allowing to build against v6 with the old definitions, so fix the QEMU
build using it.
We can lift that definition and switch to the new naming once our
supported distros have Capstone v6 in place.
Signed-off-by: Gustavo Romero <gustavo.romero@linaro.org>
Suggested-by: Peter Maydell <peter.maydell@linaro.org>
---
include/disas/capstone.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/include/disas/capstone.h b/include/disas/capstone.h
index e29068dd97..a11985151d 100644
--- a/include/disas/capstone.h
+++ b/include/disas/capstone.h
@@ -3,6 +3,7 @@
#ifdef CONFIG_CAPSTONE
+#define CAPSTONE_AARCH64_COMPAT_HEADER
#include <capstone.h>
#else
--
2.34.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] disas: Fix build against Capstone v6
2024-07-15 21:39 [PATCH] disas: Fix build against Capstone v6 Gustavo Romero
@ 2024-07-15 22:53 ` Richard Henderson
2024-07-16 8:48 ` Paolo Bonzini
1 sibling, 0 replies; 4+ messages in thread
From: Richard Henderson @ 2024-07-15 22:53 UTC (permalink / raw)
To: Gustavo Romero, qemu-devel, peter.maydell; +Cc: alex.bennee
On 7/16/24 07:39, Gustavo Romero wrote:
> Capstone v6 made major changes, such as renaming for AArch64, which
> broke programs using the old headers, like QEMU. However, Capstone v6
> provides the CAPSTONE_AARCH64_COMPAT_HEADER compatibility definition
> allowing to build against v6 with the old definitions, so fix the QEMU
> build using it.
>
> We can lift that definition and switch to the new naming once our
> supported distros have Capstone v6 in place.
>
> Signed-off-by: Gustavo Romero <gustavo.romero@linaro.org>
> Suggested-by: Peter Maydell <peter.maydell@linaro.org>
> ---
> include/disas/capstone.h | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/include/disas/capstone.h b/include/disas/capstone.h
> index e29068dd97..a11985151d 100644
> --- a/include/disas/capstone.h
> +++ b/include/disas/capstone.h
> @@ -3,6 +3,7 @@
>
> #ifdef CONFIG_CAPSTONE
>
> +#define CAPSTONE_AARCH64_COMPAT_HEADER
> #include <capstone.h>
>
> #else
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
r~
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] disas: Fix build against Capstone v6
2024-07-15 21:39 [PATCH] disas: Fix build against Capstone v6 Gustavo Romero
2024-07-15 22:53 ` Richard Henderson
@ 2024-07-16 8:48 ` Paolo Bonzini
2024-07-16 9:38 ` Peter Maydell
1 sibling, 1 reply; 4+ messages in thread
From: Paolo Bonzini @ 2024-07-16 8:48 UTC (permalink / raw)
To: Gustavo Romero; +Cc: qemu-devel, peter.maydell, alex.bennee
Queued, thanks.
Paolo
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] disas: Fix build against Capstone v6
2024-07-16 8:48 ` Paolo Bonzini
@ 2024-07-16 9:38 ` Peter Maydell
0 siblings, 0 replies; 4+ messages in thread
From: Peter Maydell @ 2024-07-16 9:38 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: Gustavo Romero, qemu-devel, alex.bennee
On Tue, 16 Jul 2024 at 09:48, Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> Queued, thanks.
Could you add
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2438
to the commit message?
thanks
-- PMM
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-07-16 9:38 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-15 21:39 [PATCH] disas: Fix build against Capstone v6 Gustavo Romero
2024-07-15 22:53 ` Richard Henderson
2024-07-16 8:48 ` Paolo Bonzini
2024-07-16 9:38 ` Peter Maydell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).