[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 17/21] monitor: Use argument type 'b' for set_link
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 17/21] monitor: Use argument type 'b' for set_link |
Date: |
Mon, 5 Apr 2010 17:33:58 -0300 |
From: Markus Armbruster <address@hidden>
Second argument is now "on" or "off" instead of "up" or "down".
Signed-off-by: Markus Armbruster <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>
---
net.c | 10 ++--------
qemu-monitor.hx | 8 ++++----
2 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/net.c b/net.c
index 9a95451..e625614 100644
--- a/net.c
+++ b/net.c
@@ -1296,7 +1296,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) {
@@ -1313,13 +1313,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 8c9a41c..7b7dcf5 100644
--- a/qemu-monitor.hx
+++ b/qemu-monitor.hx
@@ -986,16 +986,16 @@ ETEXI
{
.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
address@hidden set_link @var{name} [up|down]
address@hidden 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.0.4.297.g6555b1
- [Qemu-devel] [PATCH 00/21][PULL]: QMP/Monitor queue, Luiz Capitulino, 2010/04/05
- [Qemu-devel] [PATCH 07/21] error: New QERR_INVALID_PARAMETER_VALUE, Luiz Capitulino, 2010/04/05
- [Qemu-devel] [PATCH 01/21] qdev: Convert qdev_unplug() to QError, Luiz Capitulino, 2010/04/05
- [Qemu-devel] [PATCH 06/21] error: Convert qemu_opts_create() to QError, Luiz Capitulino, 2010/04/05
- [Qemu-devel] [PATCH 04/21] error: Put error definitions back in alphabetical order, Luiz Capitulino, 2010/04/05
- [Qemu-devel] [PATCH 12/21] error: Convert net_client_init() to QError, Luiz Capitulino, 2010/04/05
- [Qemu-devel] [PATCH 20/21] QMP: Improve RTC_CHANGE event description, Luiz Capitulino, 2010/04/05
- [Qemu-devel] [PATCH 17/21] monitor: Use argument type 'b' for set_link,
Luiz Capitulino <=
- [Qemu-devel] [PATCH 02/21] monitor: convert do_device_del() to QObject, QError, Luiz Capitulino, 2010/04/05
- [Qemu-devel] [PATCH 15/21] monitor: Rename argument type 'b' to 'f', Luiz Capitulino, 2010/04/05
- [Qemu-devel] [PATCH 09/21] error: Drop extra messages after qemu_opts_set() and qemu_opts_parse(), Luiz Capitulino, 2010/04/05
- [Qemu-devel] [PATCH 05/21] error: New QERR_DUPLICATE_ID, Luiz Capitulino, 2010/04/05
- [Qemu-devel] [PATCH 08/21] error: Convert qemu_opts_set() to QError, Luiz Capitulino, 2010/04/05
- [Qemu-devel] [PATCH 16/21] monitor: New argument type 'b', Luiz Capitulino, 2010/04/05
- [Qemu-devel] [PATCH 14/21] monitor: New commands netdev_add, netdev_del, Luiz Capitulino, 2010/04/05
- [Qemu-devel] [PATCH 13/21] error: New QERR_DEVICE_IN_USE, Luiz Capitulino, 2010/04/05
- [Qemu-devel] [PATCH 11/21] error: Convert qemu_opts_validate() to QError, Luiz Capitulino, 2010/04/05
- [Qemu-devel] [PATCH 19/21] virtio-blk: Fix use after free in error case, Luiz Capitulino, 2010/04/05