From: Markus Armbruster <armbru@redhat.com>

Signed-off-by: Markus Armbruster <armbru@redhat.com>

Signed-off-by: Jason Wang <jasowang@redhat.com>

---

MAINTAINERS | 1 +

1 file changed, 1 insertion(+)

diff --git a/MAINTAINERS b/MAINTAINERS

index XXXXXXX..XXXXXXX 100644

--- a/MAINTAINERS

+++ b/MAINTAINERS

@@ -XXX,XX +XXX,XX @@ M: Jason Wang <jasowang@redhat.com>

S: Maintained

F: net/

F: include/net/

+F: qemu-bridge-helper.c

T: git https://github.com/jasowang/qemu.git net

F: qapi/net.json

--

2.5.0

From: Markus Armbruster <armbru@redhat.com>

Signed-off-by: Markus Armbruster <armbru@redhat.com>

Signed-off-by: Jason Wang <jasowang@redhat.com>

---

qemu-bridge-helper.c | 12 +++++++++++-

1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/qemu-bridge-helper.c b/qemu-bridge-helper.c

index XXXXXXX..XXXXXXX 100644

--- a/qemu-bridge-helper.c

+++ b/qemu-bridge-helper.c

@@ -XXX,XX +XXX,XX @@

*

* This work is licensed under the terms of the GNU GPL, version 2. See

* the COPYING file in the top-level directory.

- *

+ */

+

+/*

+ * Known shortcomings:

+ * - There is no manual page

+ * - The syntax of the ACL file is not documented anywhere

+ * - parse_acl_file() doesn't report fopen() failure properly, fails

+ * to check ferror() after fgets() failure, arbitrarily truncates

+ * long lines, handles whitespace inconsistently, error messages

+ * don't point to the offending file and line, errors in included

+ * files are reported, but otherwise ignored, ...

*/

#include "qemu/osdep.h"

--

2.5.0

From: Cédric Le Goater <clg@kaod.org>

qdev_set_nic_properties() is already used in the Aspeed SoC level to

bind the ftgmac100 device to the netdev.

This is fixing support for multiple net devices.

Signed-off-by: Cédric Le Goater <clg@kaod.org>

Signed-off-by: Jason Wang <jasowang@redhat.com>

---

hw/net/ftgmac100.c | 2 --

1 file changed, 2 deletions(-)

diff --git a/hw/net/ftgmac100.c b/hw/net/ftgmac100.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/net/ftgmac100.c

+++ b/hw/net/ftgmac100.c

@@ -XXX,XX +XXX,XX @@ static void ftgmac100_realize(DeviceState *dev, Error **errp)

sysbus_init_irq(sbd, &s->irq);

qemu_macaddr_default_if_unset(&s->conf.macaddr);

- s->conf.peers.ncs[0] = nd_table[0].netdev;

-

s->nic = qemu_new_nic(&net_ftgmac100_info, &s->conf,

object_get_typename(OBJECT(dev)), DEVICE(dev)->id,

s);

--

2.5.0

From: Stefano Garzarella <sgarzare@redhat.com>

If 'ipv6-prefixlen' is not a number, the current behaviour

produces an assertion failure:

$ qemu-system-x86_64 -net user,ipv6-net=feca::0/a

qemu-system-x86_64: qemu/util/qemu-option.c:1175: qemu_opts_foreach:

Assertion `!errp || !*errp' failed.

Aborted (core dumped)

This patch fixes it, jumping to the end of the function when

'ipv6-prefixlen' is not a number, and printing the more friendly

message:

$ qemu-system-x86_64 -net user,ipv6-net=feca::0/a

qemu-system-x86_64: Parameter 'ipv6-prefixlen' expects a number

Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>

Reviewed-by: Markus Armbruster <armbru@redhat.com>

Signed-off-by: Jason Wang <jasowang@redhat.com>

---

net/net.c | 9 +++++----

1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/net/net.c b/net/net.c

index XXXXXXX..XXXXXXX 100644

--- a/net/net.c

+++ b/net/net.c

@@ -XXX,XX +XXX,XX @@ static int net_client_init(QemuOpts *opts, bool is_netdev, Error **errp)

if (err) {

error_setg(errp, QERR_INVALID_PARAMETER_VALUE,

- "ipv6-prefix", "a number");

- } else {

- qemu_opt_set_number(opts, "ipv6-prefixlen", len,

- &error_abort);

+ "ipv6-prefixlen", "a number");

+ goto out;

}

+

+ qemu_opt_set_number(opts, "ipv6-prefixlen", len, &error_abort);

}

qemu_opt_unset(opts, "ipv6-net");

}

@@ -XXX,XX +XXX,XX @@ static int net_client_init(QemuOpts *opts, bool is_netdev, Error **errp)

qapi_free_NetLegacy(object);

}

+out:

error_propagate(errp, err);

visit_free(v);

return ret;

--

2.5.0

From: Stefano Garzarella <sgarzare@redhat.com>

net_client_init() uses a variable length array to store the prefix

of 'ipv6-net' parameter (e.g. if ipv6-net=fec0::0/64, the prefix

is 'fec0::0').

This patch introduces g_strsplit() to split the 'ipv6-net' parameter,

so we can remove the variable length array.

Suggested-by: Markus Armbruster <armbru@redhat.com>

Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>

Reviewed-by: Markus Armbruster <armbru@redhat.com>

Signed-off-by: Jason Wang <jasowang@redhat.com>

---

net/net.c | 31 +++++++++++++++++++------------

1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/net/net.c b/net/net.c

index XXXXXXX..XXXXXXX 100644

--- a/net/net.c

+++ b/net/net.c

@@ -XXX,XX +XXX,XX @@ static void show_netdevs(void)

static int net_client_init(QemuOpts *opts, bool is_netdev, Error **errp)

{

+ gchar **substrings = NULL;

void *object = NULL;

Error *err = NULL;

int ret = -1;

@@ -XXX,XX +XXX,XX @@ static int net_client_init(QemuOpts *opts, bool is_netdev, Error **errp)

const char *ip6_net = qemu_opt_get(opts, "ipv6-net");

if (ip6_net) {

- char buf[strlen(ip6_net) + 1];

+ char *prefix_addr;

+ unsigned long prefix_len = 64; /* Default 64bit prefix length. */

+

+ substrings = g_strsplit(ip6_net, "/", 2);

+ if (!substrings || !substrings[0]) {

+ error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "ipv6-net",

+ "a valid IPv6 prefix");

+ goto out;

+ }

- if (get_str_sep(buf, sizeof(buf), &ip6_net, '/') < 0) {

- /* Default 64bit prefix length. */

- qemu_opt_set(opts, "ipv6-prefix", ip6_net, &error_abort);

- qemu_opt_set_number(opts, "ipv6-prefixlen", 64, &error_abort);

- } else {

+ prefix_addr = substrings[0];

+

+ if (substrings[1]) {

/* User-specified prefix length. */

- unsigned long len;

int err;

- qemu_opt_set(opts, "ipv6-prefix", buf, &error_abort);

- err = qemu_strtoul(ip6_net, NULL, 10, &len);

-

+ err = qemu_strtoul(substrings[1], NULL, 10, &prefix_len);

if (err) {

error_setg(errp, QERR_INVALID_PARAMETER_VALUE,

"ipv6-prefixlen", "a number");

goto out;

}

-

- qemu_opt_set_number(opts, "ipv6-prefixlen", len, &error_abort);

}

+

+ qemu_opt_set(opts, "ipv6-prefix", prefix_addr, &error_abort);

+ qemu_opt_set_number(opts, "ipv6-prefixlen", prefix_len,

+ &error_abort);

qemu_opt_unset(opts, "ipv6-net");

}

}

@@ -XXX,XX +XXX,XX @@ static int net_client_init(QemuOpts *opts, bool is_netdev, Error **errp)

out:

error_propagate(errp, err);

+ g_strfreev(substrings);

visit_free(v);

return ret;

}

--

2.5.0

From: Stefano Garzarella <sgarzare@redhat.com>

Use the glib function to split host address and port in

the parse_host_port() function.

Suggested-by: Markus Armbruster <armbru@redhat.com>

Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>

Reviewed-by: Markus Armbruster <armbru@redhat.com>

Signed-off-by: Jason Wang <jasowang@redhat.com>

---

net/net.c | 43 +++++++++++++++++++++++++++----------------

1 file changed, 27 insertions(+), 16 deletions(-)

diff --git a/net/net.c b/net/net.c

index XXXXXXX..XXXXXXX 100644

--- a/net/net.c

+++ b/net/net.c

@@ -XXX,XX +XXX,XX @@ static int get_str_sep(char *buf, int buf_size, const char **pp, int sep)

int parse_host_port(struct sockaddr_in *saddr, const char *str,

Error **errp)

{

- char buf[512];

+ gchar **substrings;

struct hostent *he;

- const char *p, *r;

- int port;

+ const char *addr, *p, *r;

+ int port, ret = 0;

- p = str;

- if (get_str_sep(buf, sizeof(buf), &p, ':') < 0) {

+ substrings = g_strsplit(str, ":", 2);

+ if (!substrings || !substrings[0] || !substrings[1]) {

error_setg(errp, "host address '%s' doesn't contain ':' "

"separating host from port", str);

- return -1;

+ ret = -1;

+ goto out;

}

+

+ addr = substrings[0];

+ p = substrings[1];

+

saddr->sin_family = AF_INET;

- if (buf[0] == '\0') {

+ if (addr[0] == '\0') {

saddr->sin_addr.s_addr = 0;

} else {

- if (qemu_isdigit(buf[0])) {

- if (!inet_aton(buf, &saddr->sin_addr)) {

+ if (qemu_isdigit(addr[0])) {

+ if (!inet_aton(addr, &saddr->sin_addr)) {

error_setg(errp, "host address '%s' is not a valid "

- "IPv4 address", buf);

- return -1;

+ "IPv4 address", addr);

+ ret = -1;

+ goto out;

}

} else {

- he = gethostbyname(buf);

+ he = gethostbyname(addr);

if (he == NULL) {

- error_setg(errp, "can't resolve host address '%s'", buf);

- return - 1;

+ error_setg(errp, "can't resolve host address '%s'", addr);

+ ret = -1;

+ goto out;

}

saddr->sin_addr = *(struct in_addr *)he->h_addr;

}

@@ -XXX,XX +XXX,XX @@ int parse_host_port(struct sockaddr_in *saddr, const char *str,

port = strtol(p, (char **)&r, 0);

if (r == p) {

error_setg(errp, "port number '%s' is invalid", p);

- return -1;

+ ret = -1;

+ goto out;

}

saddr->sin_port = htons(port);

- return 0;

+

+out:

+ g_strfreev(substrings);

+ return ret;

}

char *qemu_mac_strdup_printf(const uint8_t *macaddr)

--

2.5.0

From: Stefano Garzarella <sgarzare@redhat.com>

Since the get_str_sep() function is no longer used in

net/net.c, we can remove it.

Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>

Reviewed-by: Markus Armbruster <armbru@redhat.com>

Signed-off-by: Jason Wang <jasowang@redhat.com>

---

net/net.c | 20 --------------------

1 file changed, 20 deletions(-)

diff --git a/net/net.c b/net/net.c

index XXXXXXX..XXXXXXX 100644

--- a/net/net.c

+++ b/net/net.c

@@ -XXX,XX +XXX,XX @@ static QTAILQ_HEAD(, NetClientState) net_clients;

/***********************************************************/

/* network device redirectors */

-static int get_str_sep(char *buf, int buf_size, const char **pp, int sep)

-{

- const char *p, *p1;

- int len;

- p = *pp;

- p1 = strchr(p, sep);

- if (!p1)

- return -1;

- len = p1 - p;

- p1++;

- if (buf_size > 0) {

- if (len > buf_size - 1)

- len = buf_size - 1;

- memcpy(buf, p, len);

- buf[len] = '\0';

- }

- *pp = p1;

- return 0;

-}

-

int parse_host_port(struct sockaddr_in *saddr, const char *str,

Error **errp)

{

--

2.5.0

From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>

Allow the caller to restrict the set of interfaces that announces are

sent on. The default is still to send on all interfaces.

e.g.

{ "execute": "announce-self", "arguments": { "initial": 50, "max": 550, "rounds": 5, "step": 50, "interfaces": ["vn2", "vn1"] } }

This doesn't affect the behaviour of migraiton announcments.

Note: There's still only one timer for the qmp command, so that

performing an 'announce-self' on one list of interfaces followed

by another 'announce-self' on another list will stop the announces

on the existing set.

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

Signed-off-by: Jason Wang <jasowang@redhat.com>

---

include/net/announce.h | 2 +-

net/announce.c | 39 ++++++++++++++++++++++++++++++++-------

net/trace-events | 2 +-

qapi/net.json | 11 ++++++++---

4 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/include/net/announce.h b/include/net/announce.h

index XXXXXXX..XXXXXXX 100644

--- a/include/net/announce.h

+++ b/include/net/announce.h

@@ -XXX,XX +XXX,XX @@ struct AnnounceTimer {

/* Returns: update the timer to the next time point */

int64_t qemu_announce_timer_step(AnnounceTimer *timer);

-/* Delete the underlying timer */

+/* Delete the underlying timer and other data */

void qemu_announce_timer_del(AnnounceTimer *timer);

/*

diff --git a/net/announce.c b/net/announce.c

index XXXXXXX..XXXXXXX 100644

--- a/net/announce.c

+++ b/net/announce.c

@@ -XXX,XX +XXX,XX @@ void qemu_announce_timer_del(AnnounceTimer *timer)

timer_free(timer->tm);

timer->tm = NULL;

}

+ qapi_free_strList(timer->params.interfaces);

+ timer->params.interfaces = NULL;

}

/*

@@ -XXX,XX +XXX,XX @@ static int announce_self_create(uint8_t *buf,

static void qemu_announce_self_iter(NICState *nic, void *opaque)

{

+ AnnounceTimer *timer = opaque;

uint8_t buf[60];

int len;

+ bool skip;

+

+ if (timer->params.has_interfaces) {

+ strList *entry = timer->params.interfaces;

+ /* Skip unless we find our name in the requested list */

+ skip = true;

+

+ while (entry) {

+ if (!strcmp(entry->value, nic->ncs->name)) {

+ /* Found us */

+ skip = false;

+ break;

+ }

+ entry = entry->next;

+ }

+ } else {

+ skip = false;

+ }

+

+ trace_qemu_announce_self_iter(nic->ncs->name,

+ qemu_ether_ntoa(&nic->conf->macaddr), skip);

- trace_qemu_announce_self_iter(qemu_ether_ntoa(&nic->conf->macaddr));

- len = announce_self_create(buf, nic->conf->macaddr.a);

+ if (!skip) {

+ len = announce_self_create(buf, nic->conf->macaddr.a);

- qemu_send_packet_raw(qemu_get_queue(nic), buf, len);

+ qemu_send_packet_raw(qemu_get_queue(nic), buf, len);

- /* if the NIC provides it's own announcement support, use it as well */

- if (nic->ncs->info->announce) {

- nic->ncs->info->announce(nic->ncs);

+ /* if the NIC provides it's own announcement support, use it as well */

+ if (nic->ncs->info->announce) {

+ nic->ncs->info->announce(nic->ncs);

+ }

}

}

static void qemu_announce_self_once(void *opaque)

{

AnnounceTimer *timer = (AnnounceTimer *)opaque;

- qemu_foreach_nic(qemu_announce_self_iter, NULL);

+ qemu_foreach_nic(qemu_announce_self_iter, timer);

if (--timer->round) {

qemu_announce_timer_step(timer);

diff --git a/net/trace-events b/net/trace-events

index XXXXXXX..XXXXXXX 100644

--- a/net/trace-events

+++ b/net/trace-events

@@ -XXX,XX +XXX,XX @@

# See docs/devel/tracing.txt for syntax documentation.

# announce.c

-qemu_announce_self_iter(const char *mac) "%s"

+qemu_announce_self_iter(const char *name, const char *mac, int skip) "%s:%s skip: %d"

# vhost-user.c

vhost_user_event(const char *chr, int event) "chr: %s got event: %d"

diff --git a/qapi/net.json b/qapi/net.json

index XXXXXXX..XXXXXXX 100644

--- a/qapi/net.json

+++ b/qapi/net.json

@@ -XXX,XX +XXX,XX @@

#

# @step: Delay increase (in ms) after each self-announcement attempt

#

+# @interfaces: An optional list of interface names, which restricts the

+# announcement to the listed interfaces. (Since 4.1)

+#

# Since: 4.0

##

@@ -XXX,XX +XXX,XX @@

'data': { 'initial': 'int',

'max': 'int',

'rounds': 'int',

- 'step': 'int' } }

+ 'step': 'int',

+ '*interfaces': ['str'] } }

##

# @announce-self:

@@ -XXX,XX +XXX,XX @@

#

# Example:

#

-# -> { "execute": "announce-self"

+# -> { "execute": "announce-self",

# "arguments": {

-# "initial": 50, "max": 550, "rounds": 10, "step": 50 } }

+# "initial": 50, "max": 550, "rounds": 10, "step": 50,

+# "interfaces": ["vn2", "vn3"] } }

# <- { "return": {} }

#

# Since: 4.0

--

2.5.0

From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>

Previously there was a single instance of the timer used by

monitor triggered announces, that's OK, but when combined with the

previous change that lets you have announces for subsets of interfaces

it's a bit restrictive if you want to do different things to different

interfaces.

Add an 'id' field to the announce, and maintain a list of the

timers based on id.

This allows you to for example:

a) Start an announce going on interface eth0 for a long time

b) Start an announce going on interface eth1 for a long time

c) Kill the announce on eth0 while leaving eth1 going.

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

Signed-off-by: Jason Wang <jasowang@redhat.com>

---

hw/net/virtio-net.c | 4 ++--

include/net/announce.h | 8 ++++++--

net/announce.c | 52 +++++++++++++++++++++++++++++++++++++++++++-------

net/trace-events | 3 ++-

qapi/net.json | 9 +++++++--

5 files changed, 62 insertions(+), 14 deletions(-)

diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/net/virtio-net.c

+++ b/hw/net/virtio-net.c

@@ -XXX,XX +XXX,XX @@ static int virtio_net_post_load_device(void *opaque, int version_id)

timer_mod(n->announce_timer.tm,

qemu_clock_get_ms(n->announce_timer.type));

} else {

- qemu_announce_timer_del(&n->announce_timer);

+ qemu_announce_timer_del(&n->announce_timer, false);

}

}

@@ -XXX,XX +XXX,XX @@ static void virtio_net_device_unrealize(DeviceState *dev, Error **errp)

virtio_net_del_queue(n, i);

}

- qemu_announce_timer_del(&n->announce_timer);

+ qemu_announce_timer_del(&n->announce_timer, false);

g_free(n->vqs);

qemu_del_nic(n->nic);

virtio_net_rsc_cleanup(n);

diff --git a/include/net/announce.h b/include/net/announce.h

index XXXXXXX..XXXXXXX 100644

--- a/include/net/announce.h

+++ b/include/net/announce.h

@@ -XXX,XX +XXX,XX @@ struct AnnounceTimer {

/* Returns: update the timer to the next time point */

int64_t qemu_announce_timer_step(AnnounceTimer *timer);

-/* Delete the underlying timer and other data */

-void qemu_announce_timer_del(AnnounceTimer *timer);

+/*

+ * Delete the underlying timer and other data

+ * If 'free_named' true and the timer is a named timer, then remove

+ * it from the list of named timers and free the AnnounceTimer itself.

+ */

+void qemu_announce_timer_del(AnnounceTimer *timer, bool free_named);

/*

* Under BQL/main thread

diff --git a/net/announce.c b/net/announce.c

index XXXXXXX..XXXXXXX 100644

--- a/net/announce.c

+++ b/net/announce.c

@@ -XXX,XX +XXX,XX @@

#include "qapi/qapi-commands-net.h"

#include "trace.h"

+static GData *named_timers;

+

int64_t qemu_announce_timer_step(AnnounceTimer *timer)

{

int64_t step;

@@ -XXX,XX +XXX,XX @@ int64_t qemu_announce_timer_step(AnnounceTimer *timer)

return step;

}

-void qemu_announce_timer_del(AnnounceTimer *timer)

+/*

+ * If 'free_named' is true, then remove the timer from the list

+ * and free the timer itself.

+ */

+void qemu_announce_timer_del(AnnounceTimer *timer, bool free_named)

{

+ bool free_timer = false;

if (timer->tm) {

timer_del(timer->tm);

timer_free(timer->tm);

@@ -XXX,XX +XXX,XX @@ void qemu_announce_timer_del(AnnounceTimer *timer)

}

qapi_free_strList(timer->params.interfaces);

timer->params.interfaces = NULL;

+ if (free_named && timer->params.has_id) {

+ AnnounceTimer *list_timer;

+ /*

+ * Sanity check: There should only be one timer on the list with

+ * the id.

+ */

+ list_timer = g_datalist_get_data(&named_timers, timer->params.id);

+ assert(timer == list_timer);

+ free_timer = true;

+ g_datalist_remove_data(&named_timers, timer->params.id);

+ }

+ trace_qemu_announce_timer_del(free_named, free_timer, timer->params.id);

+ g_free(timer->params.id);

+ timer->params.id = NULL;

+

+ if (free_timer) {

+ g_free(timer);

+ }

}

/*

@@ -XXX,XX +XXX,XX @@ void qemu_announce_timer_reset(AnnounceTimer *timer,

* 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);

+ qemu_announce_timer_del(timer, false);

QAPI_CLONE_MEMBERS(AnnounceParameters, &timer->params, params);

timer->round = params->rounds;

@@ -XXX,XX +XXX,XX @@ static void qemu_announce_self_iter(NICState *nic, void *opaque)

skip = false;

}

- trace_qemu_announce_self_iter(nic->ncs->name,

+ trace_qemu_announce_self_iter(timer->params.has_id ? timer->params.id : "_",

+ nic->ncs->name,

qemu_ether_ntoa(&nic->conf->macaddr), skip);

if (!skip) {

@@ -XXX,XX +XXX,XX @@ static void qemu_announce_self_once(void *opaque)

if (--timer->round) {

qemu_announce_timer_step(timer);

} else {

- qemu_announce_timer_del(timer);

+ qemu_announce_timer_del(timer, true);

}

}

@@ -XXX,XX +XXX,XX @@ void qemu_announce_self(AnnounceTimer *timer, AnnounceParameters *params)

if (params->rounds) {

qemu_announce_self_once(timer);

} else {

- qemu_announce_timer_del(timer);

+ qemu_announce_timer_del(timer, true);

}

}

void qmp_announce_self(AnnounceParameters *params, Error **errp)

{

- static AnnounceTimer announce_timer;

- qemu_announce_self(&announce_timer, params);

+ AnnounceTimer *named_timer;

+ if (!params->has_id) {

+ params->id = g_strdup("");

+ params->has_id = true;

+ }

+

+ named_timer = g_datalist_get_data(&named_timers, params->id);

+

+ if (!named_timer) {

+ named_timer = g_new0(AnnounceTimer, 1);

+ g_datalist_set_data(&named_timers, params->id, named_timer);

+ }

+

+ qemu_announce_self(named_timer, params);

}

diff --git a/net/trace-events b/net/trace-events

index XXXXXXX..XXXXXXX 100644

--- a/net/trace-events

+++ b/net/trace-events

@@ -XXX,XX +XXX,XX @@

# See docs/devel/tracing.txt for syntax documentation.

# announce.c

-qemu_announce_self_iter(const char *name, const char *mac, int skip) "%s:%s skip: %d"

+qemu_announce_self_iter(const char *id, const char *name, const char *mac, int skip) "%s:%s:%s skip: %d"

+qemu_announce_timer_del(bool free_named, bool free_timer, char *id) "free named: %d free timer: %d id: %s"

# vhost-user.c

vhost_user_event(const char *chr, int event) "chr: %s got event: %d"

diff --git a/qapi/net.json b/qapi/net.json

index XXXXXXX..XXXXXXX 100644

--- a/qapi/net.json

+++ b/qapi/net.json

@@ -XXX,XX +XXX,XX @@

# @interfaces: An optional list of interface names, which restricts the

# announcement to the listed interfaces. (Since 4.1)

#

+# @id: A name to be used to identify an instance of announce-timers

+# and to allow it to modified later. Not for use as

+# part of the migration parameters. (Since 4.1)

+#

# Since: 4.0

##

@@ -XXX,XX +XXX,XX @@

'max': 'int',

'rounds': 'int',

'step': 'int',

- '*interfaces': ['str'] } }

+ '*interfaces': ['str'],

+ '*id' : 'str' } }

##

# @announce-self:

@@ -XXX,XX +XXX,XX @@

# -> { "execute": "announce-self",

# "arguments": {

# "initial": 50, "max": 550, "rounds": 10, "step": 50,

-# "interfaces": ["vn2", "vn3"] } }

+# "interfaces": ["vn2", "vn3"], "id": "bob" } }

# <- { "return": {} }

#

# Since: 4.0

--

2.5.0

From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>

Add the optional ID to the HMP command.

e.g.

# start an announce for a long time on eth1

migrate_set_parameter announce-rounds 1000

announce_self "eth1" e1

# start an announce on eth2

announce_self "eth2" e2

# Change e1 to be announcing on eth1 and eth3

announce_self "eth1,eth3" e1

# Cancel e1

migrate_set_parameter announce-rounds 0

announce_self "" e1

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

Signed-off-by: Jason Wang <jasowang@redhat.com>

---

hmp-commands.hx | 7 ++++---

monitor/hmp-cmds.c | 3 +++

2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/hmp-commands.hx b/hmp-commands.hx

index XXXXXXX..XXXXXXX 100644

--- a/hmp-commands.hx

+++ b/hmp-commands.hx

@@ -XXX,XX +XXX,XX @@ ETEXI

{

.name = "announce_self",

- .args_type = "interfaces:s?",

- .params = "[interfaces]",

+ .args_type = "interfaces:s?,id:s?",

+ .params = "[interfaces] [id]",

.help = "Trigger GARP/RARP announcements",

.cmd = hmp_announce_self,

},

@@ -XXX,XX +XXX,XX @@ Trigger a round of GARP/RARP broadcasts; this is useful for explicitly updating

network infrastructure after a reconfiguration or some forms of migration.

The timings of the round are set by the migration announce parameters.

An optional comma separated @var{interfaces} list restricts the announce to the

-named set of interfaces.

+named set of interfaces. An optional @var{id} can be used to start a separate announce

+timer and to change the parameters of it later.

ETEXI

{

diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c

index XXXXXXX..XXXXXXX 100644

--- a/monitor/hmp-cmds.c

+++ b/monitor/hmp-cmds.c

@@ -XXX,XX +XXX,XX @@ void hmp_info_snapshots(Monitor *mon, const QDict *qdict)

void hmp_announce_self(Monitor *mon, const QDict *qdict)

{

const char *interfaces_str = qdict_get_try_str(qdict, "interfaces");

+ const char *id = qdict_get_try_str(qdict, "id");

AnnounceParameters *params = QAPI_CLONE(AnnounceParameters,

migrate_announce_params());

qapi_free_strList(params->interfaces);

params->interfaces = strList_from_comma_list(interfaces_str);

params->has_interfaces = params->interfaces != NULL;

+ params->id = g_strdup(id);

+ params->has_id = !!params->id;

qmp_announce_self(params, NULL);

qapi_free_AnnounceParameters(params);

}

--

2.5.0

From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>

Expand self-announce test to check we can stop an announce timer.

We set it up to send 300 packets, but after we receive

the first one we tell it to stop.

We error if:

a) We receive more than 30 of the packets

b) We're still receiving packets after a lot longer than the

30 seconds should have arrived

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

Signed-off-by: Jason Wang <jasowang@redhat.com>

---

tests/virtio-net-test.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++---

1 file changed, 54 insertions(+), 3 deletions(-)

diff --git a/tests/virtio-net-test.c b/tests/virtio-net-test.c

index XXXXXXX..XXXXXXX 100644

--- a/tests/virtio-net-test.c

+++ b/tests/virtio-net-test.c

@@ -XXX,XX +XXX,XX @@ static void announce_self(void *obj, void *data, QGuestAllocator *t_alloc)

QDict *rsp;

int ret;

uint16_t *proto = (uint16_t *)&buffer[12];

+ size_t total_received = 0;

+ uint64_t start, now, last_rxt, deadline;

+ /* Send a set of packets over a few second period */

rsp = qmp("{ 'execute' : 'announce-self', "

" 'arguments': {"

- " 'initial': 50, 'max': 550,"

- " 'rounds': 10, 'step': 50 } }");

+ " 'initial': 20, 'max': 100,"

+ " 'rounds': 300, 'step': 10, 'id': 'bob' } }");

assert(!qdict_haskey(rsp, "error"));

qobject_unref(rsp);

- /* Catch the packet and make sure it's a RARP */

+ /* Catch the first packet and make sure it's a RARP */

ret = qemu_recv(sv[0], &len, sizeof(len), 0);

g_assert_cmpint(ret, ==, sizeof(len));

len = ntohl(len);

ret = qemu_recv(sv[0], buffer, len, 0);

g_assert_cmpint(*proto, ==, htons(ETH_P_RARP));

+

+ /*

+ * Stop the announcment by settings rounds to 0 on the

+ * existing timer.

+ */

+ rsp = qmp("{ 'execute' : 'announce-self', "

+ " 'arguments': {"

+ " 'initial': 20, 'max': 100,"

+ " 'rounds': 0, 'step': 10, 'id': 'bob' } }");

+ assert(!qdict_haskey(rsp, "error"));

+ qobject_unref(rsp);

+

+ /* Now make sure the packets stop */

+

+ /* Times are in us */

+ start = g_get_monotonic_time();

+ /* 30 packets, max gap 100ms, * 4 for wiggle */

+ deadline = start + 1000 * (100 * 30 * 4);

+ last_rxt = start;

+

+ while (true) {

+ int saved_err;

+ ret = qemu_recv(sv[0], buffer, 60, MSG_DONTWAIT);

+ saved_err = errno;

+ now = g_get_monotonic_time();

+ g_assert_cmpint(now, <, deadline);

+

+ if (ret >= 0) {

+ if (ret) {

+ last_rxt = now;

+ }

+ total_received += ret;

+

+ /* Check it's not spewing loads */

+ g_assert_cmpint(total_received, <, 60 * 30 * 2);

+ } else {

+ g_assert_cmpint(saved_err, ==, EAGAIN);

+

+ /* 400ms, i.e. 4 worst case gaps */

+ if ((now - last_rxt) > (1000 * 100 * 4)) {

+ /* Nothings arrived for a while - must have stopped */

+ break;

+ };

+

+ /* 100ms */

+ g_usleep(1000 * 100);

+ }

+ };

}

static void virtio_net_test_cleanup(void *sockets)

--

2.5.0

From: Zhang Chen <chen.zhang@intel.com>

We add the "notify_dev=chardevID" parameter. After that colo-compare can connect with

remote(currently just for Xen, KVM-COLO didn't need it.) colo-frame through chardev socket,

it can notify remote(Xen) colo-frame to handle checkpoint event.

Signed-off-by: Zhang Chen <chen.zhang@intel.com>

Signed-off-by: Jason Wang <jasowang@redhat.com>

---

net/colo-compare.c | 21 +++++++++++++++++++++

qemu-options.hx | 33 ++++++++++++++++++++++++++++++++-

2 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/net/colo-compare.c b/net/colo-compare.c

index XXXXXXX..XXXXXXX 100644

--- a/net/colo-compare.c

+++ b/net/colo-compare.c

@@ -XXX,XX +XXX,XX @@ typedef struct CompareState {

char *pri_indev;

char *sec_indev;

char *outdev;

+ char *notify_dev;

CharBackend chr_pri_in;

CharBackend chr_sec_in;

CharBackend chr_out;

@@ -XXX,XX +XXX,XX @@ static void compare_set_vnet_hdr(Object *obj,

s->vnet_hdr = value;

}

+static char *compare_get_notify_dev(Object *obj, Error **errp)

+{

+ CompareState *s = COLO_COMPARE(obj);

+

+ return g_strdup(s->notify_dev);

+}

+

+static void compare_set_notify_dev(Object *obj, const char *value, Error **errp)

+{

+ CompareState *s = COLO_COMPARE(obj);

+

+ g_free(s->notify_dev);

+ s->notify_dev = g_strdup(value);

+}

+

static void compare_pri_rs_finalize(SocketReadState *pri_rs)

{

CompareState *s = container_of(pri_rs, CompareState, pri_rs);

@@ -XXX,XX +XXX,XX @@ static void colo_compare_init(Object *obj)

(Object **)&s->iothread,

object_property_allow_set_link,

OBJ_PROP_LINK_STRONG, NULL);

+ /* This parameter just for Xen COLO */

+ object_property_add_str(obj, "notify_dev",

+ compare_get_notify_dev, compare_set_notify_dev,

+ NULL);

s->vnet_hdr = false;

object_property_add_bool(obj, "vnet_hdr_support", compare_get_vnet_hdr,

@@ -XXX,XX +XXX,XX @@ static void colo_compare_finalize(Object *obj)

g_free(s->pri_indev);

g_free(s->sec_indev);

g_free(s->outdev);

+ g_free(s->notify_dev);

}

static const TypeInfo colo_compare_info = {

diff --git a/qemu-options.hx b/qemu-options.hx

index XXXXXXX..XXXXXXX 100644

--- a/qemu-options.hx

+++ b/qemu-options.hx

@@ -XXX,XX +XXX,XX @@ Dump the network traffic on netdev @var{dev} to the file specified by

The file format is libpcap, so it can be analyzed with tools such as tcpdump

or Wireshark.

-@item -object colo-compare,id=@var{id},primary_in=@var{chardevid},secondary_in=@var{chardevid},outdev=@var{chardevid},iothread=@var{id}[,vnet_hdr_support]

+@item -object colo-compare,id=@var{id},primary_in=@var{chardevid},secondary_in=@var{chardevid},outdev=@var{chardevid},iothread=@var{id}[,vnet_hdr_support][,notify_dev=@var{id}]

Colo-compare gets packet from primary_in@var{chardevid} and secondary_in@var{chardevid}, than compare primary packet with

secondary packet. If the packets are same, we will output primary

@@ -XXX,XX +XXX,XX @@ do checkpoint and send primary packet to outdev@var{chardevid}.

In order to improve efficiency, we need to put the task of comparison

in another thread. If it has the vnet_hdr_support flag, colo compare

will send/recv packet with vnet_hdr_len.

+If you want to use Xen COLO, will need the notify_dev to notify Xen

+colo-frame to do checkpoint.

we must use it with the help of filter-mirror and filter-redirector.

@example

+KVM COLO

+

primary:

-netdev tap,id=hn0,vhost=off,script=/etc/qemu-ifup,downscript=/etc/qemu-ifdown

-device e1000,id=e0,netdev=hn0,mac=52:a4:00:12:78:66

@@ -XXX,XX +XXX,XX @@ secondary:

-object filter-redirector,id=f1,netdev=hn0,queue=tx,indev=red0

-object filter-redirector,id=f2,netdev=hn0,queue=rx,outdev=red1

+

+Xen COLO

+

+primary:

+-netdev tap,id=hn0,vhost=off,script=/etc/qemu-ifup,downscript=/etc/qemu-ifdown

+-device e1000,id=e0,netdev=hn0,mac=52:a4:00:12:78:66

+-chardev socket,id=mirror0,host=3.3.3.3,port=9003,server,nowait

+-chardev socket,id=compare1,host=3.3.3.3,port=9004,server,nowait

+-chardev socket,id=compare0,host=3.3.3.3,port=9001,server,nowait

+-chardev socket,id=compare0-0,host=3.3.3.3,port=9001

+-chardev socket,id=compare_out,host=3.3.3.3,port=9005,server,nowait

+-chardev socket,id=compare_out0,host=3.3.3.3,port=9005

+-chardev socket,id=notify_way,host=3.3.3.3,port=9009,server,nowait

+-object filter-mirror,id=m0,netdev=hn0,queue=tx,outdev=mirror0

+-object filter-redirector,netdev=hn0,id=redire0,queue=rx,indev=compare_out

+-object filter-redirector,netdev=hn0,id=redire1,queue=rx,outdev=compare0

+-object iothread,id=iothread1

+-object colo-compare,id=comp0,primary_in=compare0-0,secondary_in=compare1,outdev=compare_out0,notify_dev=nofity_way,iothread=iothread1

+

+secondary:

+-netdev tap,id=hn0,vhost=off,script=/etc/qemu-ifup,down script=/etc/qemu-ifdown

+-device e1000,netdev=hn0,mac=52:a4:00:12:78:66

+-chardev socket,id=red0,host=3.3.3.3,port=9003

+-chardev socket,id=red1,host=3.3.3.3,port=9004

+-object filter-redirector,id=f1,netdev=hn0,queue=tx,indev=red0

+-object filter-redirector,id=f2,netdev=hn0,queue=rx,outdev=red1

+

@end example

If you want to know the detail of above command line, you can read

--

2.5.0

From: Zhang Chen <chen.zhang@intel.com>

Add chardev handler to send notification to remote(current from Xen) colo-frame.

Signed-off-by: Zhang Chen <chen.zhang@intel.com>

Signed-off-by: Jason Wang <jasowang@redhat.com>

---

net/colo-compare.c | 39 +++++++++++++++++++++++++++++++++++++++

1 file changed, 39 insertions(+)

diff --git a/net/colo-compare.c b/net/colo-compare.c

index XXXXXXX..XXXXXXX 100644

--- a/net/colo-compare.c

+++ b/net/colo-compare.c

@@ -XXX,XX +XXX,XX @@ typedef struct CompareState {

CharBackend chr_pri_in;

CharBackend chr_sec_in;

CharBackend chr_out;

+ CharBackend chr_notify_dev;

SocketReadState pri_rs;

SocketReadState sec_rs;

+ SocketReadState notify_rs;