qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Luiz Capitulino <lcapitulino@redhat.com>
To: aliguori@us.ibm.com
Cc: Luiz Capitulino <lcapitulino@redhat.com>,
	qemu-devel@nongnu.org, Markus Armbruster <armbru@redhat.com>
Subject: [Qemu-devel] [PATCH 17/21] monitor: Use argument type 'b' for set_link
Date: Mon,  5 Apr 2010 17:33:58 -0300	[thread overview]
Message-ID: <1270499642-31543-18-git-send-email-lcapitulino@redhat.com> (raw)
In-Reply-To: <1270499642-31543-1-git-send-email-lcapitulino@redhat.com>

From: Markus Armbruster <armbru@redhat.com>

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>
---
 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
-@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.0.4.297.g6555b1

  parent reply	other threads:[~2010-04-05 20:35 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-04-05 20:33 [Qemu-devel] [PATCH 00/21][PULL]: QMP/Monitor queue Luiz Capitulino
2010-04-05 20:33 ` [Qemu-devel] [PATCH 01/21] qdev: Convert qdev_unplug() to QError Luiz Capitulino
2010-04-05 20:33 ` [Qemu-devel] [PATCH 02/21] monitor: convert do_device_del() to QObject, QError Luiz Capitulino
2010-04-05 20:33 ` [Qemu-devel] [PATCH 03/21] Add qerror message if the 'change' target filename can't be opened Luiz Capitulino
2010-04-05 20:33 ` [Qemu-devel] [PATCH 04/21] error: Put error definitions back in alphabetical order Luiz Capitulino
2010-04-05 20:33 ` [Qemu-devel] [PATCH 05/21] error: New QERR_DUPLICATE_ID Luiz Capitulino
2010-04-05 20:33 ` [Qemu-devel] [PATCH 06/21] error: Convert qemu_opts_create() to QError Luiz Capitulino
2010-04-05 20:33 ` [Qemu-devel] [PATCH 07/21] error: New QERR_INVALID_PARAMETER_VALUE Luiz Capitulino
2010-04-05 20:33 ` [Qemu-devel] [PATCH 08/21] error: Convert qemu_opts_set() to QError Luiz Capitulino
2010-04-05 20:33 ` [Qemu-devel] [PATCH 09/21] error: Drop extra messages after qemu_opts_set() and qemu_opts_parse() Luiz Capitulino
2010-04-05 20:33 ` [Qemu-devel] [PATCH 10/21] error: Use QERR_INVALID_PARAMETER_VALUE instead of QERR_INVALID_PARAMETER Luiz Capitulino
2010-04-05 20:33 ` [Qemu-devel] [PATCH 11/21] error: Convert qemu_opts_validate() to QError Luiz Capitulino
2010-04-05 20:33 ` [Qemu-devel] [PATCH 12/21] error: Convert net_client_init() " Luiz Capitulino
2010-04-05 20:33 ` [Qemu-devel] [PATCH 13/21] error: New QERR_DEVICE_IN_USE Luiz Capitulino
2010-04-05 20:33 ` [Qemu-devel] [PATCH 14/21] monitor: New commands netdev_add, netdev_del Luiz Capitulino
2010-04-05 20:33 ` [Qemu-devel] [PATCH 15/21] monitor: Rename argument type 'b' to 'f' Luiz Capitulino
2010-04-05 20:33 ` [Qemu-devel] [PATCH 16/21] monitor: New argument type 'b' Luiz Capitulino
2010-04-05 20:33 ` Luiz Capitulino [this message]
2010-04-05 20:33 ` [Qemu-devel] [PATCH 18/21] monitor: Convert do_set_link() to QObject, QError Luiz Capitulino
2010-04-05 20:34 ` [Qemu-devel] [PATCH 19/21] virtio-blk: Fix use after free in error case Luiz Capitulino
2010-04-05 20:34 ` [Qemu-devel] [PATCH 20/21] QMP: Improve RTC_CHANGE event description Luiz Capitulino
2010-04-05 20:34 ` [Qemu-devel] [PATCH 21/21] Monitor: Convert do_screen_dump() to QObject Luiz Capitulino
2010-04-18 21:58 ` [Qemu-devel] [PATCH 00/21][PULL]: QMP/Monitor queue Aurelien Jarno
2010-04-19 12:53   ` Luiz Capitulino

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1270499642-31543-18-git-send-email-lcapitulino@redhat.com \
    --to=lcapitulino@redhat.com \
    --cc=aliguori@us.ibm.com \
    --cc=armbru@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).