[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC qom-cpu] dump: Unconditionally compile
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [RFC qom-cpu] dump: Unconditionally compile |
Date: |
Fri, 17 May 2013 12:58:05 +0200 |
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.
Signed-off-by: Andreas Färber <address@hidden>
---
Based on Ekaterina's last patch and my stub cleanup.
Next step will then be to clean up memory_mapping-stub.c.
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 84ec344..5b02200 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -111,7 +111,7 @@ obj-$(CONFIG_FDT) += device_tree.o
obj-$(CONFIG_KVM) += kvm-all.o
obj-y += memory.o savevm.o cputlb.o
obj-$(CONFIG_HAVE_GET_MEMORY_MAPPING) += memory_mapping.o
-obj-$(CONFIG_HAVE_CORE_DUMP) += dump.o memory_mapping_common.o
+obj-y += dump.o memory_mapping_common.o
obj-$(CONFIG_NO_GET_MEMORY_MAPPING) += memory_mapping-stub.o
LIBS+=$(libs_softmmu)
diff --git a/configure b/configure
index 5ae7e4a..8f987e8 100755
--- a/configure
+++ b/configure
@@ -4349,10 +4349,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 9cea415..074dbe1 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -989,7 +989,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?",
@@ -1013,7 +1012,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 b3f42cb..43c9a3f 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;
--
1.8.1.4
- [Qemu-devel] [RFC qom-cpu] dump: Unconditionally compile,
Andreas Färber <=