SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

virtio-net: Allow qemu_announce_self to trigger virtio announcements

Browse Source 
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: Vladislav Yasevich <vyasevic@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
This commit is contained in:
Dr. David Alan Gilbert 2019-02-27 13:24:10 +00:00 committed by Jason Wang
parent 44b416ad62
commit b2c929f02b
2 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/net/trace-events
View File

@ -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" sunhme_rx_xsum_calc(uint16_t xsum) "calculated incoming xsum as 0x%x"
# hw/net/virtio-net.c # hw/net/virtio-net.c
virtio_net_announce_notify(void) ""
virtio_net_announce_timer(int round) "%d" virtio_net_announce_timer(int round) "%d"
virtio_net_handle_announce(int round) "%d" virtio_net_handle_announce(int round) "%d"
virtio_net_post_load_device(void) virtio_net_post_load_device(void)

35
hw/net/virtio-net.c
View File

@ -150,15 +150,42 @@ static bool virtio_net_started(VirtIONet *n, uint8_t status)
(n->status & VIRTIO_NET_S_LINK_UP) && vdev->vm_running; (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) static void virtio_net_announce_timer(void *opaque)
{ {
VirtIONet *n = opaque; VirtIONet *n = opaque;
VirtIODevice *vdev = VIRTIO_DEVICE(n);
trace_virtio_net_announce_timer(n->announce_timer.round); trace_virtio_net_announce_timer(n->announce_timer.round);
n->announce_timer.round--; n->announce_timer.round--;
n->status |= VIRTIO_NET_S_ANNOUNCE; virtio_net_announce_notify(n);
virtio_notify_config(vdev); }
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) static void virtio_net_vhost_status(VirtIONet *n, uint8_t status)
@ -2556,6 +2583,7 @@ static NetClientInfo net_virtio_info = {
.receive = virtio_net_receive, .receive = virtio_net_receive,
.link_status_changed = virtio_net_set_link_status, .link_status_changed = virtio_net_set_link_status,
.query_rx_filter = virtio_net_query_rxfilter, .query_rx_filter = virtio_net_query_rxfilter,
.announce = virtio_net_announce,
}; };
static bool virtio_net_guest_notifier_pending(VirtIODevice *vdev, int idx) 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_announce_timer_reset(&n->announce_timer, migrate_announce_params(),
QEMU_CLOCK_VIRTUAL, QEMU_CLOCK_VIRTUAL,
virtio_net_announce_timer, n); virtio_net_announce_timer, n);
n->announce_timer.round = 0;
if (n->netclient_type) { if (n->netclient_type) {
/* /*