From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nu1SK-0007sP-EO for qemu-devel@nongnu.org; Tue, 23 Mar 2010 06:35:28 -0400 Received: from [199.232.76.173] (port=60120 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nu1SJ-0007s1-VA for qemu-devel@nongnu.org; Tue, 23 Mar 2010 06:35:28 -0400 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1Nu1SH-0005M6-E6 for qemu-devel@nongnu.org; Tue, 23 Mar 2010 06:35:27 -0400 Received: from oxygen.pond.sub.org ([213.239.205.148]:44099) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Nu1SG-0005Lp-UV for qemu-devel@nongnu.org; Tue, 23 Mar 2010 06:35:25 -0400 Received: from blackfin.pond.sub.org (pD951AFA7.dip.t-dialin.net [217.81.175.167]) by oxygen.pond.sub.org (Postfix) with ESMTPA id 875BB276DAA for ; Tue, 23 Mar 2010 11:27:59 +0100 (CET) From: Markus Armbruster Date: Tue, 23 Mar 2010 11:27:58 +0100 Message-Id: <1269340078-16446-5-git-send-email-armbru@redhat.com> In-Reply-To: <1269340078-16446-1-git-send-email-armbru@redhat.com> References: <1269340078-16446-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH 4/4] monitor: Convert do_set_link() to QObject, QError List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: lcapitulino@redhat.com Signed-off-by: Markus Armbruster --- 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 673b6ec..96f2670 100644 --- a/net.c +++ b/net.c @@ -1283,7 +1283,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; @@ -1301,8 +1301,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; @@ -1310,6 +1310,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 -- 1.6.6.1