From patchwork Wed Jun 23 15:40:03 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: 56688 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 17164B6F14 for ; Thu, 24 Jun 2010 01:47:48 +1000 (EST) Received: from localhost ([127.0.0.1]:35685 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1ORSAz-0006B1-7k for incoming@patchwork.ozlabs.org; Wed, 23 Jun 2010 11:47:45 -0400 Received: from [140.186.70.92] (port=42050 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1ORS4Z-00039q-Og for qemu-devel@nongnu.org; Wed, 23 Jun 2010 11:41:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1ORS4Y-0006gD-9y for qemu-devel@nongnu.org; Wed, 23 Jun 2010 11:41:07 -0400 Received: from mail-iw0-f173.google.com ([209.85.214.173]:43600) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1ORS4Y-0006aC-5u for qemu-devel@nongnu.org; Wed, 23 Jun 2010 11:41:06 -0400 Received: by mail-iw0-f173.google.com with SMTP id 10so3530042iwn.4 for ; Wed, 23 Jun 2010 08:41:05 -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=mB+d/RRA4QgYeLDF9f/ImJjR3hngTp5uZJbvs/cQO+w=; b=ahp0n28U50+PQ3BKfwzEoJoqherAt14Vrpr8X7biAqO6oTQ/CWjvqZvIkAz8kMjgsh +n3FqyyyQNmNKfh9Xr2RH/nxyAONTd7zKm1xPzRcEVb7msbFNTTrzQwlySMEW/K9j0hM J6jyff6zCMTRiogCBqebBzXDSrHM8xpBqcAkA= 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=B2kdsvx+8DEU1TCF7P01bNJapSdPRiCjqoTrhLVVuMj2Lb5uVZEqG2uTjcLnixLpS4 aZRNelnJ9yj5MgciGSZJ/4G7Pp0VCRQvDbeQGIBE3Qbs3NDvxrHinpWGZjL8qllpSqF0 BomWiqUbgdmvhc+DMH8P4p4xpFZDPN0J0WD9s= Received: by 10.231.124.229 with SMTP id v37mr8868555ibr.184.1277307665639; Wed, 23 Jun 2010 08:41:05 -0700 (PDT) Received: from localhost.localdomain ([189.61.230.202]) by mx.google.com with ESMTPS id u6sm36591518ibu.0.2010.06.23.08.41.02 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 23 Jun 2010 08:41:04 -0700 (PDT) From: Miguel Di Ciurcio Filho To: qemu-devel@nongnu.org Date: Wed, 23 Jun 2010 12:40:03 -0300 Message-Id: <1277307603-28960-8-git-send-email-miguel.filho@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1277307603-28960-1-git-send-email-miguel.filho@gmail.com> References: <1277307603-28960-1-git-send-email-miguel.filho@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: avi@redhat.com, Miguel Di Ciurcio Filho , armbru@redhat.com, lcapitulino@redhat.com Subject: [Qemu-devel] [PATCH 7/7] 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 | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ net.h | 2 + 3 files changed, 80 insertions(+), 0 deletions(-) diff --git a/monitor.c b/monitor.c index 170b269..b44768c 100644 --- a/monitor.c +++ b/monitor.c @@ -2314,6 +2314,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 7daf253..5e0eb0c 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; @@ -1249,6 +1251,74 @@ 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, "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) +{ + VLANClientState *vc; + QDict *net_device; + QList *device_list; + device_list = qlist_new(); + QObject *obj; + + 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_SOCKET || + 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 cfe837f..69a3c9f 100644 --- a/net.h +++ b/net.h @@ -118,6 +118,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 */