From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:54754)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jasowang@redhat.com>) id 1ag2ox-0001As-Cp
	for qemu-devel@nongnu.org; Wed, 16 Mar 2016 00:12:32 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jasowang@redhat.com>) id 1ag2ou-0001Qg-6j
	for qemu-devel@nongnu.org; Wed, 16 Mar 2016 00:12:31 -0400
Received: from mx1.redhat.com ([209.132.183.28]:57600)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jasowang@redhat.com>) id 1ag2ou-0001Qc-17
	for qemu-devel@nongnu.org; Wed, 16 Mar 2016 00:12:28 -0400
References: <1458036171-573-1-git-send-email-zhangchen.fnst@cn.fujitsu.com>
From: Jason Wang <jasowang@redhat.com>
Message-ID: <56E8DD26.3060803@redhat.com>
Date: Wed, 16 Mar 2016 12:12:22 +0800
MIME-Version: 1.0
In-Reply-To: <1458036171-573-1-git-send-email-zhangchen.fnst@cn.fujitsu.com>
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH V2] net/filter-mirror: Change
 filter_mirror_send interface
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>, qemu devel <qemu-devel@nongnu.org>
Cc: zhanghailiang <zhang.zhanghailiang@huawei.com>, Li Zhijian <lizhijian@cn.fujitsu.com>, Gui jianfeng <guijianfeng@cn.fujitsu.com>, "eddie.dong" <eddie.dong@intel.com>, "Dr. David Alan Gilbert" <dgilbert@redhat.com>, Yang Hongyang <hongyang.yang@easystack.cn>



On 03/15/2016 06:02 PM, Zhang Chen wrote:
> Change filter_mirror_send interface to make it easier
> to used by other filter
>
> Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
> Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
> Signed-off-by: Li Zhijian <lizhijian@cn.fujitsu.com>
> ---
>  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));
>      }

Applied to -net.

Thanks