提交 eaed483c 编写于 作者: J Jason Wang 提交者: Michael S. Tsirkin

monitor: replace the magic number 255 with MAX_QUEUE_NUM

This patch replace the magic number 255, and increase it to
MAX_QUEUE_NUM which is maximum number of queues supported by a nic.

Cc: Luiz Capitulino <lcapitulino@redhat.com>
Signed-off-by: NJason Wang <jasowang@redhat.com>
Reviewed-by: NMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: NMichael S. Tsirkin <mst@redhat.com>
上级 d25228e7
...@@ -4472,10 +4472,11 @@ void set_link_completion(ReadLineState *rs, int nb_args, const char *str) ...@@ -4472,10 +4472,11 @@ void set_link_completion(ReadLineState *rs, int nb_args, const char *str)
len = strlen(str); len = strlen(str);
readline_set_completion_index(rs, len); readline_set_completion_index(rs, len);
if (nb_args == 2) { if (nb_args == 2) {
NetClientState *ncs[255]; NetClientState *ncs[MAX_QUEUE_NUM];
int count, i; int count, i;
count = qemu_find_net_clients_except(NULL, ncs, count = qemu_find_net_clients_except(NULL, ncs,
NET_CLIENT_OPTIONS_KIND_NONE, 255); NET_CLIENT_OPTIONS_KIND_NONE,
MAX_QUEUE_NUM);
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
const char *name = ncs[i]->name; const char *name = ncs[i]->name;
if (!strncmp(str, name, len)) { if (!strncmp(str, name, len)) {
...@@ -4491,7 +4492,7 @@ void set_link_completion(ReadLineState *rs, int nb_args, const char *str) ...@@ -4491,7 +4492,7 @@ void set_link_completion(ReadLineState *rs, int nb_args, const char *str)
void netdev_del_completion(ReadLineState *rs, int nb_args, const char *str) void netdev_del_completion(ReadLineState *rs, int nb_args, const char *str)
{ {
int len, count, i; int len, count, i;
NetClientState *ncs[255]; NetClientState *ncs[MAX_QUEUE_NUM];
if (nb_args != 2) { if (nb_args != 2) {
return; return;
...@@ -4500,7 +4501,7 @@ void netdev_del_completion(ReadLineState *rs, int nb_args, const char *str) ...@@ -4500,7 +4501,7 @@ void netdev_del_completion(ReadLineState *rs, int nb_args, const char *str)
len = strlen(str); len = strlen(str);
readline_set_completion_index(rs, len); readline_set_completion_index(rs, len);
count = qemu_find_net_clients_except(NULL, ncs, NET_CLIENT_OPTIONS_KIND_NIC, count = qemu_find_net_clients_except(NULL, ncs, NET_CLIENT_OPTIONS_KIND_NIC,
255); MAX_QUEUE_NUM);
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
QemuOpts *opts; QemuOpts *opts;
const char *name = ncs[i]->name; const char *name = ncs[i]->name;
...@@ -4566,14 +4567,15 @@ void host_net_add_completion(ReadLineState *rs, int nb_args, const char *str) ...@@ -4566,14 +4567,15 @@ void host_net_add_completion(ReadLineState *rs, int nb_args, const char *str)
void host_net_remove_completion(ReadLineState *rs, int nb_args, const char *str) void host_net_remove_completion(ReadLineState *rs, int nb_args, const char *str)
{ {
NetClientState *ncs[255]; NetClientState *ncs[MAX_QUEUE_NUM];
int count, i, len; int count, i, len;
len = strlen(str); len = strlen(str);
readline_set_completion_index(rs, len); readline_set_completion_index(rs, len);
if (nb_args == 2) { if (nb_args == 2) {
count = qemu_find_net_clients_except(NULL, ncs, count = qemu_find_net_clients_except(NULL, ncs,
NET_CLIENT_OPTIONS_KIND_NONE, 255); NET_CLIENT_OPTIONS_KIND_NONE,
MAX_QUEUE_NUM);
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
int id; int id;
char name[16]; char name[16];
...@@ -4589,7 +4591,8 @@ void host_net_remove_completion(ReadLineState *rs, int nb_args, const char *str) ...@@ -4589,7 +4591,8 @@ void host_net_remove_completion(ReadLineState *rs, int nb_args, const char *str)
return; return;
} else if (nb_args == 3) { } else if (nb_args == 3) {
count = qemu_find_net_clients_except(NULL, ncs, count = qemu_find_net_clients_except(NULL, ncs,
NET_CLIENT_OPTIONS_KIND_NIC, 255); NET_CLIENT_OPTIONS_KIND_NIC,
MAX_QUEUE_NUM);
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
int id; int id;
const char *name; const char *name;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册