[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 063/142] meson: build softmmu-specific migration/ram.c
From: |
Paolo Bonzini |
Subject: |
[PATCH 063/142] meson: build softmmu-specific migration/ram.c |
Date: |
Tue, 28 Jan 2020 18:52:23 +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 d8afffbce5..3587da499e 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -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
diff --git a/configure b/configure
index 3868d60222..5f579b2ea3 100755
--- a/configure
+++ b/configure
@@ -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
diff --git a/meson.build b/meson.build
index 4472d0b311..40411f0960 100644
--- a/meson.build
+++ b/meson.build
@@ -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')
diff --git a/migration/meson.build b/migration/meson.build
index ee5a713069..1231e4389e 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])
--
2.21.0
- [PATCH 053/142] meson: convert audio directory to Meson, (continued)
- [PATCH 053/142] meson: convert audio directory to Meson, Paolo Bonzini, 2020/01/28
- [PATCH 054/142] meson: convert ui directory to Meson, Paolo Bonzini, 2020/01/28
- [PATCH 055/142] meson: convert root directory to Meson, Paolo Bonzini, 2020/01/28
- [PATCH 057/142] meson: convert qom/, Paolo Bonzini, 2020/01/28
- [PATCH 056/142] meson: convert trace/, Paolo Bonzini, 2020/01/28
- [PATCH 058/142] meson: convert block/, Paolo Bonzini, 2020/01/28
- [PATCH 059/142] meson: convert dump/, Paolo Bonzini, 2020/01/28
- [PATCH 060/142] meson: convert monitor directory to Meson, Paolo Bonzini, 2020/01/28
- [PATCH 061/142] meson: convert replay directory to Meson, Paolo Bonzini, 2020/01/28
- [PATCH 062/142] meson: convert migration directory to Meson, Paolo Bonzini, 2020/01/28
- [PATCH 063/142] meson: build softmmu-specific migration/ram.c,
Paolo Bonzini <=
- [PATCH 064/142] meson: convert net directory to Meson, Paolo Bonzini, 2020/01/28
- [PATCH 065/142] meson: convert backends directory to Meson, Paolo Bonzini, 2020/01/28
- [PATCH 067/142] meson: convert disas directory to Meson, Paolo Bonzini, 2020/01/28
- [PATCH 066/142] meson: convert fsdev/, Paolo Bonzini, 2020/01/28
- [PATCH 068/142] meson: convert qapi-specific to meson, Paolo Bonzini, 2020/01/28
- [PATCH 069/142] meson: convert hw/xen, Paolo Bonzini, 2020/01/28
- [PATCH 070/142] meson: convert hw/core, Paolo Bonzini, 2020/01/28
- [PATCH 071/142] meson: convert hw/semihosting, Paolo Bonzini, 2020/01/28
- [PATCH 072/142] meson: convert hw/nubus, Paolo Bonzini, 2020/01/28
- [PATCH 073/142] meson: convert hw/smbios, Paolo Bonzini, 2020/01/28