Now that both cpu and the dump implementation use the dump ops interface, we can remove cpu_get_dump_info, including its stub.
Signed-off-by: Pierrick Bouvier <[email protected]> --- include/system/dump-arch.h | 2 -- stubs/dump.c | 6 ------ stubs/meson.build | 2 +- target/arm/arch_dump.c | 10 ---------- target/i386/arch_dump.c | 10 ---------- target/loongarch/arch_dump.c | 6 ------ target/ppc/arch_dump.c | 10 ---------- target/riscv/arch_dump.c | 10 ---------- target/s390x/arch_dump.c | 6 ------ 9 files changed, 1 insertion(+), 61 deletions(-) diff --git a/include/system/dump-arch.h b/include/system/dump-arch.h index 743916e46ca..7cde5e27ce8 100644 --- a/include/system/dump-arch.h +++ b/include/system/dump-arch.h @@ -28,8 +28,6 @@ typedef struct ArchDumpInfo { } ArchDumpInfo; struct GuestPhysBlockList; /* memory_mapping.h */ -int cpu_get_dump_info(ArchDumpInfo *info, - const struct GuestPhysBlockList *guest_phys_blocks); ssize_t cpu_get_note_size(int class, int machine, int nr_cpus); #endif diff --git a/stubs/dump.c b/stubs/dump.c index df7897b72b1..2ce3c5e274d 100644 --- a/stubs/dump.c +++ b/stubs/dump.c @@ -14,12 +14,6 @@ #include "qemu/osdep.h" #include "system/dump-arch.h" -int cpu_get_dump_info(ArchDumpInfo *info, - const struct GuestPhysBlockList *guest_phys_blocks) -{ - return -1; -} - ssize_t cpu_get_note_size(int class, int machine, int nr_cpus) { return -1; diff --git a/stubs/meson.build b/stubs/meson.build index 29b6644b254..94b83188667 100644 --- a/stubs/meson.build +++ b/stubs/meson.build @@ -71,12 +71,12 @@ if have_system # adding more of these. If the symbol is used in specific_ss, # in particular, consider defining a preprocessor macro via # Kconfig or configs/targets/. - stub_ss.add(files('dump.c')) stub_ss.add(files('cmos.c')) stub_ss.add(files('fw_cfg.c')) if igvm.found() stub_ss.add(files('igvm.c')) endif + stub_ss.add(files('dump.c')) stub_ss.add(files('kvm.c')) stub_ss.add(files('win32-kbd-hook.c')) stub_ss.add(files('xen-hw-stub.c')) diff --git a/target/arm/arch_dump.c b/target/arm/arch_dump.c index dcb0ccc6cc6..ac84d4ae252 100644 --- a/target/arm/arch_dump.c +++ b/target/arm/arch_dump.c @@ -437,16 +437,6 @@ const DumpCPUOps arm_dump_ops = { .get_dump_info = arm_get_dump_info, }; -int cpu_get_dump_info(ArchDumpInfo *info, - const GuestPhysBlockList *guest_phys_blocks) -{ - if (first_cpu == NULL) { - return -1; - } - - return arm_get_dump_info(first_cpu, info, guest_phys_blocks); -} - ssize_t cpu_get_note_size(int class, int machine, int nr_cpus) { ARMCPU *cpu = ARM_CPU(first_cpu); diff --git a/target/i386/arch_dump.c b/target/i386/arch_dump.c index a8e74e6b24f..301f6252b7a 100644 --- a/target/i386/arch_dump.c +++ b/target/i386/arch_dump.c @@ -435,16 +435,6 @@ const DumpCPUOps i386_dump_ops = { .get_dump_info = x86_get_dump_info, }; -int cpu_get_dump_info(ArchDumpInfo *info, - const GuestPhysBlockList *guest_phys_blocks) -{ - if (first_cpu == NULL) { - return -1; - } - - return x86_get_dump_info(first_cpu, info, guest_phys_blocks); -} - ssize_t cpu_get_note_size(int class, int machine, int nr_cpus) { int name_size = 5; /* "CORE" or "QEMU" */ diff --git a/target/loongarch/arch_dump.c b/target/loongarch/arch_dump.c index 83829a96875..6bd83b4be61 100644 --- a/target/loongarch/arch_dump.c +++ b/target/loongarch/arch_dump.c @@ -157,12 +157,6 @@ const DumpCPUOps loongarch_dump_ops = { .get_dump_info = loongarch_get_dump_info, }; -int cpu_get_dump_info(ArchDumpInfo *info, - const GuestPhysBlockList *guest_phys_blocks) -{ - return loongarch_get_dump_info(first_cpu, info, guest_phys_blocks); -} - ssize_t cpu_get_note_size(int class, int machine, int nr_cpus) { size_t note_size = 0; diff --git a/target/ppc/arch_dump.c b/target/ppc/arch_dump.c index 69613ce82a8..0b2e6542ecf 100644 --- a/target/ppc/arch_dump.c +++ b/target/ppc/arch_dump.c @@ -257,16 +257,6 @@ const DumpCPUOps ppc_dump_ops = { .get_dump_info = ppc_get_dump_info, }; -int cpu_get_dump_info(ArchDumpInfo *info, - const struct GuestPhysBlockList *guest_phys_blocks) -{ - if (first_cpu == NULL) { - return -1; - } - - return ppc_get_dump_info(first_cpu, info, guest_phys_blocks); -} - ssize_t cpu_get_note_size(int class, int machine, int nr_cpus) { int name_size = 8; /* "CORE" or "QEMU" rounded */ diff --git a/target/riscv/arch_dump.c b/target/riscv/arch_dump.c index 7086d778b8e..ed5be83cbc7 100644 --- a/target/riscv/arch_dump.c +++ b/target/riscv/arch_dump.c @@ -187,16 +187,6 @@ const DumpCPUOps riscv_dump_ops = { .get_dump_info = riscv_get_dump_info, }; -int cpu_get_dump_info(ArchDumpInfo *info, - const GuestPhysBlockList *guest_phys_blocks) -{ - if (first_cpu == NULL) { - return -1; - } - - return riscv_get_dump_info(first_cpu, info, guest_phys_blocks); -} - ssize_t cpu_get_note_size(int class, int machine, int nr_cpus) { size_t note_size; diff --git a/target/s390x/arch_dump.c b/target/s390x/arch_dump.c index 19810dcbae8..716c9606d26 100644 --- a/target/s390x/arch_dump.c +++ b/target/s390x/arch_dump.c @@ -474,12 +474,6 @@ const DumpCPUOps s390_dump_ops = { .get_dump_info = s390_get_dump_info, }; -int cpu_get_dump_info(ArchDumpInfo *info, - const struct GuestPhysBlockList *guest_phys_blocks) -{ - return s390_get_dump_info(first_cpu, info, guest_phys_blocks); -} - ssize_t cpu_get_note_size(int class, int machine, int nr_cpus) { int name_size = 8; /* "LINUX" or "CORE" + pad */ -- 2.43.0
