From patchwork Thu Jun 10 21:37:05 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: 55273 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 18B1C1007D2 for ; Fri, 11 Jun 2010 07:51:23 +1000 (EST) Received: from localhost ([127.0.0.1]:36186 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OMpei-000251-Ml for incoming@patchwork.ozlabs.org; Thu, 10 Jun 2010 17:51:20 -0400 Received: from [140.186.70.92] (port=59483 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OMpSn-0000ha-MO for qemu-devel@nongnu.org; Thu, 10 Jun 2010 17:39:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OMpSl-0004ii-Uk for qemu-devel@nongnu.org; Thu, 10 Jun 2010 17:39:01 -0400 Received: from mail-gy0-f173.google.com ([209.85.160.173]:57937) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OMpSl-0004eH-SE for qemu-devel@nongnu.org; Thu, 10 Jun 2010 17:38:59 -0400 Received: by mail-gy0-f173.google.com with SMTP id 5so335726gyd.4 for ; Thu, 10 Jun 2010 14:38:59 -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=9hV/6a9bSXqkaT5J5OkK0dkeR6G2vXojyJFtSnzUOi0=; b=aVHPAkB9F53S17sOPuxsiyaUbBaa2ziDYBQmOPJmKVrkWM/RvQB0B6tusOxR8n5h7W civetM27kK2D3MD2f0D5kkp6RHHONXUOl5fj0L48Oed0JtJ/hlB9zE9EKuUNjgJO9daF ivvw9S0ieII2RIyj3xFQ0IhcaZPZr0jeZvbus= 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=BeO62JmB2VFDz8XprTO8dnNEcDowDoWZx2f7xZ1sAgXBbVpHWOJs+6/KTzKKlm1o+i cCSk9r+1yUdsfTzL7J+1jF5GtwK83uOcfNl5L7nLbbLVLup4k7zJwkoI4hDMMNo5wCuI zwxCVfkHd0QxrB4QCT6mv/NiNs+tB1JLudpxE= Received: by 10.151.18.10 with SMTP id v10mr2682427ybi.51.1276205939627; Thu, 10 Jun 2010 14:38:59 -0700 (PDT) Received: from localhost.localdomain ([189.61.230.202]) by mx.google.com with ESMTPS id v21sm4495622ybk.1.2010.06.10.14.38.56 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 10 Jun 2010 14:38:58 -0700 (PDT) From: Miguel Di Ciurcio Filho To: qemu-devel@nongnu.org Date: Thu, 10 Jun 2010 18:37:05 -0300 Message-Id: <1276205825-1922-9-git-send-email-miguel.filho@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1276205825-1922-1-git-send-email-miguel.filho@gmail.com> References: <1276205825-1922-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, Miguel Di Ciurcio Filho , avi@redhat.com Subject: [Qemu-devel] [PATCH 8/8] monitor/net: introduce 'info netdev' 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 Signed-off-by: Miguel Di Ciurcio Filho --- monitor.c | 8 +++++ net.c | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ net.h | 2 + 3 files changed, 106 insertions(+), 0 deletions(-) diff --git a/monitor.c b/monitor.c index 15b53b9..0038214 100644 --- a/monitor.c +++ b/monitor.c @@ -2425,6 +2425,14 @@ static const mon_cmd_t info_cmds[] = { .mhandler.info = do_info_network, }, { + .name = "netdev", + .args_type = "", + .params = "", + .help = "show information about network backend devices", + .user_print = do_info_netdev_print, + .mhandler.info_new = do_info_netdev, + }, + { .name = "chardev", .args_type = "", .params = "", diff --git a/net.c b/net.c index 4cb93ed..ed68b61 100644 --- a/net.c +++ b/net.c @@ -36,6 +36,8 @@ #include "qemu-common.h" #include "qemu_socket.h" #include "hw/qdev.h" +#include "qdict.h" +#include "qjson.h" static QTAILQ_HEAD(, VLANState) vlans; static QTAILQ_HEAD(, VLANClientState) non_vlan_clients; @@ -1252,6 +1254,100 @@ void do_info_network(Monitor *mon) } } +static void netdev_iter(QObject *obj, void *opaque) +{ + + Monitor *mon = opaque; + QDict *net_device = qobject_to_qdict(obj); + + monitor_printf(mon, "%s: ", qdict_get_str(net_device, "id")); + + monitor_printf(mon, "type=%s,", qdict_get_str(net_device, "type")); + + 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_netdev_print(Monitor *mon, const QObject *ret_data) +{ + + QList *net_devices; + + net_devices = qobject_to_qlist(ret_data); + + qlist_iter(net_devices, netdev_iter, mon); + +} + +void do_info_netdev(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) { + + if (vc->info->type == NET_CLIENT_TYPE_NONE || + vc->info->type == NET_CLIENT_TYPE_NIC || + vc->info->type == NET_CLIENT_TYPE_DUMP) { + continue; + } + + obj = qobject_from_jsonf("{ 'vlan': %d, 'id': %s, 'type': %s}", vlan->id, + vc->name, vc->model); + + 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) { + + if (vc->info->type == NET_CLIENT_TYPE_NONE || + vc->info->type == NET_CLIENT_TYPE_NIC || + vc->info->type == NET_CLIENT_TYPE_DUMP) { + continue; + } + + obj = qobject_from_jsonf("{'id': %s, 'type': %s}", + vc->name, vc->model); + + 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 acc1645..65bbf27 100644 --- a/net.h +++ b/net.h @@ -119,6 +119,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_netdev_print(Monitor *mon, const QObject *ret_data); +void do_info_netdev(Monitor *mon, QObject **ret_data); int do_set_link(Monitor *mon, const QDict *qdict, QObject **ret_data); /* NIC info */