[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH V2 3/5] COLO-compare: Make the compare_chr_send() ca
From: |
Zhang Chen |
Subject: |
[Qemu-devel] [PATCH V2 3/5] COLO-compare: Make the compare_chr_send() can send notification message. |
Date: |
Mon, 10 Jun 2019 00:44:31 +0800 |
From: Zhang Chen <address@hidden>
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 <address@hidden>
---
net/colo-compare.c | 41 +++++++++++++++++++++++++++++++++--------
1 file changed, 33 insertions(+), 8 deletions(-)
diff --git a/net/colo-compare.c b/net/colo-compare.c
index 8b7bd9f0c7..16285f4a96 100644
--- a/net/colo-compare.c
+++ b/net/colo-compare.c
@@ -129,7 +129,8 @@ 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)
{
@@ -241,7 +242,8 @@ 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");
}
@@ -671,7 +673,8 @@ 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);
@@ -680,7 +683,14 @@ 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));
+ } else {
+ ret = qemu_chr_fe_write_all(&s->chr_out, (uint8_t *)&len, sizeof(len));
+ }
+
if (ret != sizeof(len)) {
goto err;
}
@@ -691,13 +701,26 @@ 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;
}
@@ -943,7 +966,8 @@ 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);
@@ -1075,7 +1099,8 @@ 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)) {
--
2.17.GIT
- [Qemu-devel] [PATCH V2 0/5] Add Xen COLO support, Zhang Chen, 2019/06/09
- [Qemu-devel] [PATCH V2 3/5] COLO-compare: Make the compare_chr_send() can send notification message.,
Zhang Chen <=
- [Qemu-devel] [PATCH V2 4/5] COLO-compare: Add colo-compare remote notify support, Zhang Chen, 2019/06/09
- [Qemu-devel] [PATCH V2 5/5] migration/colo.c: Add missed filter notify for Xen COLO., Zhang Chen, 2019/06/09
- [Qemu-devel] [PATCH V2 1/5] COLO-compare: Add new parameter to communicate with remote colo-frame, Zhang Chen, 2019/06/09
- [Qemu-devel] [PATCH V2 2/5] COLO-compare: Add remote notification chardev handler frame, Zhang Chen, 2019/06/09
- Re: [Qemu-devel] [PATCH V2 0/5] Add Xen COLO support, Jason Wang, 2019/06/10