[Qemu-commits] [qemu/qemu] ff86d5: net: fix check for number of parameters to -netdev...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: ff86d5762552787f1fcb7da695ec4f8c1be754b4
      
https://github.com/qemu/qemu/commit/ff86d5762552787f1fcb7da695ec4f8c1be754b4
  Author: Jens Freimann <address@hidden>
  Date:   2017-11-13 (Mon, 13 Nov 2017)

  Changed paths:
    M net/socket.c

  Log Message:
  -----------
  net: fix check for number of parameters to -netdev socket

Since commit 0f8c289ad "net: fix -netdev socket,fd= for UDP sockets"
we allow more than one parameter for -netdev socket. But now
we run into an assert when no parameter at all is specified

> qemu-system-x86_64 -netdev socket
socket.c:729: net_init_socket: Assertion `sock->has_udp' failed.

Fix this by reverting the change of the if condition done in 0f8c289ad.

Cc: Jason Wang <address@hidden>
Cc: address@hidden
Fixes: 0f8c289ad539feb5135c545bea947b310a893f4b
Reported-by: Mao Zhongyi <address@hidden>
Signed-off-by: Jens Freimann <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 8850d4caa7ad3f50adb2dd8d89842c67ae81a4b2
      
https://github.com/qemu/qemu/commit/8850d4caa7ad3f50adb2dd8d89842c67ae81a4b2
  Author: Mao Zhongyi <address@hidden>
  Date:   2017-11-13 (Mon, 13 Nov 2017)

  Changed paths:
    M net/colo-compare.c

  Log Message:
  -----------
  colo-compare: Insert packet into the suitable position of packet queue 
directly

Currently, a packet from pri_dev or sec_dev is fristly pushed at the
tail of the primary or secondary packet queue then sorted by the tcp
sequence number.

Now, this patch use g_queue_insert_sorted to insert the packet directly
into the suitable position to avoid ordering all packets each time when
a new packet is comming, thereby increasing efficiency.

In addition, consolidate the code that add a packet to the list of
Connection (primary or secondary) into a separate routine colo_insert_packet()
since the same chunk of code is called from two place.

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


  Commit: 8ec14402029d783720f4312ed8a925548e1dad61
      
https://github.com/qemu/qemu/commit/8ec14402029d783720f4312ed8a925548e1dad61
  Author: Mao Zhongyi <address@hidden>
  Date:   2017-11-13 (Mon, 13 Nov 2017)

  Changed paths:
    M net/colo-compare.c

  Log Message:
  -----------
  colo-compare: compare the packet in a specified Connection

A package from pri_indev or sec_indev only belongs to a particular
Connection, so we only need to compare the package in the specified
Connection's primary_list and secondary_list, rather than for each
the whole Connection list to compare. This is time-consuming and
unnecessary.

Less checkpoint more efficiency.

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


  Commit: 3463218c6cb6326f3b428935209aa0828d69ee42
      
https://github.com/qemu/qemu/commit/3463218c6cb6326f3b428935209aa0828d69ee42
  Author: Mao Zhongyi <address@hidden>
  Date:   2017-11-13 (Mon, 13 Nov 2017)

  Changed paths:
    M net/colo-compare.c

  Log Message:
  -----------
  colo-compare: Fix comments

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


  Commit: 8fa5ad6dfb66b6c695aa6a6b54b7031c90345a37
      
https://github.com/qemu/qemu/commit/8fa5ad6dfb66b6c695aa6a6b54b7031c90345a37
  Author: Mao Zhongyi <address@hidden>
  Date:   2017-11-13 (Mon, 13 Nov 2017)

  Changed paths:
    M net/colo.c
    M net/colo.h

  Log Message:
  -----------
  colo: Consolidate the duplicate code chunk into a routine

Consolidate the code that extract the ip address(src,dst) and
port number(src,dst) of the packet into a separate routine
extract_ip_and_port() since the same chunk of code is called
from two place.

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


  Commit: 1865e288a823c764cd4344d704e33344595152b8
      
https://github.com/qemu/qemu/commit/1865e288a823c764cd4344d704e33344595152b8
  Author: Mike Nawrocki <address@hidden>
  Date:   2017-11-13 (Mon, 13 Nov 2017)

  Changed paths:
    M hw/net/eepro100.c

  Log Message:
  -----------
  Fix eepro100 simple transmission mode

The simple transmission mode was treating the area immediately after the
transmit command block (TCB) as if it were a transmit buffer descriptor,
when in reality it is simply the packet data. This change simply copies
the data following the TCB into the packet buffer.

Signed-off-by: Mike Nawrocki <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 5e89dc01133f8f5e621f6b66b356c6f37d31dafb
      
https://github.com/qemu/qemu/commit/5e89dc01133f8f5e621f6b66b356c6f37d31dafb
  Author: Mike Nawrocki <address@hidden>
  Date:   2017-11-13 (Mon, 13 Nov 2017)

  Changed paths:
    M hw/net/eepro100.c
    M include/hw/compat.h
    M include/hw/pci/pci.h
    M qemu-options.hx

  Log Message:
  -----------
  Add new PCI ID for i82559a

Adds a new PCI ID for the i82559a (0x8086 0x1030) interface. The
"x-use-alt-device-id" property controls whether this new ID is to be
used, and is true by default, and set to false in a compat entry.

Signed-off-by: Mike Nawrocki <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: bb160b571fe469b03228d4502c75a18045978a74
      
https://github.com/qemu/qemu/commit/bb160b571fe469b03228d4502c75a18045978a74
  Author: Jens Freimann <address@hidden>
  Date:   2017-11-13 (Mon, 13 Nov 2017)

  Changed paths:
    M net/socket.c

  Log Message:
  -----------
  net/socket: fix coverity issue

This fixes coverity issue CID1005339.

Make sure that saddr is not used uninitialized if the
mcast parameter is NULL.

Cc: address@hidden
Reported-by: Peter Maydell <address@hidden>
Signed-off-by: Jens Freimann <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 9895606363615a0d2a9554c9dadc7c57ec81f969
      
https://github.com/qemu/qemu/commit/9895606363615a0d2a9554c9dadc7c57ec81f969
  Author: Peter Maydell <address@hidden>
  Date:   2017-11-14 (Tue, 14 Nov 2017)

  Changed paths:
    M hw/net/eepro100.c
    M include/hw/compat.h
    M include/hw/pci/pci.h
    M net/colo-compare.c
    M net/colo.c
    M net/colo.h
    M net/socket.c
    M qemu-options.hx

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

# gpg: Signature made Tue 14 Nov 2017 02:05:34 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/socket: fix coverity issue
  Add new PCI ID for i82559a
  Fix eepro100 simple transmission mode
  colo: Consolidate the duplicate code chunk into a routine
  colo-compare: Fix comments
  colo-compare: compare the packet in a specified Connection
  colo-compare: Insert packet into the suitable position of packet queue 
directly
  net: fix check for number of parameters to -netdev socket

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


Compare: https://github.com/qemu/qemu/compare/55ed8d600abf...989560636361