Re: [PULL 0/8] Net patches

[Jason Wang]

On Wed, Mar 13, 2024 at 1:56 AM Michael Tokarev  wrote:
>
> 12.03.2024 14:36, Jason Wang wrote:
> ...
> > 
> > Andrew Melnychenko (5):
> >ebpf: Added eBPF map update through mmap.
> >ebpf: Added eBPF initialization by fds.
> >virtio-net: Added property to load eBPF RSS with fds.
> >qmp: Added new command to retrieve eBPF blob.
> >ebpf: Updated eBPF program and skeleton.
> >
> > Laurent Vivier (2):
> >igb: fix link state on resume
> >e1000e: fix link state on resume
> >
> > Nick Briggs (1):
> >Avoid unaligned fetch in ladr_match()
>
>  From the above, I'm picking up igb & e100e "fix link state on resume"
> and "Avoid unaligned fetch in ladr_match()" for stable.
>
> Please let me know if this is incorrect.
>

It's correct.

Thanks

> Thanks,
>
> /mjt
>

Re: [PULL 0/8] Net patches

[Michael Tokarev]

12.03.2024 14:36, Jason Wang wrote:
...


Andrew Melnychenko (5):
   ebpf: Added eBPF map update through mmap.
   ebpf: Added eBPF initialization by fds.
   virtio-net: Added property to load eBPF RSS with fds.
   qmp: Added new command to retrieve eBPF blob.
   ebpf: Updated eBPF program and skeleton.

Laurent Vivier (2):
   igb: fix link state on resume
   e1000e: fix link state on resume

Nick Briggs (1):
   Avoid unaligned fetch in ladr_match()


From the above, I'm picking up igb & e100e "fix link state on resume"
and "Avoid unaligned fetch in ladr_match()" for stable.

Please let me know if this is incorrect.

Thanks,

/mjt

Re: [PULL 0/8] Net patches

[Peter Maydell]

On Tue, 12 Mar 2024 at 11:36, Jason Wang  wrote:
>
> The following changes since commit 05ec974671200814fa5c1d5db710e0e4b88a40af:
>
>   Merge tag 'm68k-for-9.0-pull-request' of 
> https://github.com/vivier/qemu-m68k into staging (2024-03-11 18:42:53 +)
>
> are available in the Git repository at:
>
>   https://github.com/jasowang/qemu.git tags/net-pull-request
>
> for you to fetch changes up to 0cc14182aba961f4c34a21dd202ce6e4a87470f5:
>
>   ebpf: Updated eBPF program and skeleton. (2024-03-12 19:31:47 +0800)
>
> 
> -BEGIN PGP SIGNATURE-
>
> iQEzBAABCAAdFiEEIV1G9IJGaJ7HfzVi7wSWWzmNYhEFAmXwPUAACgkQ7wSWWzmN
> YhFnIwgAgctDniJwlRxXB01eVlzXz7IulHnpSby07XEJxENSpGB8ufaeE4eK5gJy
> NVK6C2+1EU2vRxm4oIdcvtN4C4/jtRbYYjiSTx7eE4FmSkqshSnR5XCV72LDqG3i
> WbzInjMvYfysmcMXLfrWgxOnVew9WqEzlpEWlc7FfNKnkzBVf+JDztfqCUx0XM7H
> qefw4ImjqQw993QxJpipXC7aEGUyouB0RIBB71FkCa9ihlh9x7W68evbOI/jTn5q
> HWuStgS02sKHjRFliMbdbMY77FNUz4Yroo/GKSvGt64atxkQSJqPNAV+/9n18LNy
> QAH5eK6cXFPOIAaYpADU5kHDVVAFiw==
> =iBdx
> -END PGP SIGNATURE-
>


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/9.0
for any user-visible changes.

-- PMM

[PULL 0/8] Net patches

[Jason Wang]

The following changes since commit 05ec974671200814fa5c1d5db710e0e4b88a40af:

  Merge tag 'm68k-for-9.0-pull-request' of https://github.com/vivier/qemu-m68k 
into staging (2024-03-11 18:42:53 +)

are available in the Git repository at:

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

for you to fetch changes up to 0cc14182aba961f4c34a21dd202ce6e4a87470f5:

  ebpf: Updated eBPF program and skeleton. (2024-03-12 19:31:47 +0800)


-BEGIN PGP SIGNATURE-

iQEzBAABCAAdFiEEIV1G9IJGaJ7HfzVi7wSWWzmNYhEFAmXwPUAACgkQ7wSWWzmN
YhFnIwgAgctDniJwlRxXB01eVlzXz7IulHnpSby07XEJxENSpGB8ufaeE4eK5gJy
NVK6C2+1EU2vRxm4oIdcvtN4C4/jtRbYYjiSTx7eE4FmSkqshSnR5XCV72LDqG3i
WbzInjMvYfysmcMXLfrWgxOnVew9WqEzlpEWlc7FfNKnkzBVf+JDztfqCUx0XM7H
qefw4ImjqQw993QxJpipXC7aEGUyouB0RIBB71FkCa9ihlh9x7W68evbOI/jTn5q
HWuStgS02sKHjRFliMbdbMY77FNUz4Yroo/GKSvGt64atxkQSJqPNAV+/9n18LNy
QAH5eK6cXFPOIAaYpADU5kHDVVAFiw==
=iBdx
-END PGP SIGNATURE-


Andrew Melnychenko (5):
  ebpf: Added eBPF map update through mmap.
  ebpf: Added eBPF initialization by fds.
  virtio-net: Added property to load eBPF RSS with fds.
  qmp: Added new command to retrieve eBPF blob.
  ebpf: Updated eBPF program and skeleton.

Laurent Vivier (2):
  igb: fix link state on resume
  e1000e: fix link state on resume

Nick Briggs (1):
  Avoid unaligned fetch in ladr_match()

 ebpf/ebpf.c|   69 +++
 ebpf/ebpf.h|   29 +
 ebpf/ebpf_rss-stub.c   |6 +
 ebpf/ebpf_rss.c|  149 -
 ebpf/ebpf_rss.h|   10 +
 ebpf/meson.build   |2 +-
 ebpf/rss.bpf.skeleton.h| 1343 
 ebpf/trace.h   |1 -
 hw/net/e1000e_core.c   |   60 +-
 hw/net/e1000e_core.h   |2 -
 hw/net/igb_core.c  |   51 +-
 hw/net/igb_core.h  |2 -
 hw/net/pcnet.c |2 +-
 hw/net/virtio-net.c|   54 +-
 include/hw/virtio/virtio-net.h |2 +
 meson.build|   10 +-
 qapi/ebpf.json |   66 ++
 qapi/meson.build   |1 +
 qapi/qapi-schema.json  |1 +
 tools/ebpf/rss.bpf.c   |7 +-
 20 files changed, 1058 insertions(+), 809 deletions(-)
 create mode 100644 ebpf/ebpf.c
 create mode 100644 ebpf/ebpf.h
 delete mode 100644 ebpf/trace.h
 create mode 100644 qapi/ebpf.json

Re: [PULL 0/8] Net patches

[Stefan Hajnoczi]

Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/7.2 for any 
user-visible changes.


signature.asc
Description: PGP signature

[PULL 0/8] Net patches

[Jason Wang]

The following changes since commit 99d6b11b5b44d7dd64f4cb1973184e40a4a174f8:

  Merge tag 'pull-target-arm-20220922' of 
https://git.linaro.org/people/pmaydell/qemu-arm into staging (2022-09-26 
13:38:26 -0400)

are available in the git repository at:

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

for you to fetch changes up to bf769f742c3624952f125b303878a77ea870c156:

  virtio: del net client if net_init_tap_one failed (2022-09-27 15:14:37 +0800)




Ding Hui (1):
  e1000e: set RX desc status with DD flag in a separate operation

Eugenio Pérez (6):
  vdpa: Make VhostVDPAState cvq_cmd_in_buffer control ack type
  vdpa: extract vhost_vdpa_net_load_mac from vhost_vdpa_net_load
  vdpa: Add vhost_vdpa_net_load_mq
  vdpa: validate MQ CVQ commands
  virtio-net: Update virtio-net curr_queue_pairs in vdpa backends
  vdpa: Allow MQ feature in SVQ

lu zhipeng (1):
  virtio: del net client if net_init_tap_one failed

 hw/net/e1000e_core.c |  53 ++-
 hw/net/virtio-net.c  |  17 +++-
 net/tap.c|  18 +---
 net/vhost-vdpa.c | 119 +--
 4 files changed, 157 insertions(+), 50 deletions(-)

Ding Hui (1):
  e1000e: set RX desc status with DD flag in a separate operation

Eugenio Pérez (6):
  vdpa: Make VhostVDPAState cvq_cmd_in_buffer control ack type
  vdpa: extract vhost_vdpa_net_load_mac from vhost_vdpa_net_load
  vdpa: Add vhost_vdpa_net_load_mq
  vdpa: validate MQ CVQ commands
  virtio-net: Update virtio-net curr_queue_pairs in vdpa backends
  vdpa: Allow MQ feature in SVQ

lu zhipeng (1):
  virtio: del net client if net_init_tap_one failed

 hw/net/e1000e_core.c |  53 ++-
 hw/net/virtio-net.c  |  17 +++-
 net/tap.c|  18 +---
 net/vhost-vdpa.c | 119 +--
 4 files changed, 157 insertions(+), 50 deletions(-)

-- 
2.7.4

Re: [PULL 0/8] Net patches

[Richard Henderson]

On 5/17/22 20:12, Jason Wang wrote:

The following changes since commit eec398119fc6911d99412c37af06a6bc27871f85:

   Merge tag 'for_upstream' of git://git.kernel.org/pub/scm/virt/kvm/mst/qemu 
into staging (2022-05-16 16:31:01 -0700)

are available in the git repository at:

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

for you to fetch changes up to 052c2579b89b0d87debe8b05594b5180f0fde87d:

   tulip: Assign default MAC address if not specified (2022-05-17 16:48:23 
+0800)




Helge Deller (1):
   tulip: Assign default MAC address if not specified

Vladislav Yaroshchuk (7):
   net/vmnet: add vmnet dependency and customizable option
   net/vmnet: add vmnet backends to qapi/net
   net/vmnet: implement shared mode (vmnet-shared)
   net/vmnet: implement host mode (vmnet-host)
   net/vmnet: implement bridged mode (vmnet-bridged)
   net/vmnet: update qemu-options.hx
   net/vmnet: update hmp-commands.hx


Applied, thanks.  Please update https://wiki.qemu.org/ChangeLog/7.1 as 
appropriate.


r~





  hmp-commands.hx   |   6 +-
  hw/net/tulip.c|   4 +-
  meson.build   |  16 +-
  meson_options.txt |   2 +
  net/clients.h |  11 ++
  net/meson.build   |   7 +
  net/net.c |  10 ++
  net/vmnet-bridged.m   | 152 +
  net/vmnet-common.m| 378 ++
  net/vmnet-host.c  | 128 ++
  net/vmnet-shared.c| 114 +
  net/vmnet_int.h   |  63 +++
  qapi/net.json | 133 ++-
  qemu-options.hx   |  25 +++
  scripts/meson-buildoptions.sh |   1 +
  15 files changed, 1044 insertions(+), 6 deletions(-)
  create mode 100644 net/vmnet-bridged.m
  create mode 100644 net/vmnet-common.m
  create mode 100644 net/vmnet-host.c
  create mode 100644 net/vmnet-shared.c
  create mode 100644 net/vmnet_int.h

[PULL 0/8] Net patches

[Jason Wang]

The following changes since commit eec398119fc6911d99412c37af06a6bc27871f85:

  Merge tag 'for_upstream' of git://git.kernel.org/pub/scm/virt/kvm/mst/qemu 
into staging (2022-05-16 16:31:01 -0700)

are available in the git repository at:

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

for you to fetch changes up to 052c2579b89b0d87debe8b05594b5180f0fde87d:

  tulip: Assign default MAC address if not specified (2022-05-17 16:48:23 +0800)




Helge Deller (1):
  tulip: Assign default MAC address if not specified

Vladislav Yaroshchuk (7):
  net/vmnet: add vmnet dependency and customizable option
  net/vmnet: add vmnet backends to qapi/net
  net/vmnet: implement shared mode (vmnet-shared)
  net/vmnet: implement host mode (vmnet-host)
  net/vmnet: implement bridged mode (vmnet-bridged)
  net/vmnet: update qemu-options.hx
  net/vmnet: update hmp-commands.hx

 hmp-commands.hx   |   6 +-
 hw/net/tulip.c|   4 +-
 meson.build   |  16 +-
 meson_options.txt |   2 +
 net/clients.h |  11 ++
 net/meson.build   |   7 +
 net/net.c |  10 ++
 net/vmnet-bridged.m   | 152 +
 net/vmnet-common.m| 378 ++
 net/vmnet-host.c  | 128 ++
 net/vmnet-shared.c| 114 +
 net/vmnet_int.h   |  63 +++
 qapi/net.json | 133 ++-
 qemu-options.hx   |  25 +++
 scripts/meson-buildoptions.sh |   1 +
 15 files changed, 1044 insertions(+), 6 deletions(-)
 create mode 100644 net/vmnet-bridged.m
 create mode 100644 net/vmnet-common.m
 create mode 100644 net/vmnet-host.c
 create mode 100644 net/vmnet-shared.c
 create mode 100644 net/vmnet_int.h

Re: [PULL 0/8] Net patches

[Peter Maydell]

On Mon, 14 Feb 2022 at 04:00, Jason Wang  wrote:
>
> The following changes since commit 48033ad678ae2def43bf0d543a2c4c3d2a93feaf:
>
>   Merge remote-tracking branch 
> 'remotes/vsementsov/tags/pull-nbd-2022-02-09-v2' into staging (2022-02-12 
> 22:04:07 +)
>
> are available in the git repository at:
>
>   https://github.com/jasowang/qemu.git tags/net-pull-request
>
> for you to fetch changes up to 9d6267b240c114d1a3cd314a08fd6e1339d34b83:
>
>   net/eth: Don't consider ESP to be an IPv6 option header (2022-02-14 
> 11:50:44 +0800)
>
> 

Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/7.0
for any user-visible changes.

-- PMM

[PULL 0/8] Net patches

[Jason Wang]

The following changes since commit 48033ad678ae2def43bf0d543a2c4c3d2a93feaf:

  Merge remote-tracking branch 'remotes/vsementsov/tags/pull-nbd-2022-02-09-v2' 
into staging (2022-02-12 22:04:07 +)

are available in the git repository at:

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

for you to fetch changes up to 9d6267b240c114d1a3cd314a08fd6e1339d34b83:

  net/eth: Don't consider ESP to be an IPv6 option header (2022-02-14 11:50:44 
+0800)




Nick Hudson (1):
  hw/net: e1000e: Clear ICR on read when using non MSI-X interrupts

Peter Foley (2):
  net/tap: Set return code on failure
  net: Fix uninitialized data usage

Philippe Mathieu-Daudé (1):
  hw/net/vmxnet3: Log guest-triggerable errors using LOG_GUEST_ERROR

Rao Lei (1):
  net/filter: Optimize filter_send to coroutine

Thomas Jansen (1):
  net/eth: Don't consider ESP to be an IPv6 option header

Zhang Chen (2):
  net/colo-compare.c: Optimize compare order for performance
  net/colo-compare.c: Update the default value comments

 hw/net/e1000e_core.c |  5 
 hw/net/trace-events  |  1 +
 hw/net/vmxnet3.c |  4 +++-
 net/colo-compare.c   | 28 +++---
 net/eth.c|  1 -
 net/filter-mirror.c  | 66 +---
 net/tap-linux.c  |  1 +
 net/tap.c|  1 +
 8 files changed, 78 insertions(+), 29 deletions(-)

Re: [Qemu-devel] [PULL 0/8] Net patches

[Peter Maydell]

On 14 November 2017 at 02:11, Jason Wang  wrote:
> The following changes since commit 4ffa88c99c54d2a30f79e3dbecec50b023eff1c8:
>
>   Merge remote-tracking branch 
> 'remotes/berrange/tags/pull-qcrypto-2017-11-08-1' into staging (2017-11-10 
> 16:01:35 +)
>
> are available in the git repository at:
>
>   https://github.com/jasowang/qemu.git tags/net-pull-request
>
> for you to fetch changes up to bb160b571fe469b03228d4502c75a18045978a74:
>
>   net/socket: fix coverity issue (2017-11-13 18:05:12 +0800)
>
> 
>
> 
> Jens Freimann (2):
>   net: fix check for number of parameters to -netdev socket
>   net/socket: fix coverity issue
>
> Mao Zhongyi (4):
>   colo-compare: Insert packet into the suitable position of packet queue 
> directly
>   colo-compare: compare the packet in a specified Connection
>   colo-compare: Fix comments
>   colo: Consolidate the duplicate code chunk into a routine
>
> Mike Nawrocki (2):
>   Fix eepro100 simple transmission mode
>   Add new PCI ID for i82559a

Applied, thanks.

-- PMM

[Qemu-devel] [PULL 0/8] Net patches

[Jason Wang]

The following changes since commit 4ffa88c99c54d2a30f79e3dbecec50b023eff1c8:

  Merge remote-tracking branch 
'remotes/berrange/tags/pull-qcrypto-2017-11-08-1' into staging (2017-11-10 
16:01:35 +)

are available in the git repository at:

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

for you to fetch changes up to bb160b571fe469b03228d4502c75a18045978a74:

  net/socket: fix coverity issue (2017-11-13 18:05:12 +0800)




Jens Freimann (2):
  net: fix check for number of parameters to -netdev socket
  net/socket: fix coverity issue

Mao Zhongyi (4):
  colo-compare: Insert packet into the suitable position of packet queue 
directly
  colo-compare: compare the packet in a specified Connection
  colo-compare: Fix comments
  colo: Consolidate the duplicate code chunk into a routine

Mike Nawrocki (2):
  Fix eepro100 simple transmission mode
  Add new PCI ID for i82559a

 hw/net/eepro100.c| 31 +-
 include/hw/compat.h  |  4 
 include/hw/pci/pci.h |  1 +
 net/colo-compare.c   | 61 ++--
 net/colo.c   | 18 +---
 net/colo.h   |  1 +
 net/socket.c |  6 +++---
 qemu-options.hx  |  2 +-
 8 files changed, 71 insertions(+), 53 deletions(-)

Re: [Qemu-devel] [PULL 0/8] Net patches

[Cédric Le Goater]

On 04/25/2017 05:57 AM, Jason Wang wrote:
> 
> 
> On 2017年04月25日 00:02, Cédric Le Goater wrote:
>> On 04/24/2017 03:49 PM, Peter Maydell wrote:
>>> On 24 April 2017 at 06:15, Jason Wang  wrote:
 The following changes since commit 
 32c7e0ab755745e961f1772e95cac381cc68769d:

Merge remote-tracking branch 
 'remotes/juanquintela/tags/migration/20170421' into staging (2017-04-21 
 15:59:27 +0100)

 are available in the git repository at:

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

 for you to fetch changes up to 049f6d8237dd0b14dee02e4c22b20114c43cecff:

COLO-compare: Optimize tcp compare trace event (2017-04-24 11:30:36 
 +0800)

 

 
>>> Hi. Clang picks up what looks like a typo:
>>>
>>> /Users/pm215/src/qemu-for-merges/hw/net/ftgmac100.c:809:33: error: use
>>> of logical '&&' with constant operand
>>> [-Werror,-Wconstant-logical-operand]
>>>  if (size < 64 && !(s->maccr && FTGMAC100_MACCR_RX_RUNT)) {
>>>  ^  ~~~
>>> /Users/pm215/src/qemu-for-merges/hw/net/ftgmac100.c:809:33: note: use
>>> '&' for a bitwise operation
>>>  if (size < 64 && !(s->maccr && FTGMAC100_MACCR_RX_RUNT)) {
>>>  ^~
>>>  &
>>> /Users/pm215/src/qemu-for-merges/hw/net/ftgmac100.c:809:33: note:
>>> remove constant to silence this warning
>>>  if (size < 64 && !(s->maccr && FTGMAC100_MACCR_RX_RUNT)) {
>>> ~^~
>> Jason,
>>
>> How do you want to handle that ? A resend of the patch or a fix ?
>>
>> Thanks,
>>
>> C.
>>
> 
> The fix looks trivial, let me fix it.

OK. Thanks,

C.

Re: [Qemu-devel] [PULL 0/8] Net patches

[Jason Wang]

On 2017年04月25日 00:02, Cédric Le Goater wrote:

On 04/24/2017 03:49 PM, Peter Maydell wrote:

On 24 April 2017 at 06:15, Jason Wang  wrote:

The following changes since commit 32c7e0ab755745e961f1772e95cac381cc68769d:

   Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20170421' 
into staging (2017-04-21 15:59:27 +0100)

are available in the git repository at:

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

for you to fetch changes up to 049f6d8237dd0b14dee02e4c22b20114c43cecff:

   COLO-compare: Optimize tcp compare trace event (2017-04-24 11:30:36 +0800)





Hi. Clang picks up what looks like a typo:

/Users/pm215/src/qemu-for-merges/hw/net/ftgmac100.c:809:33: error: use
of logical '&&' with constant operand
[-Werror,-Wconstant-logical-operand]
 if (size < 64 && !(s->maccr && FTGMAC100_MACCR_RX_RUNT)) {
 ^  ~~~
/Users/pm215/src/qemu-for-merges/hw/net/ftgmac100.c:809:33: note: use
'&' for a bitwise operation
 if (size < 64 && !(s->maccr && FTGMAC100_MACCR_RX_RUNT)) {
 ^~
 &
/Users/pm215/src/qemu-for-merges/hw/net/ftgmac100.c:809:33: note:
remove constant to silence this warning
 if (size < 64 && !(s->maccr && FTGMAC100_MACCR_RX_RUNT)) {
~^~

Jason,

How do you want to handle that ? A resend of the patch or a fix ?

Thanks,

C.



The fix looks trivial, let me fix it.

Thanks

Re: [Qemu-devel] [PULL 0/8] Net patches

[Cédric Le Goater]

On 04/24/2017 03:49 PM, Peter Maydell wrote:
> On 24 April 2017 at 06:15, Jason Wang  wrote:
>> The following changes since commit 32c7e0ab755745e961f1772e95cac381cc68769d:
>>
>>   Merge remote-tracking branch 
>> 'remotes/juanquintela/tags/migration/20170421' into staging (2017-04-21 
>> 15:59:27 +0100)
>>
>> are available in the git repository at:
>>
>>   https://github.com/jasowang/qemu.git tags/net-pull-request
>>
>> for you to fetch changes up to 049f6d8237dd0b14dee02e4c22b20114c43cecff:
>>
>>   COLO-compare: Optimize tcp compare trace event (2017-04-24 11:30:36 +0800)
>>
>> 
>>
>> 
> 
> Hi. Clang picks up what looks like a typo:
> 
> /Users/pm215/src/qemu-for-merges/hw/net/ftgmac100.c:809:33: error: use
> of logical '&&' with constant operand
> [-Werror,-Wconstant-logical-operand]
> if (size < 64 && !(s->maccr && FTGMAC100_MACCR_RX_RUNT)) {
> ^  ~~~
> /Users/pm215/src/qemu-for-merges/hw/net/ftgmac100.c:809:33: note: use
> '&' for a bitwise operation
> if (size < 64 && !(s->maccr && FTGMAC100_MACCR_RX_RUNT)) {
> ^~
> &
> /Users/pm215/src/qemu-for-merges/hw/net/ftgmac100.c:809:33: note:
> remove constant to silence this warning
> if (size < 64 && !(s->maccr && FTGMAC100_MACCR_RX_RUNT)) {
>~^~

Jason,

How do you want to handle that ? A resend of the patch or a fix ?

Thanks,

C. 

Re: [Qemu-devel] [PULL 0/8] Net patches

[Peter Maydell]

On 24 April 2017 at 06:15, Jason Wang  wrote:
> The following changes since commit 32c7e0ab755745e961f1772e95cac381cc68769d:
>
>   Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20170421' 
> into staging (2017-04-21 15:59:27 +0100)
>
> are available in the git repository at:
>
>   https://github.com/jasowang/qemu.git tags/net-pull-request
>
> for you to fetch changes up to 049f6d8237dd0b14dee02e4c22b20114c43cecff:
>
>   COLO-compare: Optimize tcp compare trace event (2017-04-24 11:30:36 +0800)
>
> 
>
> 

Hi. Clang picks up what looks like a typo:

/Users/pm215/src/qemu-for-merges/hw/net/ftgmac100.c:809:33: error: use
of logical '&&' with constant operand
[-Werror,-Wconstant-logical-operand]
if (size < 64 && !(s->maccr && FTGMAC100_MACCR_RX_RUNT)) {
^  ~~~
/Users/pm215/src/qemu-for-merges/hw/net/ftgmac100.c:809:33: note: use
'&' for a bitwise operation
if (size < 64 && !(s->maccr && FTGMAC100_MACCR_RX_RUNT)) {
^~
&
/Users/pm215/src/qemu-for-merges/hw/net/ftgmac100.c:809:33: note:
remove constant to silence this warning
if (size < 64 && !(s->maccr && FTGMAC100_MACCR_RX_RUNT)) {
   ~^~
1 error generated.


thanks
-- PMM

[Qemu-devel] [PULL 0/8] Net patches

[Jason Wang]

The following changes since commit 32c7e0ab755745e961f1772e95cac381cc68769d:

  Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20170421' 
into staging (2017-04-21 15:59:27 +0100)

are available in the git repository at:

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

for you to fetch changes up to 049f6d8237dd0b14dee02e4c22b20114c43cecff:

  COLO-compare: Optimize tcp compare trace event (2017-04-24 11:30:36 +0800)




Cédric Le Goater (5):
  hw/net: add MII definitions
  net: add FTGMAC100 support
  net/ftgmac100: add a 'aspeed' property
  aspeed: add a FTGMAC100 nic
  slirp: add a fake NC-SI backend

Zhang Chen (3):
  colo-compare: Fix old packet check bug.
  COLO-compare: Optimize tcp compare for option field
  COLO-compare: Optimize tcp compare trace event

 default-configs/arm-softmmu.mak |1 +
 hw/arm/aspeed_soc.c |   21 +
 hw/net/Makefile.objs|1 +
 hw/net/ftgmac100.c  | 1016 +++
 include/hw/arm/aspeed_soc.h |2 +
 include/hw/net/ftgmac100.h  |   64 +++
 include/hw/net/mii.h|   71 ++-
 include/net/eth.h   |1 +
 net/colo-compare.c  |   69 ++-
 net/trace-events|3 +-
 slirp/Makefile.objs |2 +-
 slirp/ncsi-pkt.h|  419 
 slirp/ncsi.c|  130 +
 slirp/slirp.c   |4 +
 slirp/slirp.h   |3 +
 15 files changed, 1770 insertions(+), 37 deletions(-)
 create mode 100644 hw/net/ftgmac100.c
 create mode 100644 include/hw/net/ftgmac100.h
 create mode 100644 slirp/ncsi-pkt.h
 create mode 100644 slirp/ncsi.c