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>

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(-)

@@ -XXX,XX +XXX,XX @@ enum {

SECONDARY_IN,

};

-static void colo_compare_inconsistency_notify(void)

-{

- notifier_list_notify(&colo_compare_notifiers,

- migrate_get_current());

-}

static int compare_chr_send(CompareState *s,

const uint8_t *buf,

@@ -XXX,XX +XXX,XX @@ static int compare_chr_send(CompareState *s,

uint32_t vnet_hdr_len,

bool notify_remote_frame);

+static void notify_remote_frame(CompareState *s)

+{

+ char msg[] = "DO_CHECKPOINT";

+ int ret = 0;

+

+ ret = compare_chr_send(s, (uint8_t *)msg, strlen(msg), 0, true);

+ if (ret < 0) {

+ error_report("Notify Xen COLO-frame failed");

+ }

+}

+

+static void colo_compare_inconsistency_notify(CompareState *s)

+{

+ if (s->notify_dev) {

+ notify_remote_frame(s);

+ } else {

+ notifier_list_notify(&colo_compare_notifiers,

+ migrate_get_current());

+ }

+}

+

static gint seq_sorter(Packet *a, Packet *b, gpointer data)

{

struct tcp_hdr *atcp, *btcp;

@@ -XXX,XX +XXX,XX @@ sec:

qemu_hexdump((char *)spkt->data, stderr,

"colo-compare spkt", spkt->size);

- colo_compare_inconsistency_notify();

+ colo_compare_inconsistency_notify(s);

@@ -XXX,XX +XXX,XX @@ void colo_compare_unregister_notifier(Notifier *notify)

}

static int colo_old_packet_check_one_conn(Connection *conn,

+ CompareState *s)

@@ -XXX,XX +XXX,XX @@ static int colo_old_packet_check_one_conn(Connection *conn,

/* Do checkpoint will flush old packet */

- colo_compare_inconsistency_notify();

+ colo_compare_inconsistency_notify(s);

return 0;

* If we find one old packet, stop finding job and notify

* COLO frame do checkpoint.

*/

- g_queue_find_custom(&s->conn_list, NULL,

+ g_queue_find_custom(&s->conn_list, s,

(GCompareFunc)colo_old_packet_check_one_conn);

2.5.0

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

}

#endif

2.5.0

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

We need use this function to send notification message for remote colo-frame(Xen).

So we add new parameter for this job.

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

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

1 file changed, 33 insertions(+), 8 deletions(-)

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

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

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

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

static int compare_chr_send(CompareState *s,

const uint8_t *buf,

uint32_t size,

- uint32_t vnet_hdr_len);

+ uint32_t vnet_hdr_len,

+ bool notify_remote_frame);

static gint seq_sorter(Packet *a, Packet *b, gpointer data)

{

@@ -XXX,XX +XXX,XX @@ static void colo_release_primary_pkt(CompareState *s, Packet *pkt)

ret = compare_chr_send(s,

pkt->data,

pkt->size,

- pkt->vnet_hdr_len);

+ pkt->vnet_hdr_len,

+ false);

if (ret < 0) {

error_report("colo send primary packet failed");

}

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

static int compare_chr_send(CompareState *s,

const uint8_t *buf,

uint32_t size,

- uint32_t vnet_hdr_len)

+ uint32_t vnet_hdr_len,

+ bool notify_remote_frame)

{

int ret = 0;

uint32_t len = htonl(size);

@@ -XXX,XX +XXX,XX @@ static int compare_chr_send(CompareState *s,

return 0;

}

- ret = qemu_chr_fe_write_all(&s->chr_out, (uint8_t *)&len, sizeof(len));

+ if (notify_remote_frame) {

+ ret = qemu_chr_fe_write_all(&s->chr_notify_dev,

+ (uint8_t *)&len,

+ sizeof(len));

+ ret = qemu_chr_fe_write_all(&s->chr_out, (uint8_t *)&len, sizeof(len));

+ }

+

if (ret != sizeof(len)) {

goto err;

}

@@ -XXX,XX +XXX,XX @@ static int compare_chr_send(CompareState *s,

* know how to parse net packet correctly.

*/

len = htonl(vnet_hdr_len);

- ret = qemu_chr_fe_write_all(&s->chr_out, (uint8_t *)&len, sizeof(len));

+

+ if (!notify_remote_frame) {

+ ret = qemu_chr_fe_write_all(&s->chr_out,

+ (uint8_t *)&len,

+ sizeof(len));

+ }

+

if (ret != sizeof(len)) {

goto err;

}

}

- ret = qemu_chr_fe_write_all(&s->chr_out, (uint8_t *)buf, size);

+ if (notify_remote_frame) {

+ ret = qemu_chr_fe_write_all(&s->chr_notify_dev,

+ (uint8_t *)buf,

+ size);

+ } else {

+ ret = qemu_chr_fe_write_all(&s->chr_out, (uint8_t *)buf, size);

+ }

+

if (ret != size) {

goto err;

}

@@ -XXX,XX +XXX,XX @@ static void compare_pri_rs_finalize(SocketReadState *pri_rs)

compare_chr_send(s,

pri_rs->buf,

pri_rs->packet_len,

- pri_rs->vnet_hdr_len);

+ pri_rs->vnet_hdr_len,

+ false);

} else {

/* compare packet in the specified connection */

colo_compare_connection(conn, s);

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

compare_chr_send(s,

pkt->data,

pkt->size,

- pkt->vnet_hdr_len);

+ pkt->vnet_hdr_len,

+ false);

packet_destroy(pkt, NULL);

}

while (!g_queue_is_empty(&conn->secondary_list)) {