From: Pierrick Bouvier <[email protected]> This field is now unused, so we can remove it.
Signed-off-by: Pierrick Bouvier <[email protected]> Reviewed-by: Philippe Mathieu-Daudé <[email protected]> Message-ID: <[email protected]> Signed-off-by: Philippe Mathieu-Daudé <[email protected]> --- include/qemu/target-info-impl.h | 2 -- include/qemu/target-info.h | 8 -------- configs/targets/aarch64-softmmu.c | 1 - configs/targets/arm-softmmu.c | 1 - configs/targets/riscv32-softmmu.c | 1 - configs/targets/riscv64-softmmu.c | 1 - target-info-stub.c | 1 - target-info.c | 5 ----- 8 files changed, 20 deletions(-) diff --git a/include/qemu/target-info-impl.h b/include/qemu/target-info-impl.h index c917d546eab..cf42aabbc8b 100644 --- a/include/qemu/target-info-impl.h +++ b/include/qemu/target-info-impl.h @@ -21,8 +21,6 @@ typedef struct TargetInfo { unsigned long_bits; /* runtime equivalent of CPU_RESOLVING_TYPE definition */ const char *cpu_type; - /* QOM typename machines for this binary must implement */ - const char *machine_typename; /* related to TARGET_BIG_ENDIAN definition */ EndianMode endianness; /* diff --git a/include/qemu/target-info.h b/include/qemu/target-info.h index 6c5b714288e..b23e5bc5865 100644 --- a/include/qemu/target-info.h +++ b/include/qemu/target-info.h @@ -23,14 +23,6 @@ const char *target_name(void); */ unsigned target_long_bits(void); -/** - * target_machine_typename: - * - * Returns: Name of the QOM interface implemented by machines - * usable on this target binary. - */ -const char *target_machine_typename(void); - /** * target_cpu_type: * diff --git a/configs/targets/aarch64-softmmu.c b/configs/targets/aarch64-softmmu.c index 75d95b0e743..2200a4f19e9 100644 --- a/configs/targets/aarch64-softmmu.c +++ b/configs/targets/aarch64-softmmu.c @@ -18,7 +18,6 @@ static const TargetInfo target_info_aarch64_system = { .target_arch = SYS_EMU_TARGET_AARCH64, .long_bits = 64, .cpu_type = TYPE_ARM_CPU, - .machine_typename = TYPE_TARGET_AARCH64_MACHINE, .endianness = ENDIAN_MODE_LITTLE, .page_bits_vary = true, .page_bits_init = TARGET_PAGE_BITS_LEGACY, diff --git a/configs/targets/arm-softmmu.c b/configs/targets/arm-softmmu.c index 73546fa5737..9d558a0c1a1 100644 --- a/configs/targets/arm-softmmu.c +++ b/configs/targets/arm-softmmu.c @@ -18,7 +18,6 @@ static const TargetInfo target_info_arm_system = { .target_arch = SYS_EMU_TARGET_ARM, .long_bits = 32, .cpu_type = TYPE_ARM_CPU, - .machine_typename = TYPE_TARGET_ARM_MACHINE, .endianness = ENDIAN_MODE_LITTLE, .page_bits_vary = true, .page_bits_init = TARGET_PAGE_BITS_LEGACY, diff --git a/configs/targets/riscv32-softmmu.c b/configs/targets/riscv32-softmmu.c index 752c813077e..c1d94679c7e 100644 --- a/configs/targets/riscv32-softmmu.c +++ b/configs/targets/riscv32-softmmu.c @@ -18,7 +18,6 @@ static const TargetInfo target_info_riscv32_system = { .target_arch = SYS_EMU_TARGET_RISCV32, .long_bits = 32, .cpu_type = TYPE_RISCV_CPU, - .machine_typename = TYPE_TARGET_RISCV32_MACHINE, .endianness = ENDIAN_MODE_LITTLE, .page_bits_init = TARGET_PAGE_BITS, }; diff --git a/configs/targets/riscv64-softmmu.c b/configs/targets/riscv64-softmmu.c index 5150f0fe9d9..f648a5c8944 100644 --- a/configs/targets/riscv64-softmmu.c +++ b/configs/targets/riscv64-softmmu.c @@ -18,7 +18,6 @@ static const TargetInfo target_info_riscv64_system = { .target_arch = SYS_EMU_TARGET_RISCV64, .long_bits = 64, .cpu_type = TYPE_RISCV_CPU, - .machine_typename = TYPE_TARGET_RISCV64_MACHINE, .endianness = ENDIAN_MODE_LITTLE, .page_bits_init = TARGET_PAGE_BITS, }; diff --git a/target-info-stub.c b/target-info-stub.c index 22b7911201c..d121b8c0170 100644 --- a/target-info-stub.c +++ b/target-info-stub.c @@ -29,7 +29,6 @@ static const TargetInfo target_info_stub = { .target_arch = glue(SYS_EMU_TARGET_, TARGET_ARCH), .long_bits = TARGET_LONG_BITS, .cpu_type = CPU_RESOLVING_TYPE, - .machine_typename = TYPE_MACHINE, .endianness = TARGET_BIG_ENDIAN ? ENDIAN_MODE_BIG : ENDIAN_MODE_LITTLE, #ifdef TARGET_PAGE_BITS_VARY .page_bits_vary = true, diff --git a/target-info.c b/target-info.c index 04c69c41f8a..012b384036d 100644 --- a/target-info.c +++ b/target-info.c @@ -32,11 +32,6 @@ const char *target_cpu_type(void) return target_info()->cpu_type; } -const char *target_machine_typename(void) -{ - return target_info()->machine_typename; -} - EndianMode target_endian_mode(void) { return target_info()->endianness; -- 2.53.0
