From patchwork Mon Apr 5 20:33:59 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 49443 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 54D1FB7D0E for ; Tue, 6 Apr 2010 07:13:22 +1000 (EST) Received: from localhost ([127.0.0.1]:43417 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nytao-0002mL-54 for incoming@patchwork.ozlabs.org; Mon, 05 Apr 2010 17:12:22 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nyt45-0002MW-Cf for qemu-devel@nongnu.org; Mon, 05 Apr 2010 16:38:33 -0400 Received: from [140.186.70.92] (port=49422 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nyt10-0001WR-IJ for qemu-devel@nongnu.org; Mon, 05 Apr 2010 16:38:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Nyt0a-0001f7-2w for qemu-devel@nongnu.org; Mon, 05 Apr 2010 16:34:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:16100) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Nyt0Z-0001ey-RD for qemu-devel@nongnu.org; Mon, 05 Apr 2010 16:34:56 -0400 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o35KYsJN027201 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 5 Apr 2010 16:34:55 -0400 Received: from localhost (vpn-8-191.rdu.redhat.com [10.11.8.191]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o35KYrDx030690; Mon, 5 Apr 2010 16:34:53 -0400 From: Luiz Capitulino To: aliguori@us.ibm.com Date: Mon, 5 Apr 2010 17:33:59 -0300 Message-Id: <1270499642-31543-19-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1270499642-31543-1-git-send-email-lcapitulino@redhat.com> References: <1270499642-31543-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: Luiz Capitulino , qemu-devel@nongnu.org, Markus Armbruster Subject: [Qemu-devel] [PATCH 18/21] monitor: Convert do_set_link() to QObject, QError X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Markus Armbruster Signed-off-by: Markus Armbruster Signed-off-by: Luiz Capitulino --- net.c | 7 ++++--- net.h | 2 +- qemu-monitor.hx | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/net.c b/net.c index e625614..d7d76eb 100644 --- a/net.c +++ b/net.c @@ -1291,7 +1291,7 @@ void do_info_network(Monitor *mon) } } -void do_set_link(Monitor *mon, const QDict *qdict) +int do_set_link(Monitor *mon, const QDict *qdict, QObject **ret_data) { VLANState *vlan; VLANClientState *vc = NULL; @@ -1309,8 +1309,8 @@ void do_set_link(Monitor *mon, const QDict *qdict) done: if (!vc) { - monitor_printf(mon, "could not find network device '%s'\n", name); - return; + qerror_report(QERR_DEVICE_NOT_FOUND, name); + return -1; } vc->link_down = !up; @@ -1318,6 +1318,7 @@ done: if (vc->info->link_status_changed) { vc->info->link_status_changed(vc); } + return 0; } void net_cleanup(void) diff --git a/net.h b/net.h index ce9e2c6..c7a3a1b 100644 --- a/net.h +++ b/net.h @@ -118,7 +118,7 @@ int qemu_find_nic_model(NICInfo *nd, const char * const *models, const char *default_model); void do_info_network(Monitor *mon); -void do_set_link(Monitor *mon, const QDict *qdict); +int do_set_link(Monitor *mon, const QDict *qdict, QObject **ret_data); /* NIC info */ diff --git a/qemu-monitor.hx b/qemu-monitor.hx index 7b7dcf5..62fa346 100644 --- a/qemu-monitor.hx +++ b/qemu-monitor.hx @@ -989,7 +989,8 @@ ETEXI .args_type = "name:s,up:b", .params = "name on|off", .help = "change the link status of a network adapter", - .mhandler.cmd = do_set_link, + .user_print = monitor_user_noop, + .mhandler.cmd_new = do_set_link, }, STEXI