From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40079) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ur0Mq-0002oO-CK for qemu-devel@nongnu.org; Mon, 24 Jun 2013 02:35:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ur0Mo-0005g1-Uk for qemu-devel@nongnu.org; Mon, 24 Jun 2013 02:35:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51329) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ur0Mo-0005fi-Nm for qemu-devel@nongnu.org; Mon, 24 Jun 2013 02:35:10 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r5O6Z829000629 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 24 Jun 2013 02:35:09 -0400 From: Amos Kong Date: Mon, 24 Jun 2013 14:34:59 +0800 Message-Id: <1372055699-13501-1-git-send-email-akong@redhat.com> Subject: [Qemu-devel] [PATCH for mst/pci] output nc->name in NIC_RX_FILTER_CHANGED event List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: mst@redhat.com Cc: qemu-devel@nongnu.org netclient 'name' entry in event is useful for management to know which device is changed. n->netclient_name is not always set. This patch changes to use nc->name. If we don't assign 'id', qemu will set a generated name to nc->name. Signed-off-by: Amos Kong --- hw/net/virtio-net.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index c88403a..e4d9752 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -200,14 +200,9 @@ static void rxfilter_notify(NetClientState *nc) 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))); - } + event_data = qobject_from_jsonf("{ 'name': %s, 'path': %s }", + nc->name, + object_get_canonical_path(OBJECT(n->qdev))); monitor_protocol_event(QEVENT_NIC_RX_FILTER_CHANGED, event_data); qobject_decref(event_data); -- 1.8.1.4