power: fix build with libvirt

Following moving rte_power_guest* API from the power library to the kvm_vm driver, the symbols are not exposed anymore, since the library hosting them is the kvm_vm driver binary. Finish this cleanup by hosting the rte_power_guest_channel.h header in the driver, then version the symbols and add corresponding build dependencies in the vm_power_manager example. Fixes: 6f987b5 ("power: refactor core power management") Signed-off-by: David Marchand <[email protected]>
david-marchand · Nov 12, 2024 · b462f27 · b462f27
1 parent 49a841e
commit b462f27
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 6 deletions.
diff --git a/drivers/power/kvm_vm/meson.build b/drivers/power/kvm_vm/meson.build
@@ -10,5 +10,6 @@ sources = files(
         'guest_channel.c',
         'kvm_vm.c',
 )
+headers = files('rte_power_guest_channel.h')
 
 deps += ['power']
diff --git a/lib/power/rte_power_guest_channel.h → ...rs/power/kvm_vm/rte_power_guest_channel.h b/lib/power/rte_power_guest_channel.h → ...rs/power/kvm_vm/rte_power_guest_channel.h
diff --git a/drivers/power/kvm_vm/version.map b/drivers/power/kvm_vm/version.map
@@ -0,0 +1,8 @@
+DPDK_25 {
+	global:
+
+	rte_power_guest_channel_receive_msg;
+	rte_power_guest_channel_send_msg;
+
+	local: *;
+};
diff --git a/examples/vm_power_manager/channel_monitor.c b/examples/vm_power_manager/channel_monitor.c
@@ -32,6 +32,7 @@
 #include <rte_pmd_i40e.h>
 #endif
 #include <rte_power_cpufreq.h>
+#include <rte_power_guest_channel.h>
 
 #include <libvirt/libvirt.h>
 #include "channel_monitor.h"

diff --git a/examples/vm_power_manager/channel_monitor.h b/examples/vm_power_manager/channel_monitor.h
@@ -6,6 +6,7 @@
 #define CHANNEL_MONITOR_H_
 
 #include <rte_power_cpufreq.h>
+#include <rte_power_guest_channel.h>
 
 #include "channel_manager.h"
 

diff --git a/examples/vm_power_manager/guest_cli/main.c b/examples/vm_power_manager/guest_cli/main.c
@@ -10,6 +10,7 @@
 
 #include <rte_lcore.h>
 #include <rte_power_cpufreq.h>
+#include <rte_power_guest_channel.h>
 #include <rte_debug.h>
 #include <rte_eal.h>
 #include <rte_log.h>

diff --git a/examples/vm_power_manager/guest_cli/meson.build b/examples/vm_power_manager/guest_cli/meson.build
@@ -6,7 +6,7 @@
 # To build this example as a standalone application with an already-installed
 # DPDK instance, use 'make'
 
-deps += ['power']
+deps += ['power', 'power_kvm_vm']
 
 sources = files(
         'main.c',

diff --git a/examples/vm_power_manager/guest_cli/vm_power_cli_guest.c b/examples/vm_power_manager/guest_cli/vm_power_cli_guest.c
@@ -19,6 +19,7 @@
 #include <rte_ethdev.h>
 
 #include <rte_power_cpufreq.h>
+#include <rte_power_guest_channel.h>
 
 #include "vm_power_cli_guest.h"
 

diff --git a/examples/vm_power_manager/meson.build b/examples/vm_power_manager/meson.build
@@ -6,7 +6,7 @@
 # To build this example as a standalone application with an already-installed
 # DPDK instance, use 'make'
 
-deps += ['power']
+deps += ['power', 'power_kvm_vm']
 
 if dpdk_conf.has('RTE_NET_BNXT')
     deps += ['net_bnxt']

diff --git a/lib/power/meson.build b/lib/power/meson.build
@@ -22,7 +22,6 @@ headers = files(
         'power_cpufreq.h',
         'power_uncore_ops.h',
         'rte_power_cpufreq.h',
-        'rte_power_guest_channel.h',
         'rte_power_pmd_mgmt.h',
         'rte_power_qos.h',
         'rte_power_uncore.h',

diff --git a/lib/power/rte_power_cpufreq.h b/lib/power/rte_power_cpufreq.h
@@ -13,7 +13,6 @@
 
 #include <rte_common.h>
 #include <rte_log.h>
-#include <rte_power_guest_channel.h>
 
 #include "power_cpufreq.h"
 

diff --git a/lib/power/version.map b/lib/power/version.map
@@ -16,8 +16,6 @@ DPDK_25 {
 	rte_power_get_env;
 	rte_power_get_freq;
 	rte_power_get_uncore_freq;
-	rte_power_guest_channel_receive_msg;
-	rte_power_guest_channel_send_msg;
 	rte_power_init;
 	rte_power_pmd_mgmt_get_emptypoll_max;
 	rte_power_pmd_mgmt_get_pause_duration;