From patchwork Tue Jun 5 17:25:07 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 163117 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B5B56B6F9F for ; Wed, 6 Jun 2012 04:02:47 +1000 (EST) Received: from localhost ([::1]:54955 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sby5d-0005ia-GM for incoming@patchwork.ozlabs.org; Tue, 05 Jun 2012 14:02:45 -0400 Received: from eggs.gnu.org ([208.118.235.92]:54619) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SbxWZ-0004Mz-Eq for qemu-devel@nongnu.org; Tue, 05 Jun 2012 13:26:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SbxWT-0001VP-Br for qemu-devel@nongnu.org; Tue, 05 Jun 2012 13:26:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:64004) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SbxWT-0001Ut-36 for qemu-devel@nongnu.org; Tue, 05 Jun 2012 13:26:25 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q55HQNb6015132 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 5 Jun 2012 13:26:23 -0400 Received: from localhost (ovpn-116-79.ams2.redhat.com [10.36.116.79]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q55HQL7R018153; Tue, 5 Jun 2012 13:26:22 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Tue, 5 Jun 2012 14:25:07 -0300 Message-Id: <1338917108-3965-29-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1338917108-3965-1-git-send-email-lcapitulino@redhat.com> References: <1338917108-3965-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: aliguori@us.ibm.com Subject: [Qemu-devel] [PATCH 28/29] qapi: convert netdev_del X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Anthony Liguori Signed-off-by: Luiz Capitulino Reviewed-By: Laszlo Ersek --- hmp-commands.hx | 3 +-- hmp.c | 9 +++++++++ hmp.h | 1 + net.c | 11 +++++------ net.h | 1 - qapi-schema.json | 14 ++++++++++++++ qmp-commands.hx | 5 +---- 7 files changed, 31 insertions(+), 13 deletions(-) diff --git a/hmp-commands.hx b/hmp-commands.hx index d0ce6a5..f5d9d91 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1051,8 +1051,7 @@ ETEXI .args_type = "id:s", .params = "id", .help = "remove host network device", - .user_print = monitor_user_noop, - .mhandler.cmd_new = do_netdev_del, + .mhandler.cmd = hmp_netdev_del, }, STEXI diff --git a/hmp.c b/hmp.c index 7a4e25f..2ce8cb9 100644 --- a/hmp.c +++ b/hmp.c @@ -990,3 +990,12 @@ void hmp_netdev_add(Monitor *mon, const QDict *qdict) out: hmp_handle_error(mon, &err); } + +void hmp_netdev_del(Monitor *mon, const QDict *qdict) +{ + const char *id = qdict_get_str(qdict, "id"); + Error *err = NULL; + + qmp_netdev_del(id, &err); + hmp_handle_error(mon, &err); +} diff --git a/hmp.h b/hmp.h index 017df87..79d138d 100644 --- a/hmp.h +++ b/hmp.h @@ -63,5 +63,6 @@ void hmp_migrate(Monitor *mon, const QDict *qdict); void hmp_device_del(Monitor *mon, const QDict *qdict); void hmp_dump_guest_memory(Monitor *mon, const QDict *qdict); void hmp_netdev_add(Monitor *mon, const QDict *qdict); +void hmp_netdev_del(Monitor *mon, const QDict *qdict); #endif diff --git a/net.c b/net.c index 5f0c53c..4aa416c 100644 --- a/net.c +++ b/net.c @@ -1269,19 +1269,18 @@ exit_err: return -1; } -int do_netdev_del(Monitor *mon, const QDict *qdict, QObject **ret_data) +void qmp_netdev_del(const char *id, Error **errp) { - const char *id = qdict_get_str(qdict, "id"); VLANClientState *vc; vc = qemu_find_netdev(id); if (!vc) { - qerror_report(QERR_DEVICE_NOT_FOUND, id); - return -1; + error_set(errp, QERR_DEVICE_NOT_FOUND, id); + return; } + qemu_del_vlan_client(vc); - qemu_opts_del(qemu_opts_find(qemu_find_opts("netdev"), id)); - return 0; + qemu_opts_del(qemu_opts_find(qemu_find_opts_err("netdev", errp), id)); } static void print_net_client(Monitor *mon, VLANClientState *vc) diff --git a/net.h b/net.h index 1eb9280..bdc2a06 100644 --- a/net.h +++ b/net.h @@ -172,7 +172,6 @@ void net_host_device_add(Monitor *mon, const QDict *qdict); void net_host_device_remove(Monitor *mon, const QDict *qdict); void netdev_add(QemuOpts *opts, Error **errp); int qmp_netdev_add(Monitor *mon, const QDict *qdict, QObject **ret); -int do_netdev_del(Monitor *mon, const QDict *qdict, QObject **ret_data); #define DEFAULT_NETWORK_SCRIPT "/etc/qemu-ifup" #define DEFAULT_NETWORK_DOWN_SCRIPT "/etc/qemu-ifdown" diff --git a/qapi-schema.json b/qapi-schema.json index 69fcd8e..bb1f806 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -1826,3 +1826,17 @@ { 'command': 'netdev_add', 'data': {'type': 'str', 'id': 'str', '*props': '**'}, 'gen': 'no' } + +## +# @netdev_del: +# +# Remove a network backend. +# +# @id: the name of the network backend to remove +# +# Returns: Nothing on success +# If @id is not a valid network backend, DeviceNotFound +# +# Since: 0.14.0 +## +{ 'command': 'netdev_del', 'data': {'id': 'str'} } diff --git a/qmp-commands.hx b/qmp-commands.hx index f6550cb..57ea803 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -671,10 +671,7 @@ EQMP { .name = "netdev_del", .args_type = "id:s", - .params = "id", - .help = "remove host network device", - .user_print = monitor_user_noop, - .mhandler.cmd_new = do_netdev_del, + .mhandler.cmd_new = qmp_marshal_input_netdev_del, }, SQMP