As now it's also expressing user-mode targets. This changes the type name exposed by query-qmp-schema; enum values and serialized target values remain unchanged.
Signed-off-by: Yonggang Luo <[email protected]> --- backends/igvm.c | 4 +-- hw/core/machine-qmp-cmds.c | 2 +- hw/misc/vmlaunchupdate.c | 6 ++-- hw/uefi/ovmf-log.c | 4 +-- hw/virtio/virtio-mem.c | 14 ++++---- include/qemu/base-arch-defs.h | 62 ++++++++++++++++----------------- include/qemu/target-info-def.h | 2 +- include/qemu/target-info-qapi.h | 4 +-- qapi/machine.json | 8 ++--- qapi/pragma.json | 4 +-- target-info-def.c | 2 +- target-info.c | 26 +++++++------- 12 files changed, 69 insertions(+), 69 deletions(-) diff --git a/backends/igvm.c b/backends/igvm.c index 58f3097e851..f4045bb8651 100644 --- a/backends/igvm.c +++ b/backends/igvm.c @@ -535,7 +535,7 @@ static int qigvm_directive_vp_context(QIgvm *ctx, const uint8_t *header_data, vp_context->gpa, data, igvm_get_buffer_size(ctx->cfg->file, data_handle), CGS_PAGE_TYPE_VMSA, vp_context->vp_index, errp); - } else if (target_arch() == SYS_EMU_TARGET_X86_64) { + } else if (target_arch() == EMU_TARGET_X86_64) { result = qigvm_x86_set_vp_context(data, vp_context->vp_index, errp); } else { error_setg( @@ -647,7 +647,7 @@ static int qigvm_directive_memory_map(QIgvm *ctx, const uint8_t *header_data, if (ctx->machine_state->cgs && ctx->cgsc->get_mem_map_entry) { get_mem_map_entry = ctx->cgsc->get_mem_map_entry; - } else if (target_arch() == SYS_EMU_TARGET_X86_64) { + } else if (target_arch() == EMU_TARGET_X86_64) { get_mem_map_entry = qigvm_x86_get_mem_map_entry; } else { diff --git a/hw/core/machine-qmp-cmds.c b/hw/core/machine-qmp-cmds.c index 9c08b17510a..bc614a75c7d 100644 --- a/hw/core/machine-qmp-cmds.c +++ b/hw/core/machine-qmp-cmds.c @@ -64,7 +64,7 @@ CpuInfoFastList *qmp_query_cpus_fast(Error **errp) MachineState *ms = MACHINE(qdev_get_machine()); MachineClass *mc = MACHINE_GET_CLASS(ms); CpuInfoFastList *head = NULL, **tail = &head; - SysEmuTarget target = target_arch(); + EmuTarget target = target_arch(); CPUState *cpu; CPU_FOREACH(cpu) { diff --git a/hw/misc/vmlaunchupdate.c b/hw/misc/vmlaunchupdate.c index 847d2d963f1..95cb2263828 100644 --- a/hw/misc/vmlaunchupdate.c +++ b/hw/misc/vmlaunchupdate.c @@ -35,7 +35,7 @@ static VMLaunchUpdateState *vm_launchupdate_find(void) static bool vmlaunchupdate_supported(void) { - return target_arch() == SYS_EMU_TARGET_X86_64; + return target_arch() == EMU_TARGET_X86_64; } static void init_vm_launch_update(VMLaunchUpdateState *s) @@ -192,7 +192,7 @@ static void launch_update_write(void *dev, off_t offset, size_t len) /* process guest provided IGVM image */ if (s->launch_update.control & VM_LAUNCHUPDATE_FORMAT_IGVM) { - if (target_arch() == SYS_EMU_TARGET_X86_64) { + if (target_arch() == EMU_TARGET_X86_64) { addr = le64_to_cpu(s->launch_update.fw_image_addr); size = le64_to_cpu(s->launch_update.fw_image_size); rc = process_x86_igvm(s, addr, size); @@ -229,7 +229,7 @@ static void vmlaunch_reset_enter(Object *obj, ResetType type) { VMLaunchUpdateState *s = VMLAUNCHUPDATE(obj); - if (target_arch() != SYS_EMU_TARGET_X86_64) { + if (target_arch() != EMU_TARGET_X86_64) { return; } diff --git a/hw/uefi/ovmf-log.c b/hw/uefi/ovmf-log.c index c4e6a506410..2d8961b80ec 100644 --- a/hw/uefi/ovmf-log.c +++ b/hw/uefi/ovmf-log.c @@ -114,7 +114,7 @@ static dma_addr_t find_ovmf_log(void) MachineState *ms = MACHINE(qdev_get_machine()); dma_addr_t start, end, offset; - if (target_arch() == SYS_EMU_TARGET_X86_64 && + if (target_arch() == EMU_TARGET_X86_64 && object_dynamic_cast(OBJECT(ms), TYPE_X86_MACHINE)) { X86MachineState *x86ms = X86_MACHINE(ms); @@ -133,7 +133,7 @@ static dma_addr_t find_ovmf_log(void) return find_ovmf_log_range(start, end); } - if (target_arch() == SYS_EMU_TARGET_AARCH64 && + if (target_arch() == EMU_TARGET_AARCH64 && object_dynamic_cast(OBJECT(ms), TYPE_VIRT_MACHINE)) { VirtMachineState *vms = VIRT_MACHINE(ms); diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c index 7130ed852d9..a4110d61312 100644 --- a/hw/virtio/virtio-mem.c +++ b/hw/virtio/virtio-mem.c @@ -43,8 +43,8 @@ static bool virtio_mem_has_legacy_guests(void) * legacy guests. */ switch (target_arch()) { - case SYS_EMU_TARGET_I386: - case SYS_EMU_TARGET_X86_64: + case EMU_TARGET_I386: + case EMU_TARGET_X86_64: return true; default: return false; @@ -181,12 +181,12 @@ static bool virtio_mem_has_shared_zeropage(RAMBlock *rb) static uint64_t virtio_mem_usable_extent_size(void) { switch (target_arch()) { - case SYS_EMU_TARGET_I386: - case SYS_EMU_TARGET_X86_64: - case SYS_EMU_TARGET_S390X: + case EMU_TARGET_I386: + case EMU_TARGET_X86_64: + case EMU_TARGET_S390X: return 2 * 128 * MiB; - case SYS_EMU_TARGET_AARCH64: - case SYS_EMU_TARGET_ARM: + case EMU_TARGET_AARCH64: + case EMU_TARGET_ARM: return 2 * 512 * MiB; default: g_assert_not_reached(); diff --git a/include/qemu/base-arch-defs.h b/include/qemu/base-arch-defs.h index f2e3bc54203..7ddecc3d0be 100644 --- a/include/qemu/base-arch-defs.h +++ b/include/qemu/base-arch-defs.h @@ -12,40 +12,40 @@ #define QEMU_ARCH_BIT(target) (1ULL << (target)) enum { - QEMU_ARCH_ALPHA = QEMU_ARCH_BIT(SYS_EMU_TARGET_ALPHA), - QEMU_ARCH_ARM = QEMU_ARCH_BIT(SYS_EMU_TARGET_ARM) | - QEMU_ARCH_BIT(SYS_EMU_TARGET_AARCH64), - QEMU_ARCH_I386 = QEMU_ARCH_BIT(SYS_EMU_TARGET_I386) | - QEMU_ARCH_BIT(SYS_EMU_TARGET_X86_64), - QEMU_ARCH_M68K = QEMU_ARCH_BIT(SYS_EMU_TARGET_M68K), - QEMU_ARCH_MICROBLAZE = QEMU_ARCH_BIT(SYS_EMU_TARGET_MICROBLAZE), - QEMU_ARCH_MIPS = QEMU_ARCH_BIT(SYS_EMU_TARGET_MIPS) | - QEMU_ARCH_BIT(SYS_EMU_TARGET_MIPSEL) | - QEMU_ARCH_BIT(SYS_EMU_TARGET_MIPS64) | - QEMU_ARCH_BIT(SYS_EMU_TARGET_MIPS64EL), - QEMU_ARCH_PPC = QEMU_ARCH_BIT(SYS_EMU_TARGET_PPC) | - QEMU_ARCH_BIT(SYS_EMU_TARGET_PPC64), - QEMU_ARCH_S390X = QEMU_ARCH_BIT(SYS_EMU_TARGET_S390X), - QEMU_ARCH_SH4 = QEMU_ARCH_BIT(SYS_EMU_TARGET_SH4) | - QEMU_ARCH_BIT(SYS_EMU_TARGET_SH4EB), - QEMU_ARCH_SPARC = QEMU_ARCH_BIT(SYS_EMU_TARGET_SPARC) | - QEMU_ARCH_BIT(SYS_EMU_TARGET_SPARC64), - QEMU_ARCH_XTENSA = QEMU_ARCH_BIT(SYS_EMU_TARGET_XTENSA) | - QEMU_ARCH_BIT(SYS_EMU_TARGET_XTENSAEB), - QEMU_ARCH_OR1K = QEMU_ARCH_BIT(SYS_EMU_TARGET_OR1K), - QEMU_ARCH_TRICORE = QEMU_ARCH_BIT(SYS_EMU_TARGET_TRICORE), - QEMU_ARCH_HPPA = QEMU_ARCH_BIT(SYS_EMU_TARGET_HPPA), - QEMU_ARCH_RISCV = QEMU_ARCH_BIT(SYS_EMU_TARGET_RISCV32) | - QEMU_ARCH_BIT(SYS_EMU_TARGET_RISCV64), - QEMU_ARCH_RX = QEMU_ARCH_BIT(SYS_EMU_TARGET_RX), - QEMU_ARCH_AVR = QEMU_ARCH_BIT(SYS_EMU_TARGET_AVR), - QEMU_ARCH_HEXAGON = QEMU_ARCH_BIT(SYS_EMU_TARGET_HEXAGON), - QEMU_ARCH_LOONGARCH = QEMU_ARCH_BIT(SYS_EMU_TARGET_LOONGARCH64), - QEMU_ARCH_ALL = QEMU_ARCH_BIT(SYS_EMU_TARGET__MAX) - 1, + QEMU_ARCH_ALPHA = QEMU_ARCH_BIT(EMU_TARGET_ALPHA), + QEMU_ARCH_ARM = QEMU_ARCH_BIT(EMU_TARGET_ARM) | + QEMU_ARCH_BIT(EMU_TARGET_AARCH64), + QEMU_ARCH_I386 = QEMU_ARCH_BIT(EMU_TARGET_I386) | + QEMU_ARCH_BIT(EMU_TARGET_X86_64), + QEMU_ARCH_M68K = QEMU_ARCH_BIT(EMU_TARGET_M68K), + QEMU_ARCH_MICROBLAZE = QEMU_ARCH_BIT(EMU_TARGET_MICROBLAZE), + QEMU_ARCH_MIPS = QEMU_ARCH_BIT(EMU_TARGET_MIPS) | + QEMU_ARCH_BIT(EMU_TARGET_MIPSEL) | + QEMU_ARCH_BIT(EMU_TARGET_MIPS64) | + QEMU_ARCH_BIT(EMU_TARGET_MIPS64EL), + QEMU_ARCH_PPC = QEMU_ARCH_BIT(EMU_TARGET_PPC) | + QEMU_ARCH_BIT(EMU_TARGET_PPC64), + QEMU_ARCH_S390X = QEMU_ARCH_BIT(EMU_TARGET_S390X), + QEMU_ARCH_SH4 = QEMU_ARCH_BIT(EMU_TARGET_SH4) | + QEMU_ARCH_BIT(EMU_TARGET_SH4EB), + QEMU_ARCH_SPARC = QEMU_ARCH_BIT(EMU_TARGET_SPARC) | + QEMU_ARCH_BIT(EMU_TARGET_SPARC64), + QEMU_ARCH_XTENSA = QEMU_ARCH_BIT(EMU_TARGET_XTENSA) | + QEMU_ARCH_BIT(EMU_TARGET_XTENSAEB), + QEMU_ARCH_OR1K = QEMU_ARCH_BIT(EMU_TARGET_OR1K), + QEMU_ARCH_TRICORE = QEMU_ARCH_BIT(EMU_TARGET_TRICORE), + QEMU_ARCH_HPPA = QEMU_ARCH_BIT(EMU_TARGET_HPPA), + QEMU_ARCH_RISCV = QEMU_ARCH_BIT(EMU_TARGET_RISCV32) | + QEMU_ARCH_BIT(EMU_TARGET_RISCV64), + QEMU_ARCH_RX = QEMU_ARCH_BIT(EMU_TARGET_RX), + QEMU_ARCH_AVR = QEMU_ARCH_BIT(EMU_TARGET_AVR), + QEMU_ARCH_HEXAGON = QEMU_ARCH_BIT(EMU_TARGET_HEXAGON), + QEMU_ARCH_LOONGARCH = QEMU_ARCH_BIT(EMU_TARGET_LOONGARCH64), + QEMU_ARCH_ALL = QEMU_ARCH_BIT(EMU_TARGET__MAX) - 1, }; /* Keep target-specific masks within qemu_opt_set_number()'s int64_t range. */ -QEMU_BUILD_BUG_ON(SYS_EMU_TARGET__MAX > 63); +QEMU_BUILD_BUG_ON(EMU_TARGET__MAX > 63); /** * qemu_arch_available: diff --git a/include/qemu/target-info-def.h b/include/qemu/target-info-def.h index 8019d2c7196..479f7ddd39c 100644 --- a/include/qemu/target-info-def.h +++ b/include/qemu/target-info-def.h @@ -16,7 +16,7 @@ typedef struct TargetInfo { /* runtime equivalent of TARGET_NAME definition */ const char *target_name; /* related to TARGET_ARCH definition */ - SysEmuTarget target_arch; + EmuTarget target_arch; /* runtime equivalent of TARGET_LONG_BITS definition */ unsigned long_bits; /* runtime equivalent of CPU_RESOLVING_TYPE definition */ diff --git a/include/qemu/target-info-qapi.h b/include/qemu/target-info-qapi.h index d5ce0523238..42a78ee38bc 100644 --- a/include/qemu/target-info-qapi.h +++ b/include/qemu/target-info-qapi.h @@ -15,9 +15,9 @@ /** * target_arch: * - * Returns: QAPI SysEmuTarget enum (e.g. SYS_EMU_TARGET_X86_64). + * Returns: QAPI EmuTarget enum (e.g. EMU_TARGET_X86_64). */ -SysEmuTarget target_arch(void); +EmuTarget target_arch(void); /** * target_endian_mode: diff --git a/qapi/machine.json b/qapi/machine.json index 9b145c635ba..07fac4f0764 100644 --- a/qapi/machine.json +++ b/qapi/machine.json @@ -14,7 +14,7 @@ { 'include': 'machine-common.json' } ## -# @SysEmuTarget: +# @EmuTarget: # The comprehensive enumeration of QEMU system emulation # ("softmmu") targets. Run "./configure --help" in the project # root directory, and look for the \*-softmmu targets near the @@ -35,7 +35,7 @@ # # Since: 3.0 ## -{ 'enum' : 'SysEmuTarget', +{ 'enum' : 'EmuTarget', 'data' : [ 'aarch64', 'alpha', 'arm', 'avr', 'hexagon', 'hppa', 'i386', 'loongarch64', 'm68k', 'microblaze', 'mips', 'mips64', 'mips64el', 'mipsel', 'or1k', 'ppc', @@ -95,7 +95,7 @@ 'qom-path' : 'str', 'thread-id' : 'int', '*props' : 'CpuInstanceProperties', - 'target' : 'SysEmuTarget' }, + 'target' : 'EmuTarget' }, 'discriminator' : 'target', 'data' : { 's390x' : 'CpuInfoS390' } } @@ -281,7 +281,7 @@ # Since: 1.2 ## { 'struct': 'QemuTargetInfo', - 'data': { 'arch': 'SysEmuTarget' } } + 'data': { 'arch': 'EmuTarget' } } ## # @query-target: diff --git a/qapi/pragma.json b/qapi/pragma.json index 342cedc42e7..93a710ee937 100644 --- a/qapi/pragma.json +++ b/qapi/pragma.json @@ -72,7 +72,7 @@ 'SsidSizeMode', 'String', 'StringWrapper', - 'SysEmuTarget', + 'EmuTarget', 'ThrottleGroupProperties', 'VncPrimaryAuth', 'VncVencryptSubAuth', @@ -109,7 +109,7 @@ 'QKeyCode', # send-key, input-sent-event 'QapiErrorClass', # QMP error replies 'SshHostKeyCheckMode', # blockdev-add, -blockdev - 'SysEmuTarget', # query-cpu-fast, query-target + 'EmuTarget', # query-cpu-fast, query-target 'UuidInfo', # query-uuid 'VncClientInfo', # query-vnc, query-vnc-servers, ... 'X86CPURegister32' # qom-get of x86 CPU properties diff --git a/target-info-def.c b/target-info-def.c index bcf9cfe1e43..028816f4cf1 100644 --- a/target-info-def.c +++ b/target-info-def.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_VARIANT), + .target_arch = glue(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, diff --git a/target-info.c b/target-info.c index 6b365113955..241be2b5563 100644 --- a/target-info.c +++ b/target-info.c @@ -22,7 +22,7 @@ unsigned target_long_bits(void) return target_info()->long_bits; } -SysEmuTarget target_arch(void) +EmuTarget target_arch(void) { return target_info()->target_arch; } @@ -45,8 +45,8 @@ bool target_big_endian(void) bool target_base_arm(void) { switch (target_arch()) { - case SYS_EMU_TARGET_ARM: - case SYS_EMU_TARGET_AARCH64: + case EMU_TARGET_ARM: + case EMU_TARGET_AARCH64: return true; default: return false; @@ -55,29 +55,29 @@ bool target_base_arm(void) bool target_arm(void) { - return target_arch() == SYS_EMU_TARGET_ARM; + return target_arch() == EMU_TARGET_ARM; } bool target_aarch64(void) { - return target_arch() == SYS_EMU_TARGET_AARCH64; + return target_arch() == EMU_TARGET_AARCH64; } bool target_m68k(void) { - return target_arch() == SYS_EMU_TARGET_M68K; + return target_arch() == EMU_TARGET_M68K; } bool target_or1k(void) { - return target_arch() == SYS_EMU_TARGET_OR1K; + return target_arch() == EMU_TARGET_OR1K; } bool target_base_ppc(void) { switch (target_arch()) { - case SYS_EMU_TARGET_PPC: - case SYS_EMU_TARGET_PPC64: + case EMU_TARGET_PPC: + case EMU_TARGET_PPC64: return true; default: return false; @@ -86,20 +86,20 @@ bool target_base_ppc(void) bool target_ppc(void) { - return target_arch() == SYS_EMU_TARGET_PPC; + return target_arch() == EMU_TARGET_PPC; } bool target_ppc64(void) { - return target_arch() == SYS_EMU_TARGET_PPC64; + return target_arch() == EMU_TARGET_PPC64; } bool target_s390x(void) { - return target_arch() == SYS_EMU_TARGET_S390X; + return target_arch() == EMU_TARGET_S390X; } bool target_riscv64(void) { - return target_arch() == SYS_EMU_TARGET_RISCV64; + return target_arch() == EMU_TARGET_RISCV64; } -- 2.55.0.windows.3
