diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-06-15 11:41:44 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-06-15 11:41:44 +0100 |
| commit | 91fe7a376ad46e3cc5e82d418aad22173c948a3c (patch) | |
| tree | 076c5367d214228c7344bd08cf16e5aa3fb1ad4d /qemu-img.c | |
| parent | 409c241f887a38bb7a2ac12e34d3a8d73922a9a5 (diff) | |
| parent | c67daf4a24442d1bb404a11a6a54dc45ea10f234 (diff) | |
Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging
# gpg: Signature made Fri 15 Jun 2018 03:47:09 BST
# gpg: using RSA key EF04965B398D6211
# gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <jasowang@redhat.com>"
# 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:
vhost-user: delete net client if necessary
e1000e: Do not auto-clear ICR bits which aren't set in EIAC
net: Fix a potential segfault
tap: set vhostfd passed from qemu cli to non-blocking
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qemu-img.c')
0 files changed, 0 insertions, 0 deletions