[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 056/132] meson: convert migration directory to Meson
From: |
Paolo Bonzini |
Subject: |
[PATCH 056/132] meson: convert migration directory to Meson |
Date: |
Thu, 12 Dec 2019 13:51:40 +0100 |
From: Marc-André Lureau <address@hidden>
Signed-off-by: Marc-André Lureau <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
Makefile.objs | 1 -
meson.build | 5 +++++
migration/Makefile.objs | 15 ---------------
migration/meson.build | 24 ++++++++++++++++++++++++
4 files changed, 29 insertions(+), 16 deletions(-)
delete mode 100644 migration/Makefile.objs
create mode 100644 migration/meson.build
diff --git a/Makefile.objs b/Makefile.objs
index 542d8e8..5f2a644 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -37,7 +37,6 @@ qom-obj-y = qom/libqom.fa
ifeq ($(CONFIG_SOFTMMU),y)
common-obj-y = net/
common-obj-$(CONFIG_LINUX) += fsdev/
-common-obj-y += migration/
common-obj-$(CONFIG_AUDIO_ALSA) += audio-alsa$(DSOSUF)
common-obj-$(CONFIG_AUDIO_OSS) += audio-oss$(DSOSUF)
diff --git a/meson.build b/meson.build
index 29c68cd..74837ff 100644
--- a/meson.build
+++ b/meson.build
@@ -273,6 +273,10 @@ lzo = declare_dependency()
if 'CONFIG_LZO' in config_host
lzo = declare_dependency(link_args: config_host['LZO_LIBS'].split())
endif
+rdma = declare_dependency()
+if 'CONFIG_RDMA' in config_host
+ rdma = declare_dependency(link_args: config_host['RDMA_LIBS'].split())
+endif
create_config = find_program('scripts/create_config')
minikconf = find_program('scripts/minikconf.py')
@@ -590,6 +594,7 @@ softmmu_ss.add(when: ['CONFIG_FDT', fdt], if_true:
[files('device_tree.c')])
common_ss.add(files('cpus-common.c'))
+subdir('migration')
subdir('monitor')
subdir('replay')
diff --git a/migration/Makefile.objs b/migration/Makefile.objs
deleted file mode 100644
index a4f3baf..0000000
--- a/migration/Makefile.objs
+++ /dev/null
@@ -1,15 +0,0 @@
-common-obj-y += migration.o socket.o fd.o exec.o
-common-obj-y += tls.o channel.o savevm.o
-common-obj-y += colo.o colo-failover.o
-common-obj-y += vmstate.o vmstate-types.o page_cache.o
-common-obj-y += qemu-file.o global_state.o
-common-obj-y += qemu-file-channel.o
-common-obj-y += xbzrle.o postcopy-ram.o
-common-obj-y += qjson.o
-common-obj-y += block-dirty-bitmap.o
-
-common-obj-$(CONFIG_RDMA) += rdma.o
-
-common-obj-$(CONFIG_LIVE_BLOCK_MIGRATION) += block.o
-
-rdma.o-libs := $(RDMA_LIBS)
diff --git a/migration/meson.build b/migration/meson.build
new file mode 100644
index 0000000..ee5a713
--- /dev/null
+++ b/migration/meson.build
@@ -0,0 +1,24 @@
+softmmu_ss.add(files(
+ 'block-dirty-bitmap.c',
+ 'channel.c',
+ 'colo-failover.c',
+ 'colo.c',
+ 'exec.c',
+ 'fd.c',
+ 'global_state.c',
+ 'migration.c',
+ 'page_cache.c',
+ 'postcopy-ram.c',
+ 'qemu-file-channel.c',
+ 'qemu-file.c',
+ 'qjson.c',
+ 'savevm.c',
+ 'socket.c',
+ 'tls.c',
+ 'vmstate-types.c',
+ 'vmstate.c',
+ 'xbzrle.c',
+))
+
+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'))
--
1.8.3.1
- [PATCH 046/132] meson: convert chardev directory to Meson (emulator part), (continued)
- [PATCH 046/132] meson: convert chardev directory to Meson (emulator part), Paolo Bonzini, 2019/12/12
- [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 <=
- [PATCH 057/132] meson: build softmmu-specific migration/ram.c, Paolo Bonzini, 2019/12/12
- [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