]> git.ipfire.org Git - thirdparty/qemu.git/commit
Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 25 Nov 2019 16:25:47 +0000 (16:25 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 25 Nov 2019 16:25:47 +0000 (16:25 +0000)
commita5f80c16f204e1348ba6d4edfd6e9dbd7b4ccbc3
treefebbb39911f8d17f86b8cb452911bf0677291523
parent65e05c82bdc6d348155e301c9d87dba7a08a5701
parent4d0e59ace29277b2faa5b33c719be9baaa659093
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) <jasowang@redhat.com>" [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 <peter.maydell@linaro.org>