@@ -159,7 +159,6 @@ obj-y += hw/
obj-y += qapi/
obj-y += memory.o
obj-y += memory_mapping.o
-obj-y += migration/ram.o
LIBS := $(libs_softmmu) $(LIBS)
# Temporary until emulators are linked by Meson
@@ -7428,6 +7428,8 @@ fi
if test "$libpmem" = "yes" ; then
echo "CONFIG_LIBPMEM=y" >> $config_host_mak
+ echo "LIBPMEM_LIBS=$libpmem_libs" >> $config_host_mak
+ echo "LIBPMEM_CFLAGS=$libpmem_cflags" >> $config_host_mak
fi
if test "$bochs" = "yes" ; then
@@ -276,6 +276,11 @@ rdma = declare_dependency()
if 'CONFIG_RDMA' in config_host
rdma = declare_dependency(link_args: config_host['RDMA_LIBS'].split())
endif
+libpmem = declare_dependency()
+if 'CONFIG_LIBPMEM' in config_host
+ libpmem = declare_dependency(compile_args: config_host['LIBPMEM_CFLAGS'].split(),
+ link_args: config_host['LIBPMEM_LIBS'].split())
+endif
create_config = find_program('scripts/create_config')
minikconf = find_program('scripts/minikconf.py')
@@ -22,3 +22,5 @@ softmmu_ss.add(files(
softmmu_ss.add(when: ['CONFIG_RDMA', rdma], if_true: files('rdma.c'))
softmmu_ss.add(when: 'CONFIG_LIVE_BLOCK_MIGRATION', if_true: files('block.c'))
+
+specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: [files('ram.c'), libpmem])