From 90a774c479b20a8b163b3c4a22ecd71ee5dd73fe Mon Sep 17 00:00:00 2001 From: David Hunt Date: Wed, 17 Oct 2018 14:05:30 +0100 Subject: [PATCH] examples/power: increase allowed number of clients Now that we're handling host policies, containers and virtual machines, we'll rename MAX_VMS to MAX_CLIENTS, and increase from 4 to 64 Signed-off-by: David Hunt Acked-by: Anatoly Burakov --- examples/vm_power_manager/channel_manager.h | 4 ++-- examples/vm_power_manager/channel_monitor.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/examples/vm_power_manager/channel_manager.h b/examples/vm_power_manager/channel_manager.h index e32235b079..d948b304c4 100644 --- a/examples/vm_power_manager/channel_manager.h +++ b/examples/vm_power_manager/channel_manager.h @@ -37,7 +37,7 @@ struct sockaddr_un _sockaddr_un; #define UNIX_PATH_MAX sizeof(_sockaddr_un.sun_path) #endif -#define MAX_VMS 4 +#define MAX_CLIENTS 64 #define MAX_VCPUS 20 @@ -47,7 +47,7 @@ struct libvirt_vm_info { uint8_t num_cpus; }; -struct libvirt_vm_info lvm_info[MAX_VMS]; +struct libvirt_vm_info lvm_info[MAX_CLIENTS]; /* Communication Channel Status */ enum channel_status { CHANNEL_MGR_CHANNEL_DISCONNECTED = 0, CHANNEL_MGR_CHANNEL_CONNECTED, diff --git a/examples/vm_power_manager/channel_monitor.c b/examples/vm_power_manager/channel_monitor.c index c3c3d7bb18..53a4efe45a 100644 --- a/examples/vm_power_manager/channel_monitor.c +++ b/examples/vm_power_manager/channel_monitor.c @@ -41,7 +41,7 @@ static volatile unsigned run_loop = 1; static int global_event_fd; static unsigned int policy_is_set; static struct epoll_event *global_events_list; -static struct policy policies[MAX_VMS]; +static struct policy policies[MAX_CLIENTS]; void channel_monitor_exit(void) { @@ -199,7 +199,7 @@ update_policy(struct channel_packet *pkt) RTE_LOG(INFO, CHANNEL_MONITOR, "Applying policy for %s\n", pkt->vm_name); - for (i = 0; i < MAX_VMS; i++) { + for (i = 0; i < MAX_CLIENTS; i++) { if (strcmp(policies[i].pkt.vm_name, pkt->vm_name) == 0) { /* Copy the contents of *pkt into the policy.pkt */ policies[i].pkt = *pkt; @@ -214,7 +214,7 @@ update_policy(struct channel_packet *pkt) } } if (!updated) { - for (i = 0; i < MAX_VMS; i++) { + for (i = 0; i < MAX_CLIENTS; i++) { if (policies[i].enabled == 0) { policies[i].pkt = *pkt; get_pcpu_to_control(&policies[i]); @@ -238,7 +238,7 @@ remove_policy(struct channel_packet *pkt __rte_unused) * Disabling the policy is simply a case of setting * enabled to 0 */ - for (i = 0; i < MAX_VMS; i++) { + for (i = 0; i < MAX_CLIENTS; i++) { if (strcmp(policies[i].pkt.vm_name, pkt->vm_name) == 0) { policies[i].enabled = 0; return 0; @@ -609,7 +609,7 @@ run_channel_monitor(void) if (policy_is_set) { int j; - for (j = 0; j < MAX_VMS; j++) { + for (j = 0; j < MAX_CLIENTS; j++) { if (policies[j].enabled == 1) apply_policy(&policies[j]); } -- 2.20.1