[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 057/132] meson: build softmmu-specific migration/ram.c
From: |
Paolo Bonzini |
Subject: |
[PATCH 057/132] meson: build softmmu-specific migration/ram.c |
Date: |
Thu, 12 Dec 2019 13:51:41 +0100 |
From: Marc-André Lureau <address@hidden>
Signed-off-by: Marc-André Lureau <address@hidden>
---
Makefile.target | 1 -
configure | 2 ++
meson.build | 5 +++++
migration/meson.build | 2 ++
4 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/Makefile.target b/Makefile.target
index 8628e25..cc0c038 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -157,7 +157,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
diff --git a/configure b/configure
index 8e55f3a..fc57ec5 100755
--- a/configure
+++ b/configure
@@ -7250,6 +7250,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
diff --git a/meson.build b/meson.build
index 74837ff..2961c44 100644
--- a/meson.build
+++ b/meson.build
@@ -277,6 +277,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')
diff --git a/migration/meson.build b/migration/meson.build
index ee5a713..1231e43 100644
--- a/migration/meson.build
+++ b/migration/meson.build
@@ -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])
--
1.8.3.1
- [PATCH 047/132] meson: convert audio directory to Meson, (continued)
- [PATCH 047/132] meson: convert audio directory to Meson, Paolo Bonzini, 2019/12/12
- [PATCH 049/132] meson: convert root directory to Meson, Paolo Bonzini, 2019/12/12
- [PATCH 048/132] meson: convert ui directory to Meson, Paolo Bonzini, 2019/12/12
- [PATCH 051/132] meson: convert qom/, Paolo Bonzini, 2019/12/12
- [PATCH 050/132] meson: convert trace/, Paolo Bonzini, 2019/12/12
- [PATCH 052/132] meson: convert block/, Paolo Bonzini, 2019/12/12
- [PATCH 053/132] meson: convert dump/, Paolo Bonzini, 2019/12/12
- [PATCH 054/132] meson: convert monitor directory to Meson, Paolo Bonzini, 2019/12/12
- [PATCH 055/132] meson: convert replay directory to Meson, Paolo Bonzini, 2019/12/12
- [PATCH 056/132] meson: convert migration directory to Meson, Paolo Bonzini, 2019/12/12
- [PATCH 057/132] meson: build softmmu-specific migration/ram.c,
Paolo Bonzini <=
- [PATCH 059/132] meson: convert backends directory to Meson, Paolo Bonzini, 2019/12/12
- [PATCH 058/132] meson: convert net directory to Meson, Paolo Bonzini, 2019/12/12
- [PATCH 060/132] meson: convert fsdev/, Paolo Bonzini, 2019/12/12
- [PATCH 061/132] meson: convert disas directory to Meson, Paolo Bonzini, 2019/12/12
- [PATCH 063/132] meson: convert hw/xen, Paolo Bonzini, 2019/12/12
- [PATCH 062/132] meson: convert qapi-specific to meson, Paolo Bonzini, 2019/12/12
- [PATCH 064/132] meson: convert hw/core, Paolo Bonzini, 2019/12/12
- [PATCH 065/132] meson: convert hw/semihosting, Paolo Bonzini, 2019/12/12
- [PATCH 066/132] meson: convert hw/smbios, Paolo Bonzini, 2019/12/12
- [PATCH 068/132] meson: convert hw/watchdog, Paolo Bonzini, 2019/12/12