The following changes since commit 7d0e02405fc02a181319b1ab8681d2f72246b7c6:

Merge remote-tracking branch 'remotes/vivier2/tags/trivial-patches-pull-request' into staging (2019-07-01 17:40:32 +0100)

for you to fetch changes up to 0e8818f023616677416840d6ddc880db8de3c967:

migration/colo.c: Add missed filter notify for Xen COLO. (2019-07-02 10:21:07 +0800)

Cédric Le Goater (1):

ftgmac100: do not link to netdev

Dr. David Alan Gilbert (5):

net/announce: Allow optional list of interfaces

net/announce: Add HMP optional interface list

net/announce: Add optional ID

net/announce: Add HMP optional ID

net/announce: Expand test for stopping self announce

Markus Armbruster (2):

MAINTAINERS: Add qemu-bridge-helper.c to "Network device backends"

qemu-bridge-helper: Document known shortcomings

Stefano Garzarella (4):

net: fix assertion failure when ipv6-prefixlen is not a number

net: avoid using variable length array in net_client_init()

net: use g_strsplit() for parsing host address and port

net: remove unused get_str_sep() function

Zhang Chen (5):

COLO-compare: Add new parameter to communicate with remote colo-frame

COLO-compare: Add remote notification chardev handler frame

COLO-compare: Make the compare_chr_send() can send notification message.

COLO-compare: Add colo-compare remote notify support

migration/colo.c: Add missed filter notify for Xen COLO.

MAINTAINERS | 1 +

hmp-commands.hx | 7 ++-

hw/net/ftgmac100.c | 2 -

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

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

migration/colo.c | 2 +

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

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

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

net/net.c | 99 +++++++++++++++----------------

net/trace-events | 3 +-

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

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

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

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

15 files changed, 430 insertions(+), 99 deletions(-)

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

We need to notify net filter to do checkpoint for Xen COLO, like KVM side.

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

migration/colo.c | 2 ++

1 file changed, 2 insertions(+)

diff --git a/migration/colo.c b/migration/colo.c

--- a/migration/colo.c

+++ b/migration/colo.c

@@ -XXX,XX +XXX,XX @@ ReplicationStatus *qmp_query_xen_replication_status(Error **errp)

void qmp_xen_colo_do_checkpoint(Error **errp)

{

replication_do_checkpoint_all(errp);

+ /* Notify all filters of all NIC to do checkpoint */

+ colo_notify_filters_event(COLO_EVENT_CHECKPOINT, errp);

}

2.5.0

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

Add the optional interface list to the HMP command.

i.e.

All interfaces

announce_self

Just the named interfaces:

announce_self vn1,vn2

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

hmp-commands.hx | 6 ++++--

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

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

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

--- a/hmp-commands.hx

+++ b/hmp-commands.hx

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

{

.name = "announce_self",

- .args_type = "",

- .params = "",

+ .args_type = "interfaces:s?",

+ .params = "[interfaces]",

.help = "Trigger GARP/RARP announcements",

.cmd = hmp_announce_self,

},

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

Trigger a round of GARP/RARP broadcasts; this is useful for explicitly updating the

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.

ETEXI

{

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

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

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

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

#include "monitor/monitor-internal.h"

#include "monitor/qdev.h"

#include "qapi/error.h"

+#include "qapi/clone-visitor.h"

#include "qapi/opts-visitor.h"

#include "qapi/qapi-builtin-visit.h"

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

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

#include "qapi/qapi-commands-run-state.h"

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

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

+#include "qapi/qapi-visit-net.h"

#include "qapi/qmp/qdict.h"

#include "qapi/qmp/qerror.h"

#include "qapi/string-input-visitor.h"

@@ -XXX,XX +XXX,XX @@ static void hmp_handle_error(Monitor *mon, Error **errp)

}

+/*

+ * Produce a strList from a comma separated list.

+ * A NULL or empty input string return NULL.

+ */

+static strList *strList_from_comma_list(const char *in)

+ strList *res = NULL;

+ strList **hook = &res;

+ while (in && in[0]) {

+ char *comma = strchr(in, ',');

+ *hook = g_new0(strList, 1);

+ if (comma) {

+ (*hook)->value = g_strndup(in, comma - in);

+ in = comma + 1; /* skip the , */

+ } else {

+ (*hook)->value = g_strdup(in);

+ in = NULL;

+ }

+ hook = &(*hook)->next;

+ return res;

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

NameInfo *info;

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

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

{

- qmp_announce_self(migrate_announce_params(), NULL);

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

+ 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;

+ qmp_announce_self(params, NULL);

+ qapi_free_AnnounceParameters(params);

}

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

2.5.0

From: Markus Armbruster <armbru@redhat.com>

Signed-off-by: Markus Armbruster <armbru@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

*

* 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: Zhang Chen <chen.zhang@intel.com>

This patch make colo-compare can send message to remote COLO frame(Xen) when occur checkpoint.

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

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

1 file changed, 44 insertions(+), 10 deletions(-)

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