From patchwork Thu Apr 8 20:16:39 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: 49765 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 60BF7B7D00 for ; Fri, 9 Apr 2010 06:59:26 +1000 (EST) Received: from localhost ([127.0.0.1]:32803 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NzynW-0005XJ-NH for incoming@patchwork.ozlabs.org; Thu, 08 Apr 2010 16:57:58 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nzy8K-0008No-Ht for qemu-devel@nongnu.org; Thu, 08 Apr 2010 16:15:24 -0400 Received: from [140.186.70.92] (port=44426 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nzy8J-0008Nd-4Q for qemu-devel@nongnu.org; Thu, 08 Apr 2010 16:15:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Nzy8H-0004FE-83 for qemu-devel@nongnu.org; Thu, 08 Apr 2010 16:15:23 -0400 Received: from qw-out-1920.google.com ([74.125.92.144]:10575) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Nzy8H-000469-4Q for qemu-devel@nongnu.org; Thu, 08 Apr 2010 16:15:21 -0400 Received: by qw-out-1920.google.com with SMTP id 5so846212qwc.4 for ; Thu, 08 Apr 2010 13:15:21 -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=GlY6a0hdez6woN+AHktmiA0SZCjprrmwpEV5pnL5ffc=; b=K6768s+a/Z9c2B7PIDDJj2c7INyXzyVyR3MgBq/5DHrjhjTDexStk/H1FZLHvw4qjc C0yL6gTCQt3pNgUMI/QQ60FsLkNiHmVeLHorzf+f/mEZWI2oWYJun5QSW1UNBUJRqkU6 bdOmdXg2VoFgoUYvi8WDFZIr1X7LcX4bsCfHc= 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=S9S6fcnapzNRzU865NHmiLbnbTAVXmvxt5ovtTaKnTdqN4rh9pwWV20GMp/21SjzWu xBJiDuP4G+2Ohn9svmUojOn5DdRTluTofCA6D00DVeiqKkQk27GqzW+5Qd+9YyCPhL5H 7jj78LVVCZlhw+kgS9aIV2bfKu5Qrhll/WMY8= Received: by 10.229.191.1 with SMTP id dk1mr965851qcb.18.1270757719508; Thu, 08 Apr 2010 13:15:19 -0700 (PDT) Received: from localhost.localdomain (quake.ic.unicamp.br [143.106.7.51]) by mx.google.com with ESMTPS id w30sm776636qce.4.2010.04.08.13.15.16 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 08 Apr 2010 13:15:18 -0700 (PDT) From: Miguel Di Ciurcio Filho To: qemu-devel@nongnu.org Date: Thu, 8 Apr 2010 17:16:39 -0300 Message-Id: <1270757799-31891-23-git-send-email-miguel.filho@gmail.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1270757799-31891-1-git-send-email-miguel.filho@gmail.com> References: <1270757799-31891-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 22/22] monitor/net: Convert do_info_network() to QObject/QMP 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 Each device is represented by a QDict. The returned QObject is a QList of all devices. This commit slightly changes the monitor output when 'info network' is used. Signed-off-by: Miguel Di Ciurcio Filho --- monitor.c | 3 +- net.c | 133 ++++++++++++++++++++++++++++++++++++++++++++++++++++++------ net.h | 6 ++- 3 files changed, 126 insertions(+), 16 deletions(-) diff --git a/monitor.c b/monitor.c index 822dc27..0b3fdfc 100644 --- a/monitor.c +++ b/monitor.c @@ -2604,7 +2604,8 @@ static const mon_cmd_t info_cmds[] = { .args_type = "", .params = "", .help = "show the network state", - .mhandler.info = do_info_network, + .user_print = do_info_network_print, + .mhandler.info_new = do_info_network, }, { .name = "chardev", diff --git a/net.c b/net.c index ad01732..c59ae5b 100644 --- a/net.c +++ b/net.c @@ -33,10 +33,10 @@ #include "net/util.h" #include "monitor.h" #include "sysemu.h" +#include "qstring.h" #include "qemu-common.h" #include "qemu_socket.h" -#include "qdict.h" -#include "qstring.h" +#include "qemu-objects.h" #include "hw/qdev.h" static QTAILQ_HEAD(, VLANState) vlans; @@ -174,7 +174,7 @@ void qemu_format_nic_info_dict(VLANClientState *vc, uint8_t macaddr[6]) snprintf(mac, 18, "%02x:%02x:%02x:%02x:%02x:%02x", macaddr[0], macaddr[1], macaddr[2], macaddr[3], macaddr[4], macaddr[5]); - + qdict_put(vc->info_dict, "macaddr", qstring_from_str(mac)); qdict_put(vc->info_dict, "model", qstring_from_str(vc->model)); } @@ -1224,26 +1224,131 @@ void net_set_boot_mask(int net_boot_mask) } } -void do_info_network(Monitor *mon) +void vlan_devices_iter(QObject *obj, void *opaque) +{ + + Monitor *mon = opaque; + QDict *net_device = qobject_to_qdict(obj); + + if (!qdict_haskey(net_device, "vlan")) + return; + + monitor_printf(mon, " %s: vlan=%d ", qdict_get_str(net_device, "name"), + (int)qdict_get_int(net_device, "vlan")); + monitor_printf(mon, + qstring_get_str(qdict_to_qstring(qdict_get_qdict(net_device, "info")))); + + monitor_printf(mon, " \n"); +} + +void non_vlan_devices_iter(QObject *obj, void *opaque) +{ + + Monitor *mon = opaque; + QDict *net_device = qobject_to_qdict(obj); + + if (qdict_haskey(net_device, "vlan")) + return; + + monitor_printf(mon, " %s: ", qdict_get_str(net_device, "name")); + + 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_network_print(Monitor *mon, const QObject *ret_data) +{ + QList *qlist; + + qlist = qobject_to_qlist(ret_data); + + monitor_printf(mon, "Devices on VLANs:\n"); + + qlist_iter(qlist, vlan_devices_iter, mon); + + monitor_printf(mon, "Devices not on any VLAN:\n"); + + qlist_iter(qlist, non_vlan_devices_iter, mon); + +} + +/** + * do_network_info(): Network information + * + * Each network device information is stored in a QDict and the + * returned QObject is a QList of all devices. + * + * The QDict contains the following: + * + * - "name": device name + * - "vlan": only present if the device is attached to a VLAN, it is the id + * of the VLAN + * - "info": it is a QDict containing any of the following: + * - "model": type of the device + * - "macaddr": MAC address + * - "script": path to script used to configure the device + * - "downscript": path to script used to deconfigure the device + * - "fd": handle to the device + * - "ifname": name of the host device connected to the guest device + * - "mcast": multicast address + * - "cloned": true if the device is multicast clone + * - "connection_from": IP/port pair of an incomming connection + * - "connect_to": IP/port pair of an outgoing connection + * + * Example: + * + * [ { "name": "tap.0", "vlan": 0, + "info": { "script": "/etc/kvm/kvm-ifup", "downscript": "/etc/qemu-ifdown", + "ifname": "tap0" } }, + { "name": "e1000.0", "vlan": 1, + "info": { "model": "e1000", "macaddr": "52:54:00:12:34:56" } } ] + */ +void do_info_network(Monitor *mon, QObject **ret_data) { VLANState *vlan; VLANClientState *vc; - + QDict *net_device; + QList *device_list; + device_list = qlist_new(); + QTAILQ_FOREACH(vlan, &vlans, next) { - monitor_printf(mon, "VLAN %d devices:\n", vlan->id); - + QObject *obj; + QTAILQ_FOREACH(vc, &vlan->clients, next) { - monitor_printf(mon, " %s: %s\n", vc->name, vc->info_str); + + 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, qobject_to_qdict(obj)); + } } - monitor_printf(mon, "Devices not on any VLAN:\n"); + QTAILQ_FOREACH(vc, &non_vlan_clients, next) { - monitor_printf(mon, " %s: %s", vc->name, vc->info_str); - if (vc->peer) { - monitor_printf(mon, " peer=%s", vc->peer->name); - } - monitor_printf(mon, "\n"); + QObject *obj; + + 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); } void do_set_link(Monitor *mon, const QDict *qdict) diff --git a/net.h b/net.h index b744294..d1cf6ab 100644 --- a/net.h +++ b/net.h @@ -6,6 +6,7 @@ #include "qemu-common.h" #include "qdict.h" #include "qemu-option.h" +#include "qobject.h" #include "net/queue.h" struct MACAddr { @@ -117,7 +118,10 @@ void qemu_check_nic_model(NICInfo *nd, const char *model); int qemu_find_nic_model(NICInfo *nd, const char * const *models, const char *default_model); -void do_info_network(Monitor *mon); +void vlan_devices_iter(QObject *obj, void *opaque); +void non_vlan_devices_iter(QObject *obj, void *opaque); +void do_info_network_print(Monitor *mon, const QObject *ret_data); +void do_info_network(Monitor *mon, QObject **ret_data); void do_set_link(Monitor *mon, const QDict *qdict); /* NIC info */