From c72b122ec6baf59f9b91f453dd61add0730f03ce Mon Sep 17 00:00:00 2001 From: Luiz Capitulino Date: Mon, 22 Nov 2010 17:16:33 -0200 Subject: [RHEL6 qemu-kvm PATCH 3/4] monitor: Use argument type 'b' for set_link RH-Author: Luiz Capitulino Message-id: <1290446194-4179-4-git-send-email-lcapitulino@redhat.com> Patchwork-id: 13798 O-Subject: [PATCH 3/4] monitor: Use argument type 'b' for set_link Bugzilla: 625681 RH-Acked-by: Amit Shah RH-Acked-by: Kevin Wolf RH-Acked-by: Jes Sorensen From: Markus Armbruster Second argument is now "on" or "off" instead of "up" or "down". Signed-off-by: Markus Armbruster Signed-off-by: Luiz Capitulino (cherry picked from commit c9b26a4cbe1e3ce71521b8a1ff0483f4cc4fa4bf) --- net.c | 10 ++-------- qemu-monitor.hx | 8 ++++---- 2 files changed, 6 insertions(+), 12 deletions(-) Signed-off-by: Eduardo Habkost --- net.c | 10 ++-------- qemu-monitor.hx | 8 ++++---- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/net.c b/net.c index d511b3a..d666626 100644 --- a/net.c +++ b/net.c @@ -1298,7 +1298,7 @@ void do_set_link(Monitor *mon, const QDict *qdict) VLANState *vlan; VLANClientState *vc = NULL; 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(vc, &vlan->clients, next) { @@ -1315,13 +1315,7 @@ done: return; } - if (strcmp(up_or_down, "up") == 0) - 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); + vc->link_down = !up; if (vc->info->link_status_changed) { vc->info->link_status_changed(vc); diff --git a/qemu-monitor.hx b/qemu-monitor.hx index 9e65237..939fd13 100644 --- a/qemu-monitor.hx +++ b/qemu-monitor.hx @@ -1302,16 +1302,16 @@ EQMP { .name = "set_link", - .args_type = "name:s,up_or_down:s", - .params = "name up|down", + .args_type = "name:s,up:b", + .params = "name on|off", .help = "change the link status of a network adapter", .mhandler.cmd = do_set_link, }, STEXI -@item set_link @var{name} [up|down] +@item set_link @var{name} [on|off] @findex set_link -Set link @var{name} up or down. +Switch link @var{name} on (i.e. up) or off (i.e. down). ETEXI { -- 1.7.3.2