Allows us to drop CONFIG_NO_GET_MEMORY_MAPPING with its indirect dependency on CONFIG_HAVE_GET_MEMORY_MAPPING in Makefile.target.
Signed-off-by: Andreas Färber <[email protected]> --- Makefile.target | 2 -- stubs/Makefile.objs | 1 + memory_mapping-stub.c => stubs/memory_mapping.c | 5 +++-- 3 files changed, 4 insertions(+), 4 deletions(-) rename memory_mapping-stub.c => stubs/memory_mapping.c (85%) diff --git a/Makefile.target b/Makefile.target index 5b02200..efc0b11 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 @@ -112,7 +111,6 @@ 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 += dump.o memory_mapping_common.o -obj-$(CONFIG_NO_GET_MEMORY_MAPPING) += memory_mapping-stub.o LIBS+=$(libs_softmmu) # xen support diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs index 9b701b4..b0bca4d 100644 --- a/stubs/Makefile.objs +++ b/stubs/Makefile.objs @@ -10,6 +10,7 @@ stub-obj-y += fdset-remove-fd.o stub-obj-y += get-fd.o stub-obj-y += get-vm-name.o stub-obj-y += iothread-lock.o +stub-obj-y += memory_mapping.o stub-obj-y += migr-blocker.o stub-obj-y += mon-is-qmp.o stub-obj-y += mon-printf.o diff --git a/memory_mapping-stub.c b/stubs/memory_mapping.c similarity index 85% rename from memory_mapping-stub.c rename to stubs/memory_mapping.c index c48ea44..4db2108 100644 --- a/memory_mapping-stub.c +++ b/stubs/memory_mapping.c @@ -11,8 +11,9 @@ * */ -#include "cpu.h" -#include "exec/cpu-all.h" +#include "qemu-common.h" +#include "exec/cpu-common.h" +#include "qom/cpu.h" #include "sysemu/memory_mapping.h" int qemu_get_guest_memory_mapping(MemoryMappingList *list) -- 1.8.1.4
