diff options
author | Andreas Färber <afaerber@suse.de> | 2013-05-17 10:41:20 +0200 |
---|---|---|
committer | Andreas Färber <afaerber@suse.de> | 2013-06-10 23:33:18 +0200 |
commit | 88f62c2b1deb466749e340a8a241975c509bd9b6 (patch) | |
tree | 020834ae7596647924045c7f18ffd49039da7c8b | |
parent | bd5c51ee6c4f1c79cae5ad2516d711a27b4ea8ec (diff) |
dump: Move stubs into libqemustub.a
This allows us to drop CONFIG_NO_CORE_DUMP with its indirect dependency
on CONFIG_HAVE_CORE_DUMP.
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
-rw-r--r-- | Makefile.target | 2 | ||||
-rw-r--r-- | stubs/Makefile.objs | 1 | ||||
-rw-r--r-- | stubs/dump.c (renamed from dump-stub.c) | 0 |
3 files changed, 1 insertions, 2 deletions
diff --git a/Makefile.target b/Makefile.target index ce4391fca7..1cafb176e3 100644 --- a/Makefile.target +++ b/Makefile.target @@ -64,7 +64,6 @@ CONFIG_NO_PCI = $(if $(subst n,,$(CONFIG_PCI)),n,y) CONFIG_NO_KVM = $(if $(subst n,,$(CONFIG_KVM)),n,y) CONFIG_NO_XEN = $(if $(subst n,,$(CONFIG_XEN)),n,y) CONFIG_NO_GET_MEMORY_MAPPING = $(if $(subst n,,$(CONFIG_HAVE_GET_MEMORY_MAPPING)),n,y) -CONFIG_NO_CORE_DUMP = $(if $(subst n,,$(CONFIG_HAVE_CORE_DUMP)),n,y) ######################################################### # cpu emulator library @@ -114,7 +113,6 @@ obj-y += memory.o savevm.o cputlb.o obj-$(CONFIG_HAVE_GET_MEMORY_MAPPING) += memory_mapping.o obj-$(CONFIG_HAVE_CORE_DUMP) += dump.o obj-$(CONFIG_NO_GET_MEMORY_MAPPING) += memory_mapping-stub.o -obj-$(CONFIG_NO_CORE_DUMP) += dump-stub.o LIBS+=$(libs_softmmu) # xen support diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs index 03dff202e4..9b701b4714 100644 --- a/stubs/Makefile.objs +++ b/stubs/Makefile.objs @@ -2,6 +2,7 @@ stub-obj-y += arch-query-cpu-def.o stub-obj-y += clock-warp.o stub-obj-y += cpu-get-clock.o stub-obj-y += cpu-get-icount.o +stub-obj-y += dump.o stub-obj-y += fdset-add-fd.o stub-obj-y += fdset-find-fd.o stub-obj-y += fdset-get-fd.o diff --git a/dump-stub.c b/stubs/dump.c index b3f42cb2f1..b3f42cb2f1 100644 --- a/dump-stub.c +++ b/stubs/dump.c |