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

net/colo-compare.c: Introduce parameter for compare_chr_send() 

This patch change the compare_chr_send() parameter from CharBackend to CompareState,
we can get more information like vnet_hdr(We use it to support packet with vnet_header).

Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
This commit is contained in:
Zhang Chen 2017-07-04 14:53:51 +08:00 committed by Jason Wang
parent ada1a33f9a
commit 3037e7a5b7
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
net/colo-compare.c
View File

@ -97,7 +97,7 @@ enum {
SECONDARY_IN, SECONDARY_IN,
}; };
static int compare_chr_send(CharBackend *out, static int compare_chr_send(CompareState *s,
const uint8_t *buf, const uint8_t *buf,
uint32_t size); uint32_t size);
@ -483,7 +483,7 @@ static void colo_compare_connection(void *opaque, void *user_data)
} }
if (result) { if (result) {
ret = compare_chr_send(&s->chr_out, pkt->data, pkt->size); ret = compare_chr_send(s, pkt->data, pkt->size);
if (ret < 0) { if (ret < 0) {
error_report("colo_send_primary_packet failed"); error_report("colo_send_primary_packet failed");
} }
@ -504,7 +504,7 @@ static void colo_compare_connection(void *opaque, void *user_data)
} }
} }
static int compare_chr_send(CharBackend *out, static int compare_chr_send(CompareState *s,
const uint8_t *buf, const uint8_t *buf,
uint32_t size) uint32_t size)
{ {
@ -515,12 +515,12 @@ static int compare_chr_send(CharBackend *out,
return 0; return 0;
} }
ret = qemu_chr_fe_write_all(out, (uint8_t *)&len, sizeof(len)); 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(out, (uint8_t *)buf, size); ret = qemu_chr_fe_write_all(&s->chr_out, (uint8_t *)buf, size);
if (ret != size) { if (ret != size) {
goto err; goto err;
} }
@ -665,7 +665,7 @@ static void compare_pri_rs_finalize(SocketReadState *pri_rs)
if (packet_enqueue(s, PRIMARY_IN)) { if (packet_enqueue(s, PRIMARY_IN)) {
trace_colo_compare_main("primary: unsupported packet in"); trace_colo_compare_main("primary: unsupported packet in");
compare_chr_send(&s->chr_out, pri_rs->buf, pri_rs->packet_len); compare_chr_send(s, pri_rs->buf, pri_rs->packet_len);
} else { } else {
/* compare connection */ /* compare connection */
g_queue_foreach(&s->conn_list, colo_compare_connection, s); g_queue_foreach(&s->conn_list, colo_compare_connection, s);
@ -774,7 +774,7 @@ static void colo_flush_packets(void *opaque, void *user_data)
while (!g_queue_is_empty(&conn->primary_list)) { while (!g_queue_is_empty(&conn->primary_list)) {
pkt = g_queue_pop_head(&conn->primary_list); pkt = g_queue_pop_head(&conn->primary_list);
compare_chr_send(&s->chr_out, pkt->data, pkt->size); compare_chr_send(s, pkt->data, pkt->size);
packet_destroy(pkt, NULL); packet_destroy(pkt, NULL);
} }
while (!g_queue_is_empty(&conn->secondary_list)) { while (!g_queue_is_empty(&conn->secondary_list)) {