net: add macro to extract MAC address bytes
[dpdk.git] / examples / vm_power_manager / guest_cli / vm_power_cli_guest.c
index 125dfeb..94bfbba 100644 (file)
@@ -19,7 +19,6 @@
 #include <rte_ethdev.h>
 
 #include <rte_power.h>
-#include <guest_channel.h>
 
 #include "vm_power_cli_guest.h"
 
@@ -63,10 +62,7 @@ set_policy_mac(int port, int idx)
 
        printf("Port %u MAC: %02" PRIx8 ":%02" PRIx8 ":%02" PRIx8 ":"
                        "%02" PRIx8 ":%02" PRIx8 ":%02" PRIx8 "\n",
-                       port,
-                       pfid.addr.addr_bytes[0], pfid.addr.addr_bytes[1],
-                       pfid.addr.addr_bytes[2], pfid.addr.addr_bytes[3],
-                       pfid.addr.addr_bytes[4], pfid.addr.addr_bytes[5]);
+                       port, RTE_ETHER_ADDR_BYTES(&pfid.addr));
        policy = get_policy();
        policy->vfid[idx] = pfid.pfid;
        return 0;
@@ -103,10 +99,10 @@ set_policy_defaults(struct rte_power_channel_packet *pkt)
        pkt->timer_policy.hours_to_use_traffic_profile[0] = 8;
        pkt->timer_policy.hours_to_use_traffic_profile[1] = 10;
 
-       pkt->core_type = CORE_TYPE_VIRTUAL;
-       pkt->workload = LOW;
-       pkt->policy_to_use = TIME;
-       pkt->command = PKT_POLICY;
+       pkt->core_type = RTE_POWER_CORE_TYPE_VIRTUAL;
+       pkt->workload = RTE_POWER_WL_LOW;
+       pkt->policy_to_use = RTE_POWER_POLICY_TIME;
+       pkt->command = RTE_POWER_PKT_POLICY;
        strlcpy(pkt->vm_name, "ubuntu2", sizeof(pkt->vm_name));
 
        return 0;
@@ -169,7 +165,7 @@ receive_freq_list(struct rte_power_channel_packet_freq_list *pkt_freq_list,
                RTE_LOG(ERR, GUEST_CLI, "Error receiving message.\n");
                return -1;
        }
-       if (pkt_freq_list->command != CPU_POWER_FREQ_LIST) {
+       if (pkt_freq_list->command != RTE_POWER_FREQ_LIST) {
                RTE_LOG(ERR, GUEST_CLI, "Unexpected message received.\n");
                return -1;
        }
@@ -203,18 +199,18 @@ cmd_query_freq_list_parsed(void *parsed_result,
                        return;
                }
 
-               pkt.command = CPU_POWER_QUERY_FREQ_LIST;
+               pkt.command = RTE_POWER_QUERY_FREQ_LIST;
                strlcpy(pkt.vm_name, policy.vm_name, sizeof(pkt.vm_name));
                query_list = true;
        } else {
                errno = 0;
                lcore_id = (unsigned int)strtol(res->cpu_num, &ep, 10);
-               if (errno != 0 || lcore_id >= MAX_VCPU_PER_VM ||
+               if (errno != 0 || lcore_id >= RTE_POWER_MAX_VCPU_PER_VM ||
                        ep == res->cpu_num) {
                        cmdline_printf(cl, "Invalid parameter provided.\n");
                        return;
                }
-               pkt.command = CPU_POWER_QUERY_FREQ;
+               pkt.command = RTE_POWER_QUERY_FREQ;
                strlcpy(pkt.vm_name, policy.vm_name, sizeof(pkt.vm_name));
                pkt.resource_id = lcore_id;
        }
@@ -279,7 +275,7 @@ receive_capabilities(struct rte_power_channel_packet_caps_list *pkt_caps_list,
                RTE_LOG(ERR, GUEST_CLI, "Error receiving message.\n");
                return -1;
        }
-       if (pkt_caps_list->command != CPU_POWER_CAPS_LIST) {
+       if (pkt_caps_list->command != RTE_POWER_CAPS_LIST) {
                RTE_LOG(ERR, GUEST_CLI, "Unexpected message received.\n");
                return -1;
        }
@@ -313,18 +309,18 @@ cmd_query_caps_list_parsed(void *parsed_result,
                        return;
                }
 
-               pkt.command = CPU_POWER_QUERY_CAPS_LIST;
+               pkt.command = RTE_POWER_QUERY_CAPS_LIST;
                strlcpy(pkt.vm_name, policy.vm_name, sizeof(pkt.vm_name));
                query_list = true;
        } else {
                errno = 0;
                lcore_id = (unsigned int)strtol(res->cpu_num, &ep, 10);
-               if (errno != 0 || lcore_id >= MAX_VCPU_PER_VM ||
+               if (errno != 0 || lcore_id >= RTE_POWER_MAX_VCPU_PER_VM ||
                        ep == res->cpu_num) {
                        cmdline_printf(cl, "Invalid parameter provided.\n");
                        return;
                }
-               pkt.command = CPU_POWER_QUERY_CAPS;
+               pkt.command = RTE_POWER_QUERY_CAPS;
                strlcpy(pkt.vm_name, policy.vm_name, sizeof(pkt.vm_name));
                pkt.resource_id = lcore_id;
        }
@@ -388,10 +384,10 @@ check_response_cmd(unsigned int lcore_id, int *result)
                return -1;
 
        switch (pkt.command) {
-       case(CPU_POWER_CMD_ACK):
+       case(RTE_POWER_CMD_ACK):
                *result = 1;
                break;
-       case(CPU_POWER_CMD_NACK):
+       case(RTE_POWER_CMD_NACK):
                *result = 0;
                break;
        default: