[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL V2 3/7] net/filter-mirror: Change filter_mirror_send
From: |
Jason Wang |
Subject: |
[Qemu-devel] [PULL V2 3/7] net/filter-mirror: Change filter_mirror_send interface |
Date: |
Wed, 30 Mar 2016 09:22:51 +0800 |
From: Zhang Chen <address@hidden>
Change filter_mirror_send interface to make it easier
to used by other filter
Signed-off-by: Zhang Chen <address@hidden>
Signed-off-by: Wen Congyang <address@hidden>
Signed-off-by: Li Zhijian <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
---
net/filter-mirror.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/net/filter-mirror.c b/net/filter-mirror.c
index 37bfe80..78969e8 100644
--- a/net/filter-mirror.c
+++ b/net/filter-mirror.c
@@ -35,11 +35,10 @@ typedef struct MirrorState {
CharDriverState *chr_out;
} MirrorState;
-static int filter_mirror_send(NetFilterState *nf,
+static int filter_mirror_send(CharDriverState *chr_out,
const struct iovec *iov,
int iovcnt)
{
- MirrorState *s = FILTER_MIRROR(nf);
int ret = 0;
ssize_t size = 0;
uint32_t len = 0;
@@ -51,14 +50,14 @@ static int filter_mirror_send(NetFilterState *nf,
}
len = htonl(size);
- ret = qemu_chr_fe_write_all(s->chr_out, (uint8_t *)&len, sizeof(len));
+ ret = qemu_chr_fe_write_all(chr_out, (uint8_t *)&len, sizeof(len));
if (ret != sizeof(len)) {
goto err;
}
buf = g_malloc(size);
iov_to_buf(iov, iovcnt, 0, buf, size);
- ret = qemu_chr_fe_write_all(s->chr_out, (uint8_t *)buf, size);
+ ret = qemu_chr_fe_write_all(chr_out, (uint8_t *)buf, size);
g_free(buf);
if (ret != size) {
goto err;
@@ -77,9 +76,10 @@ static ssize_t filter_mirror_receive_iov(NetFilterState *nf,
int iovcnt,
NetPacketSent *sent_cb)
{
+ MirrorState *s = FILTER_MIRROR(nf);
int ret;
- ret = filter_mirror_send(nf, iov, iovcnt);
+ ret = filter_mirror_send(s->chr_out, iov, iovcnt);
if (ret) {
error_report("filter_mirror_send failed(%s)", strerror(-ret));
}
--
2.5.0
- [Qemu-devel] [PULL V2 0/7] Net patches, Jason Wang, 2016/03/29
- [Qemu-devel] [PULL V2 1/7] net/filter-mirror:Add filter-mirror, Jason Wang, 2016/03/29
- [Qemu-devel] [PULL V2 2/7] tests/test-filter-mirror:add filter-mirror unit test, Jason Wang, 2016/03/29
- [Qemu-devel] [PULL V2 3/7] net/filter-mirror: Change filter_mirror_send interface,
Jason Wang <=
- [Qemu-devel] [PULL V2 6/7] e1000: Fixing interrupts pace., Jason Wang, 2016/03/29
- [Qemu-devel] [PULL V2 4/7] net/filter-mirror: implement filter-redirector, Jason Wang, 2016/03/29
- [Qemu-devel] [PULL V2 5/7] tests/test-filter-redirector: Add unit test for filter-redirector, Jason Wang, 2016/03/29
- [Qemu-devel] [PULL V2 7/7] Revert "e1000: fix hang of win2k12 shutdown with flood ping", Jason Wang, 2016/03/29
- Re: [Qemu-devel] [PULL V2 0/7] Net patches, Peter Maydell, 2016/03/30