@@ -33,7 +33,7 @@ devices-dirs-$(CONFIG_SOFTMMU) += vfio/
devices-dirs-$(CONFIG_SOFTMMU) += virtio/
devices-dirs-$(CONFIG_SOFTMMU) += watchdog/
devices-dirs-$(CONFIG_SOFTMMU) += xen/
-devices-dirs-$(CONFIG_MEM_HOTPLUG) += mem/
+devices-dirs-$(CONFIG_SOFTMMU) += mem/
devices-dirs-$(CONFIG_SOFTMMU) += smbios/
devices-dirs-y += core/
common-obj-y += $(devices-dirs-y)
@@ -1,3 +1,3 @@
common-obj-$(CONFIG_MEM_HOTPLUG) += pc-dimm.o
-common-obj-$(CONFIG_MEM_HOTPLUG) += memory-device.o
+common-obj-y += memory-device.o
common-obj-$(CONFIG_NVDIMM) += nvdimm.o
@@ -34,7 +34,6 @@ stub-obj-y += uuid.o
stub-obj-y += vm-stop.o
stub-obj-y += vmstate.o
stub-obj-$(CONFIG_WIN32) += fd-register.o
-stub-obj-y += qmp_memory_device.o
stub-obj-y += target-monitor-defs.o
stub-obj-y += target-get-monitor-def.o
stub-obj-y += pc_madt_cpu_entry.o
deleted file mode 100644
@@ -1,13 +0,0 @@
-#include "qemu/osdep.h"
-#include "qom/object.h"
-#include "hw/mem/memory-device.h"
-
-MemoryDeviceInfoList *qmp_memory_device_list(void)
-{
- return NULL;
-}
-
-uint64_t get_plugged_memory_size(void)
-{
- return (uint64_t)-1;
-}
Let's always compile support memory devices. MEM_HOTPLUG is very DIMM specific. Signed-off-by: David Hildenbrand <david@redhat.com> --- hw/Makefile.objs | 2 +- hw/mem/Makefile.objs | 2 +- stubs/Makefile.objs | 1 - stubs/qmp_memory_device.c | 13 ------------- 4 files changed, 2 insertions(+), 16 deletions(-) delete mode 100644 stubs/qmp_memory_device.c