[Qemu-commits] [qemu/qemu] 284f42: net/virtio: fix dev_unplug_pending

[Peter Maydell]

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

  Changed paths:
    M hw/net/virtio-net.c
    M migration/savevm.c

  Log Message:
  -----------
  net/virtio: fix dev_unplug_pending

.dev_unplug_pending is set up by virtio-net code indepent of failover
support was set for the device or not. This gives a wrong result when
we check for existing primary devices in migration code.

Fix this by actually calling dev_unplug_pending() instead of just
checking if the function pointer was set. When the feature was not
negotiated dev_unplug_pending() will always return false. This prevents
us from going into the wait-unplug state when there's no primary device
present.

Fixes: 9711cd0dfc3f ("net/virtio: add failover support")
Signed-off-by: Jens Freimann <address@hidden>
Reported-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 117378bf03fbe6ec004be9637aceb1b3e273e74f
      
https://github.com/qemu/qemu/commit/117378bf03fbe6ec004be9637aceb1b3e273e74f
  Author: Jens Freimann <address@hidden>
  Date:   2019-11-25 (Mon, 25 Nov 2019)

  Changed paths:
    M hw/net/virtio-net.c

  Log Message:
  -----------
  net/virtio: return early when failover primary alread added

Bail out when primary device was already added before.
This avoids printing a wrong warning message during reboot.

Fixes: 9711cd0dfc3f ("net/virtio: add failover support")
Signed-off-by: Jens Freimann <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 150ab54aa6934583180f88a2bd540bc6fc4fbff3
      
https://github.com/qemu/qemu/commit/150ab54aa6934583180f88a2bd540bc6fc4fbff3
  Author: Jens Freimann <address@hidden>
  Date:   2019-11-25 (Mon, 25 Nov 2019)

  Changed paths:
    M hw/net/virtio-net.c

  Log Message:
  -----------
  net/virtio: fix re-plugging of primary device

failover_replug_primary was returning true on failure which lead to
re-plug not working when a migration failed.  Fix this by returning
success when hotplug worked.  This is a bug that was missed in last
round of testing but was tested succesfully with this version.  Also
make sure we don't pass NULL to qdev_set_parent_bus().

This fixes CID 1407224.

Fixes: 9711cd0dfc3f ("net/virtio: add failover support")
Signed-off-by: Jens Freimann <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 4d0e59ace29277b2faa5b33c719be9baaa659093
      
https://github.com/qemu/qemu/commit/4d0e59ace29277b2faa5b33c719be9baaa659093
  Author: Jens Freimann <address@hidden>
  Date:   2019-11-25 (Mon, 25 Nov 2019)

  Changed paths:
    M hw/net/virtio-net.c

  Log Message:
  -----------
  net/virtio: return error when device_opts arg is NULL

This fixes CID 1407222.

Fixes: 9711cd0dfc3f ("net/virtio: add failover support")
Signed-off-by: Jens Freimann <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: a5f80c16f204e1348ba6d4edfd6e9dbd7b4ccbc3
      
https://github.com/qemu/qemu/commit/a5f80c16f204e1348ba6d4edfd6e9dbd7b4ccbc3
  Author: Peter Maydell <address@hidden>
  Date:   2019-11-25 (Mon, 25 Nov 2019)

  Changed paths:
    M hw/net/virtio-net.c
    M migration/savevm.c

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

# gpg: Signature made Mon 25 Nov 2019 15:30:56 GMT
# 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/virtio: return error when device_opts arg is NULL
  net/virtio: fix re-plugging of primary device
  net/virtio: return early when failover primary alread added
  net/virtio: fix dev_unplug_pending

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


Compare: https://github.com/qemu/qemu/compare/65e05c82bdc6...a5f80c16f204