Commit b2c929f0 authored by Dr. David Alan Gilbert's avatar Dr. David Alan Gilbert Committed by Jason Wang
Browse files

virtio-net: Allow qemu_announce_self to trigger virtio announcements 



Expose the virtio-net self announcement capability and allow
qemu_announce_self() to call it.

These announces are caused by something external (i.e. the
announce-self command); they won't trigger if the migration
counter is triggering announces at the same time.

Signed-off-by: default avatarVladislav Yasevich <vyasevic@redhat.com>
Signed-off-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
parent 44b416ad

hw/net/trace-events

+1 −0
Original line number Diff line number Diff line
@@ -361,6 +361,7 @@ sunhme_rx_desc(uint32_t addr, int offset, uint32_t status, int len, int cr, int 
sunhme_rx_xsum_calc(uint16_t xsum) "calculated incoming xsum as 0x%x"



# hw/net/virtio-net.c

virtio_net_announce_notify(void) ""

virtio_net_announce_timer(int round) "%d"

virtio_net_handle_announce(int round) "%d"

virtio_net_post_load_device(void)

hw/net/virtio-net.c

+32 −3
Original line number Diff line number Diff line
@@ -150,15 +150,42 @@ static bool virtio_net_started(VirtIONet *n, uint8_t status) 
        (n->status & VIRTIO_NET_S_LINK_UP) && vdev->vm_running;

}



static void virtio_net_announce_notify(VirtIONet *net)

{

    VirtIODevice *vdev = VIRTIO_DEVICE(net);

    trace_virtio_net_announce_notify();



    net->status |= VIRTIO_NET_S_ANNOUNCE;

    virtio_notify_config(vdev);

}



static void virtio_net_announce_timer(void *opaque)

{

    VirtIONet *n = opaque;

    VirtIODevice *vdev = VIRTIO_DEVICE(n);

    trace_virtio_net_announce_timer(n->announce_timer.round);



    n->announce_timer.round--;

    n->status |= VIRTIO_NET_S_ANNOUNCE;

    virtio_notify_config(vdev);

    virtio_net_announce_notify(n);

}



static void virtio_net_announce(NetClientState *nc)

{

    VirtIONet *n = qemu_get_nic_opaque(nc);

    VirtIODevice *vdev = VIRTIO_DEVICE(n);



    /*

     * Make sure the virtio migration announcement timer isn't running

     * If it is, let it trigger announcement so that we do not cause

     * confusion.

     */

    if (n->announce_timer.round) {

        return;

    }



    if (virtio_vdev_has_feature(vdev, VIRTIO_NET_F_GUEST_ANNOUNCE) &&

        virtio_vdev_has_feature(vdev, VIRTIO_NET_F_CTRL_VQ)) {

            virtio_net_announce_notify(n);

    }

}



static void virtio_net_vhost_status(VirtIONet *n, uint8_t status)
@@ -2556,6 +2583,7 @@ static NetClientInfo net_virtio_info = { 
    .receive = virtio_net_receive,

    .link_status_changed = virtio_net_set_link_status,

    .query_rx_filter = virtio_net_query_rxfilter,

    .announce = virtio_net_announce,

};



static bool virtio_net_guest_notifier_pending(VirtIODevice *vdev, int idx)
@@ -2692,6 +2720,7 @@ static void virtio_net_device_realize(DeviceState *dev, Error **errp) 
    qemu_announce_timer_reset(&n->announce_timer, migrate_announce_params(),

                              QEMU_CLOCK_VIRTUAL,

                              virtio_net_announce_timer, n);

    n->announce_timer.round = 0;



    if (n->netclient_type) {

        /*