[Qemu-commits] [qemu/qemu] a2dbe1: net: Mark 'vlan' parameter as deprecated

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: a2dbe1356faff3cb613ae83b77c484a203be5f15
      
https://github.com/qemu/qemu/commit/a2dbe1356faff3cb613ae83b77c484a203be5f15
  Author: Thomas Huth <address@hidden>
  Date:   2017-02-15 (Wed, 15 Feb 2017)

  Changed paths:
    M net/net.c

  Log Message:
  -----------
  net: Mark 'vlan' parameter as deprecated

The 'vlan' parameter is a continuous source of confusion for the users,
many people mix it up with the more common term VLAN (the link layer
packet encapsulation), and even if they realize that the QEMU 'vlan' is
rather some kind of network hub emulation, there is still a high risk
that they configure their QEMU networking in a wrong way with this
parameter (e.g. by hooking NICs together, so they get a 'loopback'
between one and the other NIC).
Thus at one point in time, we should finally get rid of the 'vlan'
feature in QEMU. Let's do a first step in this direction by declaring
the 'vlan' parameter as deprecated and informing the users to use the
'netdev' parameter instead.

Signed-off-by: Thomas Huth <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: e514fc7e1231c6d95011e448e6c626f2bb6f3cd8
      
https://github.com/qemu/qemu/commit/e514fc7e1231c6d95011e448e6c626f2bb6f3cd8
  Author: Paolo Bonzini <address@hidden>
  Date:   2017-02-15 (Wed, 15 Feb 2017)

  Changed paths:
    M hw/net/e1000e_core.c

  Log Message:
  -----------
  net: e1000e: fix dead code in e1000e_write_packet_to_guest

Because is_first is declared inside a loop, it is always true.  The store
is dead, and so is the "else" branch of "if (is_first)".  is_last is
okay though.

Reported by Coverity.

Signed-off-by: Paolo Bonzini <address@hidden>
Reviewed-by: Dmitry Fleytman <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: a935cc3132aea175502f76c06eba7a78521ef3ba
      
https://github.com/qemu/qemu/commit/a935cc3132aea175502f76c06eba7a78521ef3ba
  Author: Zhang Chen <address@hidden>
  Date:   2017-02-15 (Wed, 15 Feb 2017)

  Changed paths:
    M net/colo-compare.c

  Log Message:
  -----------
  colo-compare: sort TCP packet queue by sequence number

Improve efficiency of TCP packet comparison.

Signed-off-by: Zhang Chen <address@hidden>
Signed-off-by: Li Zhijian <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 81f17e0d435c3db3a3e67e0d32ebf9c98973211f
      
https://github.com/qemu/qemu/commit/81f17e0d435c3db3a3e67e0d32ebf9c98973211f
  Author: Prasad J Pandit <address@hidden>
  Date:   2017-02-15 (Wed, 15 Feb 2017)

  Changed paths:
    M hw/net/imx_fec.c

  Log Message:
  -----------
  net: imx: limit buffer descriptor count

i.MX Fast Ethernet Controller uses buffer descriptors to manage
data flow to/fro receive & transmit queues. While transmitting
packets, it could continue to read buffer descriptors if a buffer
descriptor has length of zero and has crafted values in bd.flags.
Set an upper limit to number of buffer descriptors.

Reported-by: Li Qiang <address@hidden>
Signed-off-by: Prasad J Pandit <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 4154c7e03fa55b4cf52509a83d50d6c09d743b77
      
https://github.com/qemu/qemu/commit/4154c7e03fa55b4cf52509a83d50d6c09d743b77
  Author: Li Qiang <address@hidden>
  Date:   2017-02-15 (Wed, 15 Feb 2017)

  Changed paths:
    M hw/net/e1000e_core.c

  Log Message:
  -----------
  net: e1000e: fix an infinite loop issue

This issue is like the issue in e1000 network card addressed in
this commit:
e1000: eliminate infinite loops on out-of-bounds transfer start.

Signed-off-by: Li Qiang <address@hidden>
Reviewed-by: Dmitry Fleytman <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: ca5266de6cde132b647b44a108f6c0c009785fdd
      
https://github.com/qemu/qemu/commit/ca5266de6cde132b647b44a108f6c0c009785fdd
  Author: Peter Maydell <address@hidden>
  Date:   2017-02-16 (Thu, 16 Feb 2017)

  Changed paths:
    M hw/net/e1000e_core.c
    M hw/net/imx_fec.c
    M net/colo-compare.c
    M net/net.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into 
staging

# gpg: Signature made Wed 15 Feb 2017 03:46:59 GMT
# gpg:                using RSA key 0xEF04965B398D6211
# gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <address@hidden>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 215D 46F4 8246 689E C77F  3562 EF04 965B 398D 6211

* remotes/jasowang/tags/net-pull-request:
  net: e1000e: fix an infinite loop issue
  net: imx: limit buffer descriptor count
  colo-compare: sort TCP packet queue by sequence number
  net: e1000e: fix dead code in e1000e_write_packet_to_guest
  net: Mark 'vlan' parameter as deprecated

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/5dae13cd71f0...ca5266de6cde