Commit 9518b0a85a for qemu.org

commit 9518b0a85adf5d496eb5036c545941d2527f2f78
Author: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>
Date:   Wed Oct 7 18:46:11 2026 +0000

    target-info: use TARGET_ARCH_VARIANT

    target_arch() will now return the full variant, per SYS_EMU_TARGET enum.

    Reported-by: Daniel P. Berrangé <berrange@redhat.com>
    Reviewed-by: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com>
    Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
    Suggested-by: Yonggang Luo <luoyonggang@gmail.com>
    Fixes: e934c624f3 ("target-info: Statically initialize target_arch")
    Resolves: https://gitlab.com/qemu-project/qemu/-/work_items/4640
    Link: https://lore.kernel.org/qemu-devel/20261007184612.24073-3-pierrick.bouvier@oss.qualcomm.com
    Signed-off-by: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>

diff --git a/target-info-stub.c b/target-info-stub.c
index d121b8c017..b0079d44dc 100644
--- a/target-info-stub.c
+++ b/target-info-stub.c
@@ -26,7 +26,7 @@ QEMU_BUILD_BUG_ON(TARGET_PAGE_BITS < TARGET_PAGE_BITS_MIN);

 static const TargetInfo target_info_stub = {
     .target_name = TARGET_NAME,
-    .target_arch = glue(SYS_EMU_TARGET_, TARGET_ARCH),
+    .target_arch = glue(SYS_EMU_TARGET_, TARGET_ARCH_VARIANT),
     .long_bits = TARGET_LONG_BITS,
     .cpu_type = CPU_RESOLVING_TYPE,
     .endianness = TARGET_BIG_ENDIAN ? ENDIAN_MODE_BIG : ENDIAN_MODE_LITTLE,