diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-11-26 16:50:59 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-11-26 16:50:59 +0000 |
| commit | 72f75c76d84e2eefc6806dafca116860ffe847f0 (patch) | |
| tree | bc260d28464570f882bbef7249ec5154f0ae628e /hw/virtio | |
| parent | a5df35070a4c7fa8e2d9c6bd7175ee8e3e0f7641 (diff) | |
| parent | d08e42a1125d384cb53423f5810b0c7ea52dc6c9 (diff) | |
| download | qemu-72f75c76d84e2eefc6806dafca116860ffe847f0.zip qemu-72f75c76d84e2eefc6806dafca116860ffe847f0.tar.gz qemu-72f75c76d84e2eefc6806dafca116860ffe847f0.tar.bz2 | |
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
vhost, pc: fixes for 2.5
Minor vhost fixes. HW version tweak for PC.
Documentation and test updates.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Thu 26 Nov 2015 16:40:25 GMT using RSA key ID D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg: aka "Michael S. Tsirkin <mst@redhat.com>"
* remotes/mst/tags/for_upstream:
vhost-user-test: fix migration overlap test
Fix memory leak on error
Revert "vhost: send SET_VRING_ENABLE at start/stop"
tests/vhost-user-bridge: read command line arguments
tests/vhost-user-bridge: propose GUEST_ANNOUNCE feature
vhost-user: clarify start and enable
vhost-user: set link down when the char device is closed
pc: Don't set hw_version on pc-*-2.5
osdep: Change default value of qemu_hw_version() to "2.5+"
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/virtio')
| -rw-r--r-- | hw/virtio/vhost.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index 1794f0d..de29968 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -1226,11 +1226,6 @@ int vhost_dev_start(struct vhost_dev *hdev, VirtIODevice *vdev) } } - if (hdev->vhost_ops->vhost_set_vring_enable) { - /* only enable first vq pair by default */ - hdev->vhost_ops->vhost_set_vring_enable(hdev, hdev->vq_index == 0); - } - return 0; fail_log: vhost_log_put(hdev, false); @@ -1261,10 +1256,6 @@ void vhost_dev_stop(struct vhost_dev *hdev, VirtIODevice *vdev) hdev->vq_index + i); } - if (hdev->vhost_ops->vhost_set_vring_enable) { - hdev->vhost_ops->vhost_set_vring_enable(hdev, 0); - } - vhost_log_put(hdev, true); hdev->started = false; hdev->log = NULL; |