examples/vm_power: fix build

Message ID 20191014100350.30226-1-ferruh.yigit@intel.com (mailing list archive)
State Accepted, archived
Delegated to: Thomas Monjalon
Headers
Series examples/vm_power: fix build |

Checks

Context Check Description
ci/iol-compilation success Compile Testing PASS
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-mellanox-Performance success Performance Testing PASS
ci/Intel-compilation success Compilation OK
ci/checkpatch success coding style OK

Commit Message

Ferruh Yigit Oct. 14, 2019, 10:03 a.m. UTC
  Fixes: 70febdcfd60f ("examples: check status of getting MAC address")

Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
Cc: Igor Romanov <igor.romanov@oktetlabs.ru>
Cc: Andrew Rybchenko <arybchenko@solarflare.com>
---
 examples/vm_power_manager/guest_cli/vm_power_cli_guest.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
  

Comments

Andrew Rybchenko Oct. 14, 2019, 10:10 a.m. UTC | #1
On 10/14/19 1:03 PM, Ferruh Yigit wrote:
> Fixes: 70febdcfd60f ("examples: check status of getting MAC address")
>
> Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>

Thanks Ferruh, it is consequences of vm_power_manager
excluded from build because of missing libvirt dependency and
our inattentiveness when checking build results.
  
Ferruh Yigit Oct. 14, 2019, 10:17 a.m. UTC | #2
On 10/14/2019 11:10 AM, Andrew Rybchenko wrote:
> On 10/14/19 1:03 PM, Ferruh Yigit wrote:
>> Fixes: 70febdcfd60f ("examples: check status of getting MAC address")
>>
>> Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
> 
> Thanks Ferruh, it is consequences of vm_power_manager
> excluded from build because of missing libvirt dependency and
> our inattentiveness when checking build results.
> 

I also missed it because of same reason, validation team caught it :)
  
Bruce Richardson Oct. 22, 2019, 1:13 p.m. UTC | #3
On Mon, Oct 14, 2019 at 11:03:50AM +0100, Ferruh Yigit wrote:
> Fixes: 70febdcfd60f ("examples: check status of getting MAC address")
> 
> Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
> ---
> Cc: Igor Romanov <igor.romanov@oktetlabs.ru>
> Cc: Andrew Rybchenko <arybchenko@solarflare.com>
> ---
>  examples/vm_power_manager/guest_cli/vm_power_cli_guest.c | 8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)
> 
The guest_cli part of the example app was not being built by the meson
builds. I'm now reworking series [1] to include it (a one-line addition is
really all that's needed). When added I see these build errors and this
patch fixes them.

Tested-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>

[1] http://patches.dpdk.org/project/dpdk/list/?series=6864
  
Thomas Monjalon Oct. 23, 2019, 2:28 p.m. UTC | #4
22/10/2019 15:13, Bruce Richardson:
> On Mon, Oct 14, 2019 at 11:03:50AM +0100, Ferruh Yigit wrote:
> > Fixes: 70febdcfd60f ("examples: check status of getting MAC address")
> > 
> > Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
> 
> Tested-by: Bruce Richardson <bruce.richardson@intel.com>
> Acked-by: Bruce Richardson <bruce.richardson@intel.com>

Applied, thanks
  

Patch

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 77e54401a..fe09b0778 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
@@ -55,10 +55,10 @@  set_policy_mac(int port, int idx)
 
 	/* Use port MAC address as the vfid */
 	ret = rte_eth_macaddr_get(port, &pfid.addr);
-	if (retval != 0) {
+	if (ret != 0) {
 		printf("Failed to get device (port %u) MAC address: %s\n",
-				port, rte_strerror(-retval));
-		return retval;
+				port, rte_strerror(-ret));
+		return ret;
 	}
 
 	printf("Port %u MAC: %02" PRIx8 ":%02" PRIx8 ":%02" PRIx8 ":"
@@ -108,6 +108,8 @@  set_policy_defaults(struct channel_packet *pkt)
 	pkt->policy_to_use = TIME;
 	pkt->command = PKT_POLICY;
 	strcpy(pkt->vm_name, "ubuntu2");
+
+	return 0;
 }
 
 static void cmd_quit_parsed(__attribute__((unused)) void *parsed_result,