From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50606) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ViK4O-0007Nz-Hp for qemu-devel@nongnu.org; Mon, 18 Nov 2013 03:20:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ViK4F-0007Uu-ID for qemu-devel@nongnu.org; Mon, 18 Nov 2013 03:20:32 -0500 Received: from mx1.redhat.com ([209.132.183.28]:17102) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ViK4F-0007Uk-9L for qemu-devel@nongnu.org; Mon, 18 Nov 2013 03:20:23 -0500 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id rAI8KMuQ023847 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 18 Nov 2013 03:20:22 -0500 From: Amos Kong Date: Mon, 18 Nov 2013 16:20:12 +0800 Message-Id: <1384762812-22581-1-git-send-email-akong@redhat.com> Subject: [Qemu-devel] [PATCH v2] net: move rxfilter_notify() to net.c List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: vyasevic@redhat.com, stefanha@redhat.com rxfilter_notify() is a generic function for all nics, not only for virtio_net, so move it to net.c Signed-off-by: Amos Kong --- v2: fix the memory leak (Stefan) --- hw/net/virtio-net.c | 32 +++++--------------------------- include/net/net.h | 2 ++ net/net.c | 22 ++++++++++++++++++++++ 3 files changed, 29 insertions(+), 27 deletions(-) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 613f144..cee52ff 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -194,28 +194,6 @@ static void virtio_net_set_link_status(NetClientState *nc) virtio_net_set_status(vdev, vdev->status); } -static void rxfilter_notify(NetClientState *nc) -{ - QObject *event_data; - VirtIONet *n = qemu_get_nic_opaque(nc); - - if (nc->rxfilter_notify_enabled) { - if (n->netclient_name) { - event_data = qobject_from_jsonf("{ 'name': %s, 'path': %s }", - n->netclient_name, - object_get_canonical_path(OBJECT(n->qdev))); - } else { - event_data = qobject_from_jsonf("{ 'path': %s }", - object_get_canonical_path(OBJECT(n->qdev))); - } - monitor_protocol_event(QEVENT_NIC_RX_FILTER_CHANGED, event_data); - qobject_decref(event_data); - - /* disable event notification to avoid events flooding */ - nc->rxfilter_notify_enabled = 0; - } -} - static char *mac_strdup_printf(const uint8_t *mac) { return g_strdup_printf("%.2x:%.2x:%.2x:%.2x:%.2x:%.2x", mac[0], @@ -545,7 +523,7 @@ static int virtio_net_handle_rx_mode(VirtIONet *n, uint8_t cmd, return VIRTIO_NET_ERR; } - rxfilter_notify(nc); + rxfilter_notify(nc, OBJECT(n->qdev)); return VIRTIO_NET_OK; } @@ -601,7 +579,7 @@ static int virtio_net_handle_mac(VirtIONet *n, uint8_t cmd, s = iov_to_buf(iov, iov_cnt, 0, &n->mac, sizeof(n->mac)); assert(s == sizeof(n->mac)); qemu_format_nic_info_str(qemu_get_queue(n->nic), n->mac); - rxfilter_notify(nc); + rxfilter_notify(nc, OBJECT(n->qdev)); return VIRTIO_NET_OK; } @@ -668,12 +646,12 @@ static int virtio_net_handle_mac(VirtIONet *n, uint8_t cmd, n->mac_table.multi_overflow = 1; } - rxfilter_notify(nc); + rxfilter_notify(nc, OBJECT(n->qdev)); return VIRTIO_NET_OK; error: - rxfilter_notify(nc); + rxfilter_notify(nc, OBJECT(n->qdev)); return VIRTIO_NET_ERR; } @@ -700,7 +678,7 @@ static int virtio_net_handle_vlan_table(VirtIONet *n, uint8_t cmd, else return VIRTIO_NET_ERR; - rxfilter_notify(nc); + rxfilter_notify(nc, OBJECT(n->qdev)); return VIRTIO_NET_OK; } diff --git a/include/net/net.h b/include/net/net.h index 11e1468..178db62 100644 --- a/include/net/net.h +++ b/include/net/net.h @@ -8,6 +8,7 @@ #include "net/queue.h" #include "migration/vmstate.h" #include "qapi-types.h" +#include "qom/object.h" #define MAX_QUEUE_NUM 1024 @@ -138,6 +139,7 @@ ssize_t qemu_deliver_packet_iov(NetClientState *sender, void *opaque); void print_net_client(Monitor *mon, NetClientState *nc); +void rxfilter_notify(NetClientState *nc, Object *obj); void do_info_network(Monitor *mon, const QDict *qdict); /* NIC info */ diff --git a/net/net.c b/net/net.c index 0a88e68..341dd2b 100644 --- a/net/net.c +++ b/net/net.c @@ -41,6 +41,7 @@ #include "qapi-visit.h" #include "qapi/opts-visitor.h" #include "qapi/dealloc-visitor.h" +#include "qapi/qmp/qjson.h" /* Net bridge is currently not supported for W32. */ #if !defined(_WIN32) @@ -967,6 +968,27 @@ void print_net_client(Monitor *mon, NetClientState *nc) nc->info_str); } +void rxfilter_notify(NetClientState *nc, Object *obj) +{ + QObject *event_data; + gchar *path = object_get_canonical_path(obj); + + if (nc->rxfilter_notify_enabled) { + if (nc->name) { + event_data = qobject_from_jsonf("{ 'name': %s, 'path': %s }", + nc->name, path); + } else { + event_data = qobject_from_jsonf("{ 'path': %s }", path); + } + monitor_protocol_event(QEVENT_NIC_RX_FILTER_CHANGED, event_data); + qobject_decref(event_data); + + /* disable event notification to avoid events flooding */ + nc->rxfilter_notify_enabled = 0; + } + g_free(path); +} + RxFilterInfoList *qmp_query_rx_filter(bool has_name, const char *name, Error **errp) { -- 1.8.3.1