From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34481) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ajMP7-0007yJ-0Z for qemu-devel@nongnu.org; Fri, 25 Mar 2016 03:44:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ajMNy-0005E2-IA for qemu-devel@nongnu.org; Fri, 25 Mar 2016 03:43:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49397) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ajMNy-0005Dy-9I for qemu-devel@nongnu.org; Fri, 25 Mar 2016 03:42:22 -0400 From: Jason Wang Date: Fri, 25 Mar 2016 15:42:05 +0800 Message-Id: <1458891729-28131-4-git-send-email-jasowang@redhat.com> In-Reply-To: <1458891729-28131-1-git-send-email-jasowang@redhat.com> References: <1458891729-28131-1-git-send-email-jasowang@redhat.com> Subject: [Qemu-devel] [PULL 3/7] net/filter-mirror: Change filter_mirror_send interface List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: peter.maydell@linaro.org, qemu-devel@nongnu.org Cc: Jason Wang , Li Zhijian , Zhang Chen From: Zhang Chen Change filter_mirror_send interface to make it easier to used by other filter Signed-off-by: Zhang Chen Signed-off-by: Wen Congyang Signed-off-by: Li Zhijian Signed-off-by: Jason Wang --- 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 2e2ed27..1b1ec16 100644 --- a/net/filter-mirror.c +++ b/net/filter-mirror.c @@ -34,11 +34,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; @@ -50,14 +49,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; @@ -76,9 +75,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