aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorDr. David Alan Gilbert <dgilbert@redhat.com>2019-02-27 13:24:05 +0000
committerJason Wang <jasowang@redhat.com>2019-03-05 11:27:41 +0800
commit50510ea2c2960cc48e9cc1676dde88b849933b6e (patch)
treeea82a8203ccb5b9e0a0f10cb0ccd65b34fcd91f3 /net
parent4875bf140662b214ad9f94b0d566354977d8c01d (diff)
downloadqemu-50510ea2c2960cc48e9cc1676dde88b849933b6e.zip
qemu-50510ea2c2960cc48e9cc1676dde88b849933b6e.tar.gz
qemu-50510ea2c2960cc48e9cc1676dde88b849933b6e.tar.bz2
net: Introduce announce timer
The 'announce timer' will be used by migration, and explicit requests for qemu to perform network announces. Based on the work by Germano Veit Michel <germano@redhat.com> and Vlad 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>
Diffstat (limited to 'net')
-rw-r--r--net/Makefile.objs1
-rw-r--r--net/announce.c60
2 files changed, 61 insertions, 0 deletions
diff --git a/net/Makefile.objs b/net/Makefile.objs
index df2b409..8262f03 100644
--- a/net/Makefile.objs
+++ b/net/Makefile.objs
@@ -2,6 +2,7 @@ common-obj-y = net.o queue.o checksum.o util.o hub.o
common-obj-y += socket.o
common-obj-y += dump.o
common-obj-y += eth.o
+common-obj-y += announce.o
common-obj-$(CONFIG_L2TPV3) += l2tpv3.o
common-obj-$(call land,$(CONFIG_VIRTIO_NET),$(CONFIG_VHOST_NET_USER)) += vhost-user.o
common-obj-$(call land,$(call lnot,$(CONFIG_VIRTIO_NET)),$(CONFIG_VHOST_NET_USER)) += vhost-user-stub.o
diff --git a/net/announce.c b/net/announce.c
new file mode 100644
index 0000000..8876eb6
--- /dev/null
+++ b/net/announce.c
@@ -0,0 +1,60 @@
+/*
+ * Self-announce
+ * (c) 2017-2019 Red Hat, Inc.
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ */
+
+#include "qemu/osdep.h"
+#include "qemu-common.h"
+#include "net/announce.h"
+#include "qapi/clone-visitor.h"
+#include "qapi/qapi-visit-net.h"
+
+int64_t qemu_announce_timer_step(AnnounceTimer *timer)
+{
+ int64_t step;
+
+ step = timer->params.initial +
+ (timer->params.rounds - timer->round - 1) *
+ timer->params.step;
+
+ if (step < 0 || step > timer->params.max) {
+ step = timer->params.max;
+ }
+ timer_mod(timer->tm, qemu_clock_get_ms(timer->type) + step);
+
+ return step;
+}
+
+void qemu_announce_timer_del(AnnounceTimer *timer)
+{
+ if (timer->tm) {
+ timer_del(timer->tm);
+ timer_free(timer->tm);
+ timer->tm = NULL;
+ }
+}
+
+/*
+ * Under BQL/main thread
+ * Reset the timer to the given parameters/type/notifier.
+ */
+void qemu_announce_timer_reset(AnnounceTimer *timer,
+ AnnounceParameters *params,
+ QEMUClockType type,
+ QEMUTimerCB *cb,
+ void *opaque)
+{
+ /*
+ * We're under the BQL, so the current timer can't
+ * be firing, so we should be able to delete it.
+ */
+ qemu_announce_timer_del(timer);
+
+ QAPI_CLONE_MEMBERS(AnnounceParameters, &timer->params, params);
+ timer->round = params->rounds;
+ timer->type = type;
+ timer->tm = timer_new_ms(type, cb, opaque);
+}