[Qemu-commits] [qemu/qemu] ca1ee3: net: fix qemu_announce_self not emitting packets

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: ca1ee3d6b546e841a1b9db413eb8fa09f13a061b
      
https://github.com/qemu/qemu/commit/ca1ee3d6b546e841a1b9db413eb8fa09f13a061b
  Author: Peter Lieven <address@hidden>
  Date:   2016-06-28 (Tue, 28 Jun 2016)

  Changed paths:
    M net/net.c

  Log Message:
  -----------
  net: fix qemu_announce_self not emitting packets

commit fefe2a78 accidently dropped the code path for injecting
raw packets. This feature is needed for sending gratuitous ARPs
after an incoming migration has completed. The result is increased
network downtime for vservers where the network card is not virtio-net
with the VIRTIO_NET_F_GUEST_ANNOUNCE feature.

Fixes: fefe2a78abde932e0f340b21bded2c86def1d242
Cc: address@hidden
Cc: address@hidden
Signed-off-by: Peter Lieven <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: d88d3a093898bd1dc0898c7c87b0d3f555a24a6e
      
https://github.com/qemu/qemu/commit/d88d3a093898bd1dc0898c7c87b0d3f555a24a6e
  Author: Prasad J Pandit <address@hidden>
  Date:   2016-06-28 (Tue, 28 Jun 2016)

  Changed paths:
    M hw/net/mipsnet.c

  Log Message:
  -----------
  net: mipsnet: check transmit buffer size before sending

When processing MIPSnet I/O port write operation, it uses a
transmit buffer tx_buffer[MAX_ETH_FRAME_SIZE=1514]. Two indices
's->tx_written' and 's->tx_count' are used to control data written
to this buffer. If the two were to be equal before writing, it'd
lead to an OOB write access beyond tx_buffer. Add check to avoid it.

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


  Commit: 7e8449594c92992342512061160bc846c922016d
      
https://github.com/qemu/qemu/commit/7e8449594c92992342512061160bc846c922016d
  Author: Ashijeet Acharya <address@hidden>
  Date:   2016-06-28 (Tue, 28 Jun 2016)

  Changed paths:
    M include/qemu/sockets.h
    M net/socket.c
    M util/qemu-sockets.c

  Log Message:
  -----------
  Change net/socket.c to use socket_*() functions

Use socket_*() functions from include/qemu/sockets.h instead of
listen()/bind()/connect()/parse_host_port(). socket_*() fucntions are
QAPI based and this patch  performs this api conversion since
everything will be using QAPI based sockets in the future. Also add a
helper function socket_address_to_string() in util/qemu-sockets.c
which returns the string representation of socket address. Thetask was
listed on http://wiki.qemu.org/BiteSizedTasks page.

Signed-off-by: Ashijeet Acharya <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 46fe8bef4d88e91942387ef334e7a9b3e6542314
      
https://github.com/qemu/qemu/commit/46fe8bef4d88e91942387ef334e7a9b3e6542314
  Author: David Vrabel <address@hidden>
  Date:   2016-06-28 (Tue, 28 Jun 2016)

  Changed paths:
    M hw/net/rtl8139.c

  Log Message:
  -----------
  rtl8139: save/load RxMulOk counter (again)

Commit 9d29cdeaaca3a0383af764000b71492c4fc67c6e (rtl8139: port
TallyCounters to vmstate) introduced in incompatibility in the v4
format as it omitted the RxOkMul counter.

There are presumably no users that were impacted by the v4 to v4'
breakage, so increase the save version to 5 and re-add the field,
keeping backward compatibility with v4'.

We can't have a field conditional on the section version in
vmstate_tally_counters since this version checked would not be the
section version (but the version defined in this structure).  So, move
all the fields into the main state structure.

Signed-off-by: David Vrabel <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: c508277335e3b6b20cf18e6ea3a35c1fa835c64a
      
https://github.com/qemu/qemu/commit/c508277335e3b6b20cf18e6ea3a35c1fa835c64a
  Author: KarimAllah Ahmed <address@hidden>
  Date:   2016-06-28 (Tue, 28 Jun 2016)

  Changed paths:
    M hw/net/vmware_utils.h
    M hw/net/vmxnet3.c

  Log Message:
  -----------
  vmxnet3: Fix reading/writing guest memory specially when behind an IOMMU

When a PCI device lives behind an IOMMU, it should use 'pci_dma_*' family of
functions when any transfer from/to guest memory is required while
'cpu_physical_memory_*' family of functions completely bypass any MMU/IOMMU in
the system.

vmxnet3 in some places was using 'cpu_physical_memory_*' family of functions
which works fine with the default QEMU setup where IOMMU is not enabled but
fails miserably when IOMMU is enabled. This commit converts all such instances
in favor of 'pci_dma_*'

Cc: Dmitry Fleytman <address@hidden>
Cc: Jason Wang <address@hidden>
Cc: address@hidden
Cc: Anthony Liguori <address@hidden>
Signed-off-by: KarimAllah Ahmed <address@hidden>
Acked-by: Dmitry Fleytman <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 40428feaeb9708f1bc5b2582d9f071a3db907c07
      
https://github.com/qemu/qemu/commit/40428feaeb9708f1bc5b2582d9f071a3db907c07
  Author: Peter Maydell <address@hidden>
  Date:   2016-06-28 (Tue, 28 Jun 2016)

  Changed paths:
    M hw/net/mipsnet.c
    M hw/net/rtl8139.c
    M hw/net/vmware_utils.h
    M hw/net/vmxnet3.c
    M include/qemu/sockets.h
    M net/net.c
    M net/socket.c
    M util/qemu-sockets.c

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

# gpg: Signature made Tue 28 Jun 2016 04:29:53 BST
# 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:
  vmxnet3: Fix reading/writing guest memory specially when behind an IOMMU
  rtl8139: save/load RxMulOk counter (again)
  Change net/socket.c to use socket_*() functions
  net: mipsnet: check transmit buffer size before sending
  net: fix qemu_announce_self not emitting packets

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


Compare: https://github.com/qemu/qemu/compare/aa4b04a09cf7...40428feaeb97