From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NuCFL-0001Tt-LG for qemu-devel@nongnu.org; Tue, 23 Mar 2010 18:06:47 -0400 Received: from [140.186.70.92] (port=55000 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NuCFH-0001Sa-Sg for qemu-devel@nongnu.org; Tue, 23 Mar 2010 18:06:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1NuCFF-0006oC-3G for qemu-devel@nongnu.org; Tue, 23 Mar 2010 18:06:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:17220) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NuCFE-0006nn-S3 for qemu-devel@nongnu.org; Tue, 23 Mar 2010 18:06:41 -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.13.8/8.13.8) with ESMTP id o2NM6dIU027585 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 23 Mar 2010 18:06:40 -0400 Date: Tue, 23 Mar 2010 19:06:32 -0300 From: Luiz Capitulino Message-ID: <20100323190632.46d14a38@redhat.com> In-Reply-To: <1269251333-20821-12-git-send-email-armbru@redhat.com> References: <1269251333-20821-1-git-send-email-armbru@redhat.com> <1269251333-20821-12-git-send-email-armbru@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] Re: [PATCH v2 11/11] monitor: New commands netdev_add, netdev_del List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Markus Armbruster Cc: qemu-devel@nongnu.org On Mon, 22 Mar 2010 10:48:53 +0100 Markus Armbruster wrote: > Monitor commands to go with -netdev. > > Signed-off-by: Markus Armbruster > --- > net.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- > net.h | 2 + > qemu-monitor.hx | 30 ++++++++++++++++++++++++++++ > 3 files changed, 88 insertions(+), 1 deletions(-) > > diff --git a/net.c b/net.c > index 1f3c39c..80e9025 100644 > --- a/net.c > +++ b/net.c > @@ -1122,7 +1122,7 @@ int net_client_init(Monitor *mon, QemuOpts *opts, int is_netdev) > } > > qerror_report(QERR_INVALID_PARAMETER_VALUE, "type", > - "a network backend type"); > + "a network client type"); > return -1; > } > > @@ -1186,6 +1186,61 @@ void net_host_device_remove(Monitor *mon, const QDict *qdict) > qemu_del_vlan_client(vc); > } > > +/** > + * do_netdev_add(): Add a host network device > + * > + * Argument qdict contains > + * - "type": the device type, "tap", "user", ... > + * - "id": the device's ID (must be unique) Consecutive calls of this command in qmp with the same id succeeds, but I couldn't understand why. Other than that looks ok, although I'm not familiar with the device handling machinery in qemu. > + * - device options > + * > + * Example: > + * > + * { "type": "user", "id": "netdev1", "hostname": "a-guest" } > + */ > +int do_netdev_add(Monitor *mon, const QDict *qdict, QObject **ret_data) > +{ > + QemuOpts *opts; > + int res; > + > + opts = qemu_opts_from_qdict(&qemu_netdev_opts, qdict); > + if (!opts) { > + return -1; > + } > + > + res = net_client_init(mon, opts, 1); > + qemu_opts_del(opts); > + return res; > +} > + > +/** > + * do_netdev_del(): Delete a host network device > + * > + * Argument qdict contains > + * - "id": the device's ID > + * > + * Example: > + * > + * { "id": "netdev1" } > + */ > +int do_netdev_del(Monitor *mon, const QDict *qdict, QObject **ret_data) > +{ > + const char *id = qdict_get_str(qdict, "id"); > + VLANClientState *vc; > + > + vc = qemu_find_netdev(id); > + if (!vc || vc->info->type == NET_CLIENT_TYPE_NIC) { > + qerror_report(QERR_DEVICE_NOT_FOUND, id); > + return -1; > + } > + if (vc->peer) { > + qerror_report(QERR_DEVICE_IN_USE, id); > + return -1; > + } > + qemu_del_vlan_client(vc); > + return 0; > +} > + > void net_set_boot_mask(int net_boot_mask) > { > int i; > diff --git a/net.h b/net.h > index 16f19c5..ce9e2c6 100644 > --- a/net.h > +++ b/net.h > @@ -166,6 +166,8 @@ void net_cleanup(void); > void net_set_boot_mask(int boot_mask); > void net_host_device_add(Monitor *mon, const QDict *qdict); > void net_host_device_remove(Monitor *mon, const QDict *qdict); > +int do_netdev_add(Monitor *mon, const QDict *qdict, QObject **ret_data); > +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/qemu-monitor.hx b/qemu-monitor.hx > index 5308f36..ff5f099 100644 > --- a/qemu-monitor.hx > +++ b/qemu-monitor.hx > @@ -913,6 +913,36 @@ STEXI > Remove host VLAN client. > ETEXI > > + { > + .name = "netdev_add", > + .args_type = "netdev:O", > + .params = "[user|tap|socket],id=str[,prop=value][,...]", > + .help = "add host network device", > + .user_print = monitor_user_noop, > + .mhandler.cmd_new = do_netdev_add, > + }, > + > +STEXI > +@item netdev_add > +@findex netdev_add > +Add host network device. > +ETEXI > + > + { > + .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, > + }, > + > +STEXI > +@item netdev_del > +@findex netdev_del > +Remove host network device. > +ETEXI > + > #ifdef CONFIG_SLIRP > { > .name = "hostfwd_add",