[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 10/17] migration/snapshot: Build changes for qemu-snapshot-too
From: |
nikita . lapshin |
Subject: |
[PATCH v3 10/17] migration/snapshot: Build changes for qemu-snapshot-tool |
Date: |
Thu, 16 Jun 2022 13:28:04 +0300 |
From: Nikita Lapshin <nikita.lapshin@openvz.org>
Tool uses part of migration code thus new lib with stubs for migration
code is added here.
Signed-off-by: Nikita Lapshin <nikita.lapshin@openvz.org>
---
meson.build | 18 ++++++++++++++++++
migration/meson.build | 3 ++-
2 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 2d6601467f..ba3b9ab4bd 100644
--- a/meson.build
+++ b/meson.build
@@ -3287,6 +3287,16 @@ if xkbcommon.found()
endif
if have_tools
+ tool_inc = include_directories('include/hw/core', 'include')
+ lib_tool = static_library('snapshot-tool',
+ sources: [migration_files],
+ dependencies: arch_deps,
+ include_directories: [tool_inc, target_inc],
+ name_suffix: 'fa',
+ build_by_default: false)
+ snapshot_tool = declare_dependency(link_with: lib_tool,
+ dependencies: [zlib, qom, io])
+
qemu_img = executable('qemu-img', [files('qemu-img.c'), hxdep],
dependencies: [authz, block, crypto, io, qom, qemuutil], install:
true)
qemu_io = executable('qemu-io', files('qemu-io.c'),
@@ -3294,6 +3304,14 @@ if have_tools
qemu_nbd = executable('qemu-nbd', files('qemu-nbd.c'),
dependencies: [blockdev, qemuutil, gnutls, selinux],
install: true)
+ qemu_snapshot = executable('qemu-snapshot',
+ files('qemu-snapshot.c'),
+ dependencies: [snapshot_tool] + arch_deps + deps,
+ objects: lib.extract_all_objects(recursive: true),
+ link_depends: [block_syms, qemu_syms],
+ link_args: link_args,
+
+ install: true)
subdir('storage-daemon')
subdir('contrib/rdmacm-mux')
diff --git a/migration/meson.build b/migration/meson.build
index 8b5ca5c047..13498a6db3 100644
--- a/migration/meson.build
+++ b/migration/meson.build
@@ -7,6 +7,8 @@ migration_files = files(
'qemu-file-channel.c',
'qemu-file.c',
'yank_functions.c',
+ 'migration.c',
+ 'qemu-snapshot.c',
)
softmmu_ss.add(migration_files)
@@ -18,7 +20,6 @@ softmmu_ss.add(files(
'exec.c',
'fd.c',
'global_state.c',
- 'migration.c',
'multifd.c',
'multifd-zlib.c',
'postcopy-ram.c',
--
2.31.1
- [PATCH v3 06/17] migration: Add RAM part of migration stream, (continued)
- [PATCH v3 06/17] migration: Add RAM part of migration stream, nikita . lapshin, 2022/06/16
- [PATCH v3 07/17] migration: analyze-migration script changed, nikita . lapshin, 2022/06/16
- [PATCH v3 08/17] migration: Test for RAM and vmstate parts, nikita . lapshin, 2022/06/16
- [PATCH v3 11/17] migration/qemu-file: Fix qemu_ftell() for non-writable file, nikita . lapshin, 2022/06/16
- [PATCH v3 13/17] migration/snapshot: Block layer support in qemu-snapshot, nikita . lapshin, 2022/06/16
- [PATCH v3 14/17] migration/snpashot: Implement API for RAMBlock, nikita . lapshin, 2022/06/16
- [PATCH v3 04/17] migration: Add dirty-bitmaps part of migration stream, nikita . lapshin, 2022/06/16
- [PATCH v3 09/17] migration/snapshot: Introduce qemu-snapshot tool, nikita . lapshin, 2022/06/16
- [PATCH v3 10/17] migration/snapshot: Build changes for qemu-snapshot-tool,
nikita . lapshin <=
- [PATCH v3 12/17] migration/snapshot: Move RAM_SAVE_FLAG_xxx defines to migration/ram.h, nikita . lapshin, 2022/06/16
- [PATCH v3 16/17] migration/snapshot: Precopy load implemented, nikita . lapshin, 2022/06/16
- [PATCH v3 15/17] migration/snapshot: Save part implement, nikita . lapshin, 2022/06/16
- [PATCH v3 17/17] migration/snapshot: Postcopy load implemented, nikita . lapshin, 2022/06/16