[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH V7 07/12] net/colo-compare.c: Introduce parameter fo
From: |
Zhang Chen |
Subject: |
[Qemu-devel] [PATCH V7 07/12] net/colo-compare.c: Introduce parameter for compare_chr_send() |
Date: |
Tue, 4 Jul 2017 14:53:51 +0800 |
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 <address@hidden>
---
net/colo-compare.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/net/colo-compare.c b/net/colo-compare.c
index 3f914f6..e10a305 100644
--- a/net/colo-compare.c
+++ b/net/colo-compare.c
@@ -97,7 +97,7 @@ enum {
SECONDARY_IN,
};
-static int compare_chr_send(CharBackend *out,
+static int compare_chr_send(CompareState *s,
const uint8_t *buf,
uint32_t size);
@@ -483,7 +483,7 @@ static void colo_compare_connection(void *opaque, void
*user_data)
}
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) {
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,
uint32_t size)
{
@@ -515,12 +515,12 @@ static int compare_chr_send(CharBackend *out,
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)) {
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) {
goto err;
}
@@ -663,7 +663,7 @@ static void compare_pri_rs_finalize(SocketReadState *pri_rs)
if (packet_enqueue(s, PRIMARY_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 {
/* compare connection */
g_queue_foreach(&s->conn_list, colo_compare_connection, s);
@@ -772,7 +772,7 @@ static void colo_flush_packets(void *opaque, void
*user_data)
while (!g_queue_is_empty(&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);
}
while (!g_queue_is_empty(&conn->secondary_list)) {
--
2.7.4
- [Qemu-devel] [PATCH V7 00/12] Add COLO-proxy virtio-net support, Zhang Chen, 2017/07/04
- [Qemu-devel] [PATCH V7 01/12] net: Add vnet_hdr_len arguments in NetClientState, Zhang Chen, 2017/07/04
- [Qemu-devel] [PATCH V7 06/12] net/colo.c: Make vnet_hdr_len as packet property, Zhang Chen, 2017/07/04
- [Qemu-devel] [PATCH V7 05/12] net/filter-mirror.c: Add new option to enable vnet support for filter-redirector, Zhang Chen, 2017/07/04
- [Qemu-devel] [PATCH V7 09/12] net/colo.c: Add vnet packet parse feature in colo-proxy, Zhang Chen, 2017/07/04
- [Qemu-devel] [PATCH V7 12/12] docs/colo-proxy.txt: Update colo-proxy usage of net driver with vnet_header, Zhang Chen, 2017/07/04
- [Qemu-devel] [PATCH V7 10/12] net/colo-compare.c: Add vnet packet's tcp/udp/icmp compare, Zhang Chen, 2017/07/04
- [Qemu-devel] [PATCH V7 03/12] net/filter-mirror.c: Introduce parameter for filter_send(), Zhang Chen, 2017/07/04
- [Qemu-devel] [PATCH V7 04/12] net/filter-mirror.c: Make filter mirror support vnet support., Zhang Chen, 2017/07/04
- [Qemu-devel] [PATCH V7 02/12] net/net.c: Add vnet_hdr support in SocketReadState, Zhang Chen, 2017/07/04
- [Qemu-devel] [PATCH V7 07/12] net/colo-compare.c: Introduce parameter for compare_chr_send(),
Zhang Chen <=
- [Qemu-devel] [PATCH V7 08/12] net/colo-compare.c: Make colo-compare support vnet_hdr_len, Zhang Chen, 2017/07/04
- [Qemu-devel] [PATCH V7 11/12] net/filter-rewriter.c: Make filter-rewriter support vnet_hdr_len, Zhang Chen, 2017/07/04
- Re: [Qemu-devel] [PATCH V7 00/12] Add COLO-proxy virtio-net support, Jason Wang, 2017/07/13