From patchwork Tue May 18 17:07:49 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miguel Di Ciurcio Filho X-Patchwork-Id: 52894 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 16E4CB7D16 for ; Wed, 19 May 2010 03:23:53 +1000 (EST) Received: from localhost ([127.0.0.1]:43609 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OEQVj-0008Um-7u for incoming@patchwork.ozlabs.org; Tue, 18 May 2010 13:23:19 -0400 Received: from [140.186.70.92] (port=38523 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OEQRQ-0005iD-4x for qemu-devel@nongnu.org; Tue, 18 May 2010 13:19:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OEQHT-0005WR-CJ for qemu-devel@nongnu.org; Tue, 18 May 2010 13:08:38 -0400 Received: from mail-gx0-f218.google.com ([209.85.217.218]:55821) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OEQHS-0005SF-4j for qemu-devel@nongnu.org; Tue, 18 May 2010 13:08:35 -0400 Received: by mail-gx0-f218.google.com with SMTP id 10so1295099gxk.10 for ; Tue, 18 May 2010 10:08:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=oHcv2wLWRJHcPyYHc+ZtagVs+0gJSDKDlgP1jcdrfcM=; b=KKOB/abW6HuDkk/qIXwyPOaGt/u3sdDvPmGN+/dm+PVACH608AXopHlPAzqHuLwDOO /DNCooYu6mEqo6SkwYnuzhFTRBUn4N1PVhWsjWH6TpRtZFgBecZOJkD287qKaeahFrwc 2GyidWDAvHub86Jpkn3laj2tPkSO0rAiDxXKE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=i4wsCegR9K5W3RPdSgZyyULWRJikXeJIUMWkVJVTbVfmI7Kx0XJg3hHhGJK3Gh1ckh IGZJ/a3QCOVsxOToQYf59eWwpOc42D7nrjVCTnLkgLGnxlFn0HdiJ+1SOzvb+VkCuadL MToTf0OM9RKOHxMUbf0AuqbqsNTS85x9kmjT4= Received: by 10.151.25.5 with SMTP id c5mr8142547ybj.276.1274202513527; Tue, 18 May 2010 10:08:33 -0700 (PDT) Received: from localhost.localdomain (quake.ic.unicamp.br [143.106.7.51]) by mx.google.com with ESMTPS id k30sm58427272ybb.19.2010.05.18.10.08.29 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 18 May 2010 10:08:30 -0700 (PDT) From: Miguel Di Ciurcio Filho To: qemu-devel@nongnu.org Date: Tue, 18 May 2010 14:07:49 -0300 Message-Id: <1274202469-9332-11-git-send-email-miguel.filho@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1274202469-9332-1-git-send-email-miguel.filho@gmail.com> References: <1274202469-9332-1-git-send-email-miguel.filho@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: armbru@redhat.com, lcapitulino@redhat.com Subject: [Qemu-devel] [PATCH v4 10/10] monitor/net: introduce 'info netdevices' with QMP support 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 To make the transition to QMP safe, we leave the current 'info network' command as is, and introduce a new one: 'info netdevices'. After tree series of patches, converting 'info network' to QMP have become difficult, specially due to keep the monitor output compatible, since the network device drivers arbritary write to an string about its state, using no pattern. Each device is represented by a QDict. The returned QObject is a QList containing all devices. (qemu) info netdevices tap.0: vlan=0,script=/etc/kvm/kvm-ifup,downscript=/etc/kvm/kvm-ifdown,model=tap,ifname=tap0 e1000.0: vlan=0,model=e1000,macaddr=52:54:00:12:34:56 QMP sample: { "return":[ { "name":"tap.0", "vlan":0, "info":{ "script":"/etc/kvm/kvm-ifup", "downscript":"/etc/kvm/kvm-ifdown", "model":"tap", "ifname":"tap0" } }, { "name":"e1000.0", "vlan":0, "info":{ "model":"e1000", "macaddr":"52:54:00:12:34:56" } } ] } Signed-off-by: Miguel Di Ciurcio Filho --- monitor.c | 8 ++++++ net.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ net.h | 2 + 3 files changed, 89 insertions(+), 0 deletions(-) diff --git a/monitor.c b/monitor.c index 4c95d7b..0d1a0c1 100644 --- a/monitor.c +++ b/monitor.c @@ -2423,6 +2423,14 @@ static const mon_cmd_t info_cmds[] = { .mhandler.info = do_info_network, }, { + .name = "netdevices", + .args_type = "", + .params = "", + .help = "show information about network devices", + .user_print = do_info_netdevices_print, + .mhandler.info_new = do_info_netdevices, + }, + { .name = "chardev", .args_type = "", .params = "", diff --git a/net.c b/net.c index 9e8a8ab..2757ed2 100644 --- a/net.c +++ b/net.c @@ -34,6 +34,7 @@ #include "monitor.h" #include "sysemu.h" #include "qemu-common.h" +#include "qjson.h" #include "qemu_socket.h" #include "hw/qdev.h" @@ -1266,6 +1267,84 @@ void do_info_network(Monitor *mon) } } +static void netdevices_iter(QObject *obj, void *opaque) +{ + + Monitor *mon = opaque; + QDict *net_device = qobject_to_qdict(obj); + + + monitor_printf(mon, " %s: ", qdict_get_str(net_device, "name")); + + if (qdict_haskey(net_device, "vlan")) { + monitor_printf(mon, "vlan=%d,", (int)qdict_get_int(net_device, "vlan")); + } + + if (qdict_haskey(net_device, "peer")) { + monitor_printf(mon, "peer=%s,", qdict_get_str(net_device, "peer")); + } + + monitor_printf(mon, + qstring_get_str(qdict_to_qstring(qdict_get_qdict(net_device, +"info"), ","))); + + monitor_printf(mon, "\n"); + +} + +void do_info_netdevices_print(Monitor *mon, const QObject *ret_data) +{ + + QList *net_devices; + + net_devices = qobject_to_qlist(ret_data); + + qlist_iter(net_devices, netdevices_iter, mon); + +} + +void do_info_netdevices(Monitor *mon, QObject **ret_data) +{ + VLANState *vlan; + VLANClientState *vc; + QDict *net_device; + QList *device_list; + device_list = qlist_new(); + QObject *obj; + + QTAILQ_FOREACH(vlan, &vlans, next) { + + QTAILQ_FOREACH(vc, &vlan->clients, next) { + + obj = qobject_from_jsonf("{ 'vlan': %d, 'name': %s }", vlan->id, + vc->name); + net_device = qobject_to_qdict(obj); + + QINCREF(vc->info_dict); + qdict_put(net_device, "info", vc->info_dict); + + qlist_append(device_list, net_device); + + } + } + + QTAILQ_FOREACH(vc, &non_vlan_clients, next) { + obj = qobject_from_jsonf("{ 'name': %s }", vc->name); + net_device = qobject_to_qdict(obj); + + QINCREF(vc->info_dict); + qdict_put(net_device, "info", vc->info_dict); + + if (vc->peer) { + qdict_put(net_device, "peer", qstring_from_str(vc->peer->name)); + } + + qlist_append(device_list, net_device); + } + + *ret_data = QOBJECT(device_list); +} + int do_set_link(Monitor *mon, const QDict *qdict, QObject **ret_data) { VLANState *vlan; diff --git a/net.h b/net.h index 4566f7d..9b3700c 100644 --- a/net.h +++ b/net.h @@ -120,6 +120,8 @@ int qemu_find_nic_model(NICInfo *nd, const char * const *models, const char *default_model); void do_info_network(Monitor *mon); +void do_info_netdevices_print(Monitor *mon, const QObject *ret_data); +void do_info_netdevices(Monitor *mon, QObject **ret_data); int do_set_link(Monitor *mon, const QDict *qdict, QObject **ret_data); /* NIC info */