monitor: Use argument type 'b' for set_link

Second argument is now "on" or "off" instead of "up" or "down".

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
This commit is contained in:
Markus Armbruster 2010-03-26 09:07:10 +01:00 committed by Aurelien Jarno
parent 942cd1f288
commit c9b26a4cbe
2 changed files with 6 additions and 12 deletions

10
net.c
View File

@ -1276,7 +1276,7 @@ void do_set_link(Monitor *mon, const QDict *qdict)
VLANState *vlan; VLANState *vlan;
VLANClientState *vc = NULL; VLANClientState *vc = NULL;
const char *name = qdict_get_str(qdict, "name"); const char *name = qdict_get_str(qdict, "name");
const char *up_or_down = qdict_get_str(qdict, "up_or_down"); int up = qdict_get_bool(qdict, "up");
QTAILQ_FOREACH(vlan, &vlans, next) { QTAILQ_FOREACH(vlan, &vlans, next) {
QTAILQ_FOREACH(vc, &vlan->clients, next) { QTAILQ_FOREACH(vc, &vlan->clients, next) {
@ -1293,13 +1293,7 @@ done:
return; return;
} }
if (strcmp(up_or_down, "up") == 0) vc->link_down = !up;
vc->link_down = 0;
else if (strcmp(up_or_down, "down") == 0)
vc->link_down = 1;
else
monitor_printf(mon, "invalid link status '%s'; only 'up' or 'down' "
"valid\n", up_or_down);
if (vc->info->link_status_changed) { if (vc->info->link_status_changed) {
vc->info->link_status_changed(vc); vc->info->link_status_changed(vc);

View File

@ -986,16 +986,16 @@ ETEXI
{ {
.name = "set_link", .name = "set_link",
.args_type = "name:s,up_or_down:s", .args_type = "name:s,up:b",
.params = "name up|down", .params = "name on|off",
.help = "change the link status of a network adapter", .help = "change the link status of a network adapter",
.mhandler.cmd = do_set_link, .mhandler.cmd = do_set_link,
}, },
STEXI STEXI
@item set_link @var{name} [up|down] @item set_link @var{name} [on|off]
@findex set_link @findex set_link
Set link @var{name} up or down. Switch link @var{name} on (i.e. up) or off (i.e. down).
ETEXI ETEXI
{ {