[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 07/13] virtio-net: Allow qemu_announce_self to trigge
From: |
Jason Wang |
Subject: |
[Qemu-devel] [PULL 07/13] virtio-net: Allow qemu_announce_self to trigger virtio announcements |
Date: |
Fri, 22 Feb 2019 22:55:14 +0800 |
From: "Dr. David Alan Gilbert" <address@hidden>
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 <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
---
hw/net/trace-events | 1 +
hw/net/virtio-net.c | 35 ++++++++++++++++++++++++++++++++---
2 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/hw/net/trace-events b/hw/net/trace-events
index b237d90..3a86004 100644
--- a/hw/net/trace-events
+++ b/hw/net/trace-events
@@ -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)
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index b50f86d..ed0fa97 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -162,15 +162,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)
@@ -2568,6 +2595,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)
@@ -2709,6 +2737,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) {
/*
--
2.5.0
- [Qemu-devel] [PULL 02/13] net: Introduce announce timer, (continued)
- [Qemu-devel] [PULL 02/13] net: Introduce announce timer, Jason Wang, 2019/02/22
- [Qemu-devel] [PULL 05/13] migration: Switch to using announce timer, Jason Wang, 2019/02/22
- [Qemu-devel] [PULL 13/13] net: netmap: improve netmap_receive_iov(), Jason Wang, 2019/02/22
- [Qemu-devel] [PULL 11/13] net: netmap: small improvements netmap_send(), Jason Wang, 2019/02/22
- [Qemu-devel] [PULL 09/13] hmp: Add hmp_announce_self, Jason Wang, 2019/02/22
- [Qemu-devel] [PULL 12/13] net: netmap: simplify netmap_receive(), Jason Wang, 2019/02/22
- [Qemu-devel] [PULL 08/13] qmp: Add announce-self command, Jason Wang, 2019/02/22
- [Qemu-devel] [PULL 06/13] net: Add a network device specific self-announcement ability, Jason Wang, 2019/02/22
- [Qemu-devel] [PULL 10/13] tests: Add a test for qemu self announcements, Jason Wang, 2019/02/22
- [Qemu-devel] [PULL 03/13] migration: Add announce parameters, Jason Wang, 2019/02/22
- [Qemu-devel] [PULL 07/13] virtio-net: Allow qemu_announce_self to trigger virtio announcements,
Jason Wang <=
- [Qemu-devel] [PULL 01/13] net/colo-compare.c: Remove duplicated code, Jason Wang, 2019/02/22
- [Qemu-devel] [PULL 04/13] virtio-net: Switch to using announce timer, Jason Wang, 2019/02/22
- Re: [Qemu-devel] [PULL 00/13] Netpatches, Peter Maydell, 2019/02/26