From 2a78636bd204e389068d203473ec76558083b44b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Fri, 17 May 2013 11:54:40 +0200 Subject: [PATCH] dump: Drop qmp_dump_guest_memory() stub and build for all targets MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit qmp_dump_guest_memory() calls dump_init() and returns an Error when cpu_get_dump_info() returns an error, as done by the stub. So there is no need to have a stub for qmp_dump_guest_memory(). Enable the documentation of the always-present dump-guest-memory command. That way we can drop CONFIG_HAVE_CORE_DUMP and leave configure completely out of the picture for target CPU features. Signed-off-by: Andreas Färber --- Makefile.target | 2 +- configure | 4 ---- hmp-commands.hx | 2 -- stubs/dump.c | 8 -------- 4 files changed, 1 insertion(+), 15 deletions(-) diff --git a/Makefile.target b/Makefile.target index f9e1d89365..b0be124d29 100644 --- a/Makefile.target +++ b/Makefile.target @@ -110,7 +110,7 @@ obj-$(CONFIG_FDT) += device_tree.o obj-$(CONFIG_KVM) += kvm-all.o obj-y += memory.o savevm.o cputlb.o obj-y += memory_mapping.o -obj-$(CONFIG_HAVE_CORE_DUMP) += dump.o +obj-y += dump.o LIBS+=$(libs_softmmu) # xen support diff --git a/configure b/configure index 64017628c4..c61d8620da 100755 --- a/configure +++ b/configure @@ -4303,10 +4303,6 @@ if test "$target_bigendian" = "yes" ; then fi if test "$target_softmmu" = "yes" ; then echo "CONFIG_SOFTMMU=y" >> $config_target_mak - case "$target_arch2" in - i386|x86_64) - echo "CONFIG_HAVE_CORE_DUMP=y" >> $config_target_mak - esac fi if test "$target_user_only" = "yes" ; then echo "CONFIG_USER_ONLY=y" >> $config_target_mak diff --git a/hmp-commands.hx b/hmp-commands.hx index 396691a5d6..915b0d16fa 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -991,7 +991,6 @@ server will ask the spice/vnc client to automatically reconnect using the new parameters (if specified) once the vm migration finished successfully. ETEXI -#if defined(CONFIG_HAVE_CORE_DUMP) { .name = "dump-guest-memory", .args_type = "paging:-p,filename:F,begin:i?,length:i?", @@ -1015,7 +1014,6 @@ gdb. length: the memory size, in bytes. It's optional, and should be specified with begin together. ETEXI -#endif { .name = "snapshot_blkdev", diff --git a/stubs/dump.c b/stubs/dump.c index b3f42cb2f1..43c9a3fa02 100644 --- a/stubs/dump.c +++ b/stubs/dump.c @@ -16,14 +16,6 @@ #include "qapi/qmp/qerror.h" #include "qmp-commands.h" -/* we need this function in hmp.c */ -void qmp_dump_guest_memory(bool paging, const char *file, bool has_begin, - int64_t begin, bool has_length, int64_t length, - Error **errp) -{ - error_set(errp, QERR_UNSUPPORTED); -} - int cpu_get_dump_info(ArchDumpInfo *info) { return -1;