mbox

[PULL,0/7] Net patches

Message ID 1458891729-28131-1-git-send-email-jasowang@redhat.com
State New
Headers show

Pull-request

https://github.com/jasowang/qemu.git tags/net-pull-request

Message

Jason Wang March 25, 2016, 7:42 a.m. UTC 
The following changes since commit b68a80139e37e806f004237e55311ebc42151434:

  Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20160324' into staging (2016-03-24 16:24:02 +0000)

are available in the git repository at:

  https://github.com/jasowang/qemu.git tags/net-pull-request

for you to fetch changes up to e680f08328f6a05a43963c3e9db1b0cdc701ed9f:

  Revert "e1000: fix hang of win2k12 shutdown with flood ping" (2016-03-25 10:39:43 +0800)

----------------------------------------------------------------

- mirror/redirector which could mirror or redirct the traffic between
  netdev and chardev
- fix e1000 interrupt strom and remove previous hack

----------------------------------------------------------------
Sameeh Jubran (2):
      e1000: Fixing interrupts pace.
      Revert "e1000: fix hang of win2k12 shutdown with flood ping"

Zhang Chen (5):
      net/filter-mirror:Add filter-mirror
      tests/test-filter-mirror:add filter-mirror unit test
      net/filter-mirror: Change filter_mirror_send interface
      net/filter-mirror: implement filter-redirector
      tests/test-filter-redirector: Add unit test for filter-redirector

 hw/net/e1000.c                 |  13 +-
 net/Makefile.objs              |   1 +
 net/filter-mirror.c            | 426 +++++++++++++++++++++++++++++++++++++++++
 qemu-options.hx                |  14 ++
 tests/.gitignore               |   2 +
 tests/Makefile                 |   4 +
 tests/test-filter-mirror.c     |  93 +++++++++
 tests/test-filter-redirector.c | 221 +++++++++++++++++++++
 vl.c                           |   4 +-
 9 files changed, 772 insertions(+), 6 deletions(-)
 create mode 100644 net/filter-mirror.c
 create mode 100644 tests/test-filter-mirror.c
 create mode 100644 tests/test-filter-redirector.c

Comments

Peter Maydell March 29, 2016, 4:39 p.m. UTC | #1 
On 25 March 2016 at 07:42, Jason Wang <jasowang@redhat.com> wrote:
> The following changes since commit b68a80139e37e806f004237e55311ebc42151434:
>
>   Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20160324' into staging (2016-03-24 16:24:02 +0000)
>
> are available in the git repository at:
>
>   https://github.com/jasowang/qemu.git tags/net-pull-request
>
> for you to fetch changes up to e680f08328f6a05a43963c3e9db1b0cdc701ed9f:
>
>   Revert "e1000: fix hang of win2k12 shutdown with flood ping" (2016-03-25 10:39:43 +0800)
>
> ----------------------------------------------------------------
>
> - mirror/redirector which could mirror or redirct the traffic between
>   netdev and chardev
> - fix e1000 interrupt strom and remove previous hack

Hi. I'm afraid this fails to compile:

/home/petmay01/linaro/qemu-for-merges/net/filter-mirror.c: In function
‘filter_mirror_setup’:
/home/petmay01/linaro/qemu-for-merges/net/filter-mirror.c:242:9:
error: implicit declaration of function ‘error_setg’
[-Werror=implicit-function-declaration]
         error_setg(errp, "filter filter mirror needs 'outdev' "
         ^
/home/petmay01/linaro/qemu-for-merges/net/filter-mirror.c:242:9:
error: nested extern declaration of ‘error_setg’
[-Werror=nested-externs]
/home/petmay01/linaro/qemu-for-merges/net/filter-mirror.c:249:9:
error: implicit declaration of function ‘error_set’
[-Werror=implicit-function-declaration]
         error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,
         ^
/home/petmay01/linaro/qemu-for-merges/net/filter-mirror.c:249:9:
error: nested extern declaration of ‘error_set’
[-Werror=nested-externs]
/home/petmay01/linaro/qemu-for-merges/net/filter-mirror.c:249:25:
error: ‘ERROR_CLASS_DEVICE_NOT_FOUND’ undeclared (first use in this
function)
         error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,
                         ^
/home/petmay01/linaro/qemu-for-merges/net/filter-mirror.c:249:25:
note: each undeclared identifier is reported only once for each
function it appears in
/home/petmay01/linaro/qemu-for-merges/net/filter-mirror.c: In function
‘filter_redirector_setup’:
/home/petmay01/linaro/qemu-for-merges/net/filter-mirror.c:281:29:
error: ‘ERROR_CLASS_DEVICE_NOT_FOUND’ undeclared (first use in this
function)
             error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,
                             ^
cc1: all warnings being treated as errors

I think your commit has unfortunately clashed with the
pull from Paolo that I've just applied that makes
changes to our include files.

thanks
-- PMM
Jason Wang March 30, 2016, 1:20 a.m. UTC | #2 
On 03/30/2016 12:39 AM, Peter Maydell wrote:
> On 25 March 2016 at 07:42, Jason Wang <jasowang@redhat.com> wrote:
>> The following changes since commit b68a80139e37e806f004237e55311ebc42151434:
>>
>>   Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20160324' into staging (2016-03-24 16:24:02 +0000)
>>
>> are available in the git repository at:
>>
>>   https://github.com/jasowang/qemu.git tags/net-pull-request
>>
>> for you to fetch changes up to e680f08328f6a05a43963c3e9db1b0cdc701ed9f:
>>
>>   Revert "e1000: fix hang of win2k12 shutdown with flood ping" (2016-03-25 10:39:43 +0800)
>>
>> ----------------------------------------------------------------
>>
>> - mirror/redirector which could mirror or redirct the traffic between
>>   netdev and chardev
>> - fix e1000 interrupt strom and remove previous hack
> Hi. I'm afraid this fails to compile:
>
> /home/petmay01/linaro/qemu-for-merges/net/filter-mirror.c: In function
> ‘filter_mirror_setup’:
> /home/petmay01/linaro/qemu-for-merges/net/filter-mirror.c:242:9:
> error: implicit declaration of function ‘error_setg’
> [-Werror=implicit-function-declaration]
>          error_setg(errp, "filter filter mirror needs 'outdev' "
>          ^
> /home/petmay01/linaro/qemu-for-merges/net/filter-mirror.c:242:9:
> error: nested extern declaration of ‘error_setg’
> [-Werror=nested-externs]
> /home/petmay01/linaro/qemu-for-merges/net/filter-mirror.c:249:9:
> error: implicit declaration of function ‘error_set’
> [-Werror=implicit-function-declaration]
>          error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,
>          ^
> /home/petmay01/linaro/qemu-for-merges/net/filter-mirror.c:249:9:
> error: nested extern declaration of ‘error_set’
> [-Werror=nested-externs]
> /home/petmay01/linaro/qemu-for-merges/net/filter-mirror.c:249:25:
> error: ‘ERROR_CLASS_DEVICE_NOT_FOUND’ undeclared (first use in this
> function)
>          error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,
>                          ^
> /home/petmay01/linaro/qemu-for-merges/net/filter-mirror.c:249:25:
> note: each undeclared identifier is reported only once for each
> function it appears in
> /home/petmay01/linaro/qemu-for-merges/net/filter-mirror.c: In function
> ‘filter_redirector_setup’:
> /home/petmay01/linaro/qemu-for-merges/net/filter-mirror.c:281:29:
> error: ‘ERROR_CLASS_DEVICE_NOT_FOUND’ undeclared (first use in this
> function)
>              error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,
>                              ^
> cc1: all warnings being treated as errors
>
> I think your commit has unfortunately clashed with the
> pull from Paolo that I've just applied that makes
> changes to our include files.

Right, will fix and send V2.

Thanks

>
> thanks
> -- PMM
>