openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

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>
Signed-off-by: Jason Wang <jasowang@redhat.com>
This commit is contained in:
Zhang Chen 2019-06-10 00:44:31 +08:00 committed by Jason Wang
parent 13025fee7f
commit 30685c000c
1 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
net/colo-compare.c
View File

@ -129,7 +129,8 @@ static void colo_compare_inconsistency_notify(void)
static int compare_chr_send(CompareState *s, static int compare_chr_send(CompareState *s,
const uint8_t *buf, const uint8_t *buf,
uint32_t size, 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) static gint seq_sorter(Packet *a, Packet *b, gpointer data)
{ {
@ -241,7 +242,8 @@ static void colo_release_primary_pkt(CompareState *s, Packet *pkt)
ret = compare_chr_send(s, ret = compare_chr_send(s,
pkt->data, pkt->data,
pkt->size, pkt->size,
pkt->vnet_hdr_len); pkt->vnet_hdr_len,
false);
if (ret < 0) { if (ret < 0) {
error_report("colo send primary packet failed"); error_report("colo send primary packet failed");
} }
@ -671,7 +673,8 @@ static void colo_compare_connection(void *opaque, void *user_data)
static int compare_chr_send(CompareState *s, static int compare_chr_send(CompareState *s,
const uint8_t *buf, const uint8_t *buf,
uint32_t size, uint32_t size,
uint32_t vnet_hdr_len) uint32_t vnet_hdr_len,
bool notify_remote_frame)
{ {
int ret = 0; int ret = 0;
uint32_t len = htonl(size); uint32_t len = htonl(size);
@ -680,7 +683,14 @@ static int compare_chr_send(CompareState *s,
return 0; 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));
} else {
ret = qemu_chr_fe_write_all(&s->chr_out, (uint8_t *)&len, sizeof(len));
}
if (ret != sizeof(len)) { if (ret != sizeof(len)) {
goto err; goto err;
} }
@ -691,13 +701,26 @@ static int compare_chr_send(CompareState *s,
* know how to parse net packet correctly. * know how to parse net packet correctly.
*/ */
len = htonl(vnet_hdr_len); 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)) { if (ret != sizeof(len)) {
goto err; 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) { if (ret != size) {
goto err; goto err;
} }
@ -943,7 +966,8 @@ static void compare_pri_rs_finalize(SocketReadState *pri_rs)
compare_chr_send(s, compare_chr_send(s,
pri_rs->buf, pri_rs->buf,
pri_rs->packet_len, pri_rs->packet_len,
pri_rs->vnet_hdr_len); pri_rs->vnet_hdr_len,
false);
} else { } else {
/* compare packet in the specified connection */ /* compare packet in the specified connection */
colo_compare_connection(conn, s); colo_compare_connection(conn, s);
@ -1075,7 +1099,8 @@ static void colo_flush_packets(void *opaque, void *user_data)
compare_chr_send(s, compare_chr_send(s,
pkt->data, pkt->data,
pkt->size, pkt->size,
pkt->vnet_hdr_len); pkt->vnet_hdr_len,
false);
packet_destroy(pkt, NULL); packet_destroy(pkt, NULL);
} }
while (!g_queue_is_empty(&conn->secondary_list)) { while (!g_queue_is_empty(&conn->secondary_list)) {