Commit 06150279 authored by Wenchao Xia's avatar Wenchao Xia Committed by Luiz Capitulino
Browse files

qapi event: convert NIC_RX_FILTER_CHANGED 



Param name is declared as optional, since in code it is an optional
one.

Signed-off-by: default avatarWenchao Xia <wenchaoqemu@gmail.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarLuiz Capitulino <lcapitulino@redhat.com>
parent bcada37b

docs/qmp/qmp-events.txt

+0 −17
Original line number Diff line number Diff line
@@ -42,23 +42,6 @@ Example: 
{ "event": "GUEST_PANICKED",

     "data": { "action": "pause" } }



NIC_RX_FILTER_CHANGED

---------------------



The event is emitted once until the query command is executed,

the first event will always be emitted.



Data:



- "name": net client name (json-string)

- "path": device path (json-string)



{ "event": "NIC_RX_FILTER_CHANGED",

  "data": { "name": "vnet0",

            "path": "/machine/peripheral/vnet0/virtio-backend" },

  "timestamp": { "seconds": 1368697518, "microseconds": 326866 } }

}



QUORUM_FAILURE

--------------

hw/net/virtio-net.c

+3 −10
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
#include "net/vhost_net.h"

#include "hw/virtio/virtio-bus.h"

#include "qapi/qmp/qjson.h"

#include "monitor/monitor.h"

#include "qapi-event.h"



#define VIRTIO_NET_VM_VERSION    11
@@ -199,19 +199,12 @@ static void virtio_net_set_link_status(NetClientState *nc) 


static void rxfilter_notify(NetClientState *nc)

{

    QObject *event_data;

    VirtIONet *n = qemu_get_nic_opaque(nc);



    if (nc->rxfilter_notify_enabled) {

        gchar *path = object_get_canonical_path(OBJECT(n->qdev));

        if (n->netclient_name) {

            event_data = qobject_from_jsonf("{ 'name': %s, 'path': %s }",

                                    n->netclient_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);

        qapi_event_send_nic_rx_filter_changed(!!n->netclient_name,

                                              n->netclient_name, path, &error_abort);

        g_free(path);



        /* disable event notification to avoid events flooding */

qapi-event.json

+15 −0
Original line number Diff line number Diff line
@@ -122,3 +122,18 @@ 
##

{ 'event': 'DEVICE_DELETED',

  'data': { '*device': 'str', 'path': 'str' } }



##

# @NIC_RX_FILTER_CHANGED

#

# Emitted once until the 'query-rx-filter' command is executed, the first event

# will always be emitted

#

# @name: #optional, net client name

#

# @path: device path

#

# Since: 1.6

##

{ 'event': 'NIC_RX_FILTER_CHANGED',

  'data': { '*name': 'str', 'path': 'str' } }