From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34275) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aBqS5-0008Cg-HD for qemu-devel@nongnu.org; Wed, 23 Dec 2015 15:56:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aBqS2-000138-BO for qemu-devel@nongnu.org; Wed, 23 Dec 2015 15:56:05 -0500 Received: from mx1.redhat.com ([209.132.183.28]:47793) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aBqS2-00012r-3s for qemu-devel@nongnu.org; Wed, 23 Dec 2015 15:56:02 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id AE1288F4F6 for ; Wed, 23 Dec 2015 20:56:01 +0000 (UTC) From: Eric Blake Date: Wed, 23 Dec 2015 13:55:40 -0700 Message-Id: <1450904145-17721-12-git-send-email-eblake@redhat.com> In-Reply-To: <1450904145-17721-1-git-send-email-eblake@redhat.com> References: <1450904145-17721-1-git-send-email-eblake@redhat.com> Subject: [Qemu-devel] [PATCH v6 11/16] net: Complete qapi-fication of netdev_add List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Jason Wang , armbru@redhat.com We finally have all the required pieces for doing a type-safe representation of netdev_add as a flat union, where the discriminator 'type' now selects which additional members may appear in the "arguments" JSON object sent over QMP, while making no changes to the set of previously-valid QMP commands that would work, and without breaking command line parsing. Signed-off-by: Eric Blake --- v6: don't lose qemu_opts handling --- include/net/net.h | 1 - net/net.c | 6 +++--- qapi-schema.json | 15 +++------------ qmp-commands.hx | 2 +- 4 files changed, 7 insertions(+), 17 deletions(-) diff --git a/include/net/net.h b/include/net/net.h index 401b91d..b962b95 100644 --- a/include/net/net.h +++ b/include/net/net.h @@ -193,7 +193,6 @@ void net_cleanup(void); void hmp_host_net_add(Monitor *mon, const QDict *qdict); void hmp_host_net_remove(Monitor *mon, const QDict *qdict); void netdev_add(QemuOpts *opts, Error **errp); -void qmp_netdev_add(QDict *qdict, QObject **ret, Error **errp); int net_hub_id_for_client(NetClientState *nc, int *id); NetClientState *net_hub_port_find(int hub_id); diff --git a/net/net.c b/net/net.c index 14c6021..dfb5794 100644 --- a/net/net.c +++ b/net/net.c @@ -1178,7 +1178,7 @@ void netdev_add(QemuOpts *opts, Error **errp) net_client_init(opts, true, errp); } -void qmp_netdev_add(QDict *qdict, QObject **ret, Error **errp) +void qmp_netdev_add(Netdev *netdev, Error **errp) { Error *local_err = NULL; QemuOptsList *opts_list; @@ -1189,12 +1189,12 @@ void qmp_netdev_add(QDict *qdict, QObject **ret, Error **errp) goto out; } - opts = qemu_opts_from_qdict(opts_list, qdict, &local_err); + opts = qemu_opts_create(opts_list, netdev->id, 1, &local_err); if (local_err) { goto out; } - netdev_add(opts, &local_err); + net_client_init1(netdev, true, &local_err); if (local_err) { qemu_opts_del(opts); goto out; diff --git a/qapi-schema.json b/qapi-schema.json index 73de7b0..a400fa3 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -2257,26 +2257,17 @@ # # Add a network backend. # -# @type: the type of network backend. Current valid values are 'user', 'tap', -# 'vde', 'socket', 'dump' and 'bridge' +# @type: the type of network backend; determines which additional arguments +# are valid. See Netdev documentation for more details. # # @id: the name of the new network backend # -# Additional arguments depend on the type. -# -# TODO This command effectively bypasses QAPI completely due to its -# "additional arguments" business. It shouldn't have been added to -# the schema in this form. It should be qapified properly, or -# replaced by a properly qapified command. -# # Since: 0.14.0 # # Returns: Nothing on success # If @type is not a valid network backend, DeviceNotFound ## -{ 'command': 'netdev_add', - 'data': {'type': 'str', 'id': 'str'}, - 'gen': false } # so we can get the additional arguments +{ 'command': 'netdev_add', 'data': 'Netdev', 'box': true } ## # @netdev_del: diff --git a/qmp-commands.hx b/qmp-commands.hx index 7b235ee..2a2f53c 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -922,7 +922,7 @@ EQMP { .name = "netdev_add", .args_type = "netdev:O", - .mhandler.cmd_new = qmp_netdev_add, + .mhandler.cmd_new = qmp_marshal_netdev_add, }, SQMP -- 2.4.3