From: Bruce Richardson <bruce.richardson@intel.com> To: dev@dpdk.org Cc: Bruce Richardson <bruce.richardson@intel.com>, stable@dpdk.org, David Hunt <david.hunt@intel.com>, Pablo de Lara <pablo.de.lara.guarch@intel.com>, Alan Carew <alan.carew@intel.com> Subject: [dpdk-dev] [PATCH 1/4] power: make guest channel headers public Date: Fri, 14 Aug 2020 12:00:42 +0100 Message-ID: <20200814110045.217724-2-bruce.richardson@intel.com> (raw) In-Reply-To: <20200814110045.217724-1-bruce.richardson@intel.com> The channel commands header file contains definitions that are used by the example application for power management, and so need to be made public. Similarly the guest_channel.h header is used by the guest_cli example utility, so needs to be public also. Without this change, the example apps, or any end-user apps based on them, can not be compiled outside the main DPDK build. Fixes: 210c383e247b ("power: packet format for vm power management") Fixes: cd0d5547e873 ("power: vm communication channels in guest") Cc: stable@dpdk.org Signed-off-by: Bruce Richardson <bruce.richardson@intel.com> --- examples/vm_power_manager/channel_manager.c | 1 - examples/vm_power_manager/channel_monitor.c | 1 - examples/vm_power_manager/channel_monitor.h | 2 +- examples/vm_power_manager/guest_cli/main.c | 1 + examples/vm_power_manager/guest_cli/vm_power_cli_guest.c | 2 +- examples/vm_power_manager/guest_cli/vm_power_cli_guest.h | 2 +- examples/vm_power_manager/vm_power_cli.c | 1 - lib/librte_power/guest_channel.c | 3 +-- lib/librte_power/meson.build | 4 +++- lib/librte_power/power_kvm_vm.c | 3 +-- .../{channel_commands.h => rte_power_channel_commands.h} | 0 .../{guest_channel.h => rte_power_guest_channel.h} | 2 +- 12 files changed, 10 insertions(+), 12 deletions(-) rename lib/librte_power/{channel_commands.h => rte_power_channel_commands.h} (100%) rename lib/librte_power/{guest_channel.h => rte_power_guest_channel.h} (98%) diff --git a/examples/vm_power_manager/channel_manager.c b/examples/vm_power_manager/channel_manager.c index 74a2a677e8..3da01b46d8 100644 --- a/examples/vm_power_manager/channel_manager.c +++ b/examples/vm_power_manager/channel_manager.c @@ -27,7 +27,6 @@ #include <libvirt/libvirt.h> #include "channel_manager.h" -#include "channel_commands.h" #include "channel_monitor.h" #include "power_manager.h" diff --git a/examples/vm_power_manager/channel_monitor.c b/examples/vm_power_manager/channel_monitor.c index 1d00a6cf6c..75a29d2589 100644 --- a/examples/vm_power_manager/channel_monitor.c +++ b/examples/vm_power_manager/channel_monitor.c @@ -35,7 +35,6 @@ #include <libvirt/libvirt.h> #include "channel_monitor.h" -#include "channel_commands.h" #include "channel_manager.h" #include "power_manager.h" #include "oob_monitor.h" diff --git a/examples/vm_power_manager/channel_monitor.h b/examples/vm_power_manager/channel_monitor.h index 7362a80d26..fe6ceedc95 100644 --- a/examples/vm_power_manager/channel_monitor.h +++ b/examples/vm_power_manager/channel_monitor.h @@ -6,7 +6,7 @@ #define CHANNEL_MONITOR_H_ #include "channel_manager.h" -#include "channel_commands.h" +#include "rte_power_channel_commands.h" struct core_share { unsigned int pcpu; diff --git a/examples/vm_power_manager/guest_cli/main.c b/examples/vm_power_manager/guest_cli/main.c index f63b3c988a..4c0c98f498 100644 --- a/examples/vm_power_manager/guest_cli/main.c +++ b/examples/vm_power_manager/guest_cli/main.c @@ -14,6 +14,7 @@ #include <rte_eal.h> #include <rte_log.h> +#include "rte_power_channel_commands.h" #include "vm_power_cli_guest.h" #include "parse.h" 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 index 96c1a1ff69..263e7ec9ff 100644 --- 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,7 +19,7 @@ #include <rte_ethdev.h> #include <rte_power.h> -#include <guest_channel.h> +#include <rte_power_guest_channel.h> #include "vm_power_cli_guest.h" diff --git a/examples/vm_power_manager/guest_cli/vm_power_cli_guest.h b/examples/vm_power_manager/guest_cli/vm_power_cli_guest.h index 6ad14a3dea..33c01ff7ca 100644 --- a/examples/vm_power_manager/guest_cli/vm_power_cli_guest.h +++ b/examples/vm_power_manager/guest_cli/vm_power_cli_guest.h @@ -9,7 +9,7 @@ extern "C" { #endif -#include "channel_commands.h" +struct channel_packet; struct channel_packet *get_policy(void); diff --git a/examples/vm_power_manager/vm_power_cli.c b/examples/vm_power_manager/vm_power_cli.c index 7edeaccda5..4c41645664 100644 --- a/examples/vm_power_manager/vm_power_cli.c +++ b/examples/vm_power_manager/vm_power_cli.c @@ -21,7 +21,6 @@ #include "channel_manager.h" #include "channel_monitor.h" #include "power_manager.h" -#include "channel_commands.h" struct cmd_quit_result { cmdline_fixed_string_t quit; diff --git a/lib/librte_power/guest_channel.c b/lib/librte_power/guest_channel.c index 7b5926e5c4..d49cf0cd57 100644 --- a/lib/librte_power/guest_channel.c +++ b/lib/librte_power/guest_channel.c @@ -16,8 +16,7 @@ #include <rte_log.h> -#include "guest_channel.h" -#include "channel_commands.h" +#include "rte_power_guest_channel.h" #define RTE_LOGTYPE_GUEST_CHANNEL RTE_LOGTYPE_USER1 diff --git a/lib/librte_power/meson.build b/lib/librte_power/meson.build index 78c031c943..e9b1fa6e45 100644 --- a/lib/librte_power/meson.build +++ b/lib/librte_power/meson.build @@ -10,5 +10,7 @@ sources = files('rte_power.c', 'power_acpi_cpufreq.c', 'rte_power_empty_poll.c', 'power_pstate_cpufreq.c', 'power_common.c') -headers = files('rte_power.h','rte_power_empty_poll.h') +headers = files('rte_power.h','rte_power_empty_poll.h', + 'rte_power_guest_channel.h', + 'rte_power_channel_commands.h') deps += ['timer'] diff --git a/lib/librte_power/power_kvm_vm.c b/lib/librte_power/power_kvm_vm.c index 409c3e03ab..e9094e1230 100644 --- a/lib/librte_power/power_kvm_vm.c +++ b/lib/librte_power/power_kvm_vm.c @@ -6,8 +6,7 @@ #include <rte_log.h> -#include "guest_channel.h" -#include "channel_commands.h" +#include "rte_power_guest_channel.h" #include "power_kvm_vm.h" #include "power_common.h" diff --git a/lib/librte_power/channel_commands.h b/lib/librte_power/rte_power_channel_commands.h similarity index 100% rename from lib/librte_power/channel_commands.h rename to lib/librte_power/rte_power_channel_commands.h diff --git a/lib/librte_power/guest_channel.h b/lib/librte_power/rte_power_guest_channel.h similarity index 98% rename from lib/librte_power/guest_channel.h rename to lib/librte_power/rte_power_guest_channel.h index e15db46fc7..9853839129 100644 --- a/lib/librte_power/guest_channel.h +++ b/lib/librte_power/rte_power_guest_channel.h @@ -8,7 +8,7 @@ extern "C" { #endif -#include <channel_commands.h> +#include <rte_power_channel_commands.h> /** * Check if any Virtio-Serial VM end-points exist in path. -- 2.25.1
next prev parent reply other threads:[~2020-08-14 11:01 UTC|newest] Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-08-14 11:00 [dpdk-dev] [PATCH 0/4] fixes for example app builds Bruce Richardson 2020-08-14 11:00 ` Bruce Richardson [this message] 2020-08-14 11:05 ` [dpdk-dev] [PATCH 1/4] power: make guest channel headers public Bruce Richardson 2020-08-14 11:00 ` [dpdk-dev] [PATCH 2/4] examples/vm_power_manager: fix string truncation warning Bruce Richardson 2020-08-14 11:00 ` [dpdk-dev] [PATCH 3/4] examples/mp_server: fix snprintf overflow Bruce Richardson 2020-08-14 15:01 ` Stephen Hemminger 2020-08-14 11:00 ` [dpdk-dev] [PATCH 4/4] examples/mp_server: clear string truncation warning Bruce Richardson 2020-08-21 17:10 ` [dpdk-dev] [PATCH v2 0/4] fixes for example app builds Bruce Richardson 2020-08-21 17:10 ` [dpdk-dev] [PATCH v2 1/4] power: make guest channel headers public Bruce Richardson 2020-08-26 10:08 ` David Hunt 2020-10-05 21:44 ` [dpdk-dev] [dpdk-stable] " Thomas Monjalon 2020-08-21 17:10 ` [dpdk-dev] [PATCH v2 2/4] examples/vm_power_manager: fix string truncation warning Bruce Richardson 2020-08-26 10:09 ` David Hunt 2020-08-21 17:10 ` [dpdk-dev] [PATCH v2 3/4] examples/mp_server: fix snprintf overflow Bruce Richardson 2020-10-09 11:22 ` Nicolau, Radu 2020-08-21 17:10 ` [dpdk-dev] [PATCH v2 4/4] examples/mp_server: clear string truncation warning Bruce Richardson 2020-10-09 11:21 ` Nicolau, Radu 2020-10-28 16:26 ` [dpdk-dev] [PATCH v3 0/3] fixes for example app builds Bruce Richardson 2020-10-28 16:27 ` [dpdk-dev] [PATCH v3 1/3] examples/vm_power_manager: fix string truncation warning Bruce Richardson 2020-10-28 16:27 ` [dpdk-dev] [PATCH v3 2/3] examples/mp_server: fix snprintf overflow Bruce Richardson 2020-10-28 16:27 ` [dpdk-dev] [PATCH v3 3/3] examples/mp_server: clear string truncation warning Bruce Richardson 2020-10-30 13:56 ` [dpdk-dev] [PATCH v3 0/3] fixes for example app builds David Marchand
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200814110045.217724-2-bruce.richardson@intel.com \ --to=bruce.richardson@intel.com \ --cc=alan.carew@intel.com \ --cc=david.hunt@intel.com \ --cc=dev@dpdk.org \ --cc=pablo.de.lara.guarch@intel.com \ --cc=stable@dpdk.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
DPDK patches and discussions This inbox may be cloned and mirrored by anyone: git clone --mirror https://inbox.dpdk.org/dev/0 dev/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 dev dev/ https://inbox.dpdk.org/dev \ dev@dpdk.org public-inbox-index dev Example config snippet for mirrors. Newsgroup available over NNTP: nntp://inbox.dpdk.org/inbox.dpdk.dev AGPL code for this site: git clone https://public-inbox.org/public-inbox.git