diff options
| author | Andreas Färber | 2013-05-28 14:53:32 +0200 |
|---|---|---|
| committer | Andreas Färber | 2013-06-11 18:10:44 +0200 |
| commit | c22d8e0448aecb48a91f3936419ad1b63fbb4a6a (patch) | |
| tree | 43e42f72bd6cf2195193fc92f4010cb3bf1a71c3 | |
| parent | cpu: Turn cpu_get_memory_mapping() into a CPUState hook (diff) | |
| download | qemu-c22d8e0448aecb48a91f3936419ad1b63fbb4a6a.tar.gz qemu-c22d8e0448aecb48a91f3936419ad1b63fbb4a6a.tar.xz qemu-c22d8e0448aecb48a91f3936419ad1b63fbb4a6a.zip | |
memory_mapping: Drop qemu_get_memory_mapping() stub
dump.c:dump_init() never checked for the return code anyway.
If paging is not enabled, it will fall back to an identity map.
If paging is enabled and getting memory mapping list is not
implemented, qemu_get_guest_memory_mapping() will return an error.
Since the targets not implementing memory mapping also don't implement
dump support, we will not reach this code today and can worry about
changing cpu_paging_enabled() default when the need arises.
This allows us to drop CONFIG_HAVE_GET_MEMORY_SUPPORT.
Signed-off-by: Andreas Färber <afaerber@suse.de>
| -rw-r--r-- | Makefile.target | 4 | ||||
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | memory_mapping-stub.c | 21 |
3 files changed, 1 insertions, 28 deletions
diff --git a/Makefile.target b/Makefile.target index 1cafb176e3..f9e1d89365 100644 --- a/Makefile.target +++ b/Makefile.target @@ -63,7 +63,6 @@ all: $(PROGS) stap 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) ######################################################### # cpu emulator library @@ -110,9 +109,8 @@ obj-y += hw/ 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-y += memory_mapping.o obj-$(CONFIG_HAVE_CORE_DUMP) += dump.o -obj-$(CONFIG_NO_GET_MEMORY_MAPPING) += memory_mapping-stub.o LIBS+=$(libs_softmmu) # xen support @@ -4298,10 +4298,6 @@ case "$target_arch2" in fi fi esac -case "$target_arch2" in - i386|x86_64) - echo "CONFIG_HAVE_GET_MEMORY_MAPPING=y" >> $config_target_mak -esac if test "$target_bigendian" = "yes" ; then echo "TARGET_WORDS_BIGENDIAN=y" >> $config_target_mak fi diff --git a/memory_mapping-stub.c b/memory_mapping-stub.c deleted file mode 100644 index 989dc00f8b..0000000000 --- a/memory_mapping-stub.c +++ /dev/null @@ -1,21 +0,0 @@ -/* - * QEMU memory mapping - * - * Copyright Fujitsu, Corp. 2011, 2012 - * - * Authors: - * Wen Congyang <wency@cn.fujitsu.com> - * - * This work is licensed under the terms of the GNU GPL, version 2 or later. - * See the COPYING file in the top-level directory. - * - */ - -#include "cpu.h" -#include "exec/cpu-all.h" -#include "sysemu/memory_mapping.h" - -int qemu_get_guest_memory_mapping(MemoryMappingList *list) -{ - return -2; -} |