[Qemu-commits] [qemu/qemu] 23bfaf: vhost_net: don't set backend for the uninitialized...

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 23bfaf77fa801ba30bb136de7cec47728eb02f4b
      
https://github.com/qemu/qemu/commit/23bfaf77fa801ba30bb136de7cec47728eb02f4b
  Author: Jason Wang <address@hidden>
  Date:   2019-05-17 (Fri, 17 May 2019)

  Changed paths:
    M hw/net/vhost_net.c
    M hw/virtio/virtio.c
    M include/hw/virtio/virtio.h

  Log Message:
  -----------
  vhost_net: don't set backend for the uninitialized virtqueue

We used to set backend unconditionally, this won't work for some
guests (e.g windows driver) who may not initialize all virtqueues. For
kernel backend, this will fail since it may try to validate the rings
during setting backend.

Fixing this by simply skipping the backend set when we find desc is
not ready.

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


  Commit: 427ceb0fecf7afcfd76ae65f7197188b2842d385
      
https://github.com/qemu/qemu/commit/427ceb0fecf7afcfd76ae65f7197188b2842d385
  Author: Chris Kenna <address@hidden>
  Date:   2019-05-17 (Fri, 17 May 2019)

  Changed paths:
    M hw/net/e1000.c

  Log Message:
  -----------
  e1000: Never increment the RX undersize count register

In situations where e1000 receives an undersized Ethernet frame,
QEMU increments the emulated "Receive Undersize Count (RUC)"
register when padding the frame.

This is incorrect because this an expected scenario (e.g. with
VLAN tag stripping) and not an error. As such, QEMU should not
increment the emulated RUC.

Fixes: 3b2743017749 ("e1000: Implementing various counters")

Reviewed-by: Mark Kanda <address@hidden>
Reviewed-by: Bhavesh Davda <address@hidden>
Reviewed-by: Stefano Garzarella <address@hidden>
Signed-off-by: Chris Kenna <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 178a0a5dea382ac13bc2cdd3c9c4c5728a40b06b
      
https://github.com/qemu/qemu/commit/178a0a5dea382ac13bc2cdd3c9c4c5728a40b06b
  Author: Stefano Garzarella <address@hidden>
  Date:   2019-05-17 (Fri, 17 May 2019)

  Changed paths:
    M net/slirp.c

  Log Message:
  -----------
  net/slirp: fix the IPv6 prefix length error message

Reword and add a missing parentheses at the end of the
error message.

Signed-off-by: Stefano Garzarella <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 78e4f446d2569210a8558946b2321f9ff2ef47f6
      
https://github.com/qemu/qemu/commit/78e4f446d2569210a8558946b2321f9ff2ef47f6
  Author: Lukas Straub <address@hidden>
  Date:   2019-05-17 (Fri, 17 May 2019)

  Changed paths:
    M net/colo-compare.c

  Log Message:
  -----------
  net/colo-compare.c: Fix a crash in COLO Primary.

Because event_unhandled_count may be accessed concurrently, it needs
to be protected by taking the lock. However the assert is outside the
lock, probably causing it to read garbage and aborting Qemu erroneously.

The Bug only happens when running Qemu in COLO mode.

This Patch fixes the following bug: https://bugs.launchpad.net/qemu/+bug/1824622

Signed-off-by: Lukas Straub <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Zhang Chen <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: e48a748fc899bbd9bfa63f08ebb83f1c31b7bb7d
      
https://github.com/qemu/qemu/commit/e48a748fc899bbd9bfa63f08ebb83f1c31b7bb7d
  Author: Peter Maydell <address@hidden>
  Date:   2019-05-17 (Fri, 17 May 2019)

  Changed paths:
    M hw/net/e1000.c
    M hw/net/vhost_net.c
    M hw/virtio/virtio.c
    M include/hw/virtio/virtio.h
    M net/colo-compare.c
    M net/slirp.c

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

# gpg: Signature made Fri 17 May 2019 10:01:18 BST
# gpg:                using RSA key EF04965B398D6211
# gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <address@hidden>" 
[marginal]
# 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/colo-compare.c: Fix a crash in COLO Primary.
  net/slirp: fix the IPv6 prefix length error message
  e1000: Never increment the RX undersize count register
  vhost_net: don't set backend for the uninitialized virtqueue

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


Compare: https://github.com/qemu/qemu/compare/b0f9690e7882...e48a748fc899