4757f653ca
- Bugfix: Enhance the capability to trace the shutdown status of large VMS - conf: qemu: support provide inject secret for Hygon CSV - conf: qemu: add libvirt support reuse id for hygon CSV - Automatically unbind all devices' driver under same root port and bind to vfio-pci in the context of CVM. - Consistent coding style with opensource. - build: Make daemons depend on generated *_protocol.[ch] - Add the get tmm memory info API into libvirt-host. Also should add the RPC calls into libvirtd for API calling. - Add cvm parameter into the type of LaunchSecurity which is a optional filed for libvirt xml Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com> (cherry picked from commit d6a30a53977380d182cdf5f873c4ceb1ec29a85a)
92 lines
2.6 KiB
Diff
92 lines
2.6 KiB
Diff
From 2703f133869014a99cdfb9107e8315f4ea419d48 Mon Sep 17 00:00:00 2001
|
|
From: lihhua <lihuhua@huawei.com>
|
|
Date: Sat, 24 Aug 2024 11:11:42 +0800
|
|
Subject: [PATCH] build: Make daemons depend on generated *_protocol.[ch]
|
|
|
|
---
|
|
po/meson.build | 1 +
|
|
src/meson.build | 6 +++++-
|
|
src/remote/meson.build | 15 +++++++++++----
|
|
3 files changed, 17 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/po/meson.build b/po/meson.build
|
|
index a20877ad34..592b254447 100644
|
|
--- a/po/meson.build
|
|
+++ b/po/meson.build
|
|
@@ -20,6 +20,7 @@ potfiles_dep = [
|
|
access_gen_sources,
|
|
admin_client_generated,
|
|
admin_driver_generated,
|
|
+ remote_protocol_generated,
|
|
remote_driver_generated,
|
|
remote_daemon_generated,
|
|
]
|
|
diff --git a/src/meson.build b/src/meson.build
|
|
index 6538c43628..f52d2d5994 100644
|
|
--- a/src/meson.build
|
|
+++ b/src/meson.build
|
|
@@ -616,7 +616,11 @@ foreach daemon : virt_daemons
|
|
bin = executable(
|
|
daemon['name'],
|
|
[
|
|
- daemon.get('sources', [ remote_daemon_sources, remote_daemon_generated ]),
|
|
+ daemon.get('sources', [
|
|
+ remote_protocol_generated,
|
|
+ remote_daemon_sources,
|
|
+ remote_daemon_generated
|
|
+ ]),
|
|
dtrace_gen_objects,
|
|
],
|
|
c_args: [
|
|
diff --git a/src/remote/meson.build b/src/remote/meson.build
|
|
index 16b903fcaf..43bf2d0083 100644
|
|
--- a/src/remote/meson.build
|
|
+++ b/src/remote/meson.build
|
|
@@ -7,8 +7,6 @@ remote_driver_generated = []
|
|
|
|
foreach name : [ 'remote', 'qemu', 'lxc' ]
|
|
client_bodies_h = '@0@_client_bodies.h'.format(name)
|
|
- protocol_c = '@0@_protocol.c'.format(name)
|
|
- protocol_h = '@0@_protocol.h'.format(name)
|
|
protocol_x = '@0@_protocol.x'.format(name)
|
|
|
|
remote_driver_generated += custom_target(
|
|
@@ -20,8 +18,16 @@ foreach name : [ 'remote', 'qemu', 'lxc' ]
|
|
],
|
|
capture: true,
|
|
)
|
|
+endforeach
|
|
|
|
- remote_driver_generated += custom_target(
|
|
+remote_protocol_generated = []
|
|
+
|
|
+foreach name : [ 'remote', 'qemu', 'lxc' ]
|
|
+ protocol_c = '@0@_protocol.c'.format(name)
|
|
+ protocol_h = '@0@_protocol.h'.format(name)
|
|
+ protocol_x = '@0@_protocol.x'.format(name)
|
|
+
|
|
+ remote_protocol_generated += custom_target(
|
|
protocol_h,
|
|
input: protocol_x,
|
|
output: protocol_h,
|
|
@@ -32,7 +38,7 @@ foreach name : [ 'remote', 'qemu', 'lxc' ]
|
|
],
|
|
)
|
|
|
|
- remote_driver_generated += custom_target(
|
|
+ remote_protocol_generated += custom_target(
|
|
protocol_c,
|
|
input: protocol_x,
|
|
output: protocol_c,
|
|
@@ -143,6 +149,7 @@ if conf.has('WITH_REMOTE')
|
|
remote_driver_lib = static_library(
|
|
'virt_remote_driver',
|
|
[
|
|
+ remote_protocol_generated,
|
|
remote_driver_sources,
|
|
remote_driver_generated,
|
|
],
|
|
--
|
|
2.41.0.windows.1
|
|
|