From: Jason Wang <jasowang@redhat.com>
Date: Fri, 5 Jun 2015 03:05:58 +0000 (-0400)
Subject: vhost: put log correctly in vhost_dev_start()
X-Git-Tag: v2.4.0-rc0~81^2~41
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=24bfa207efb9b9d591552eefc1f414ff33ef0eac;p=thirdparty%2Fqemu.git

vhost: put log correctly in vhost_dev_start()

We allocate an dummy log even if the size is zero. So we should put it
unconditionally too.

Signed-off-by: Jason Wang <jasowang@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---

diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c
index 01f1e0490ff..3a52a4d037b 100644
--- a/hw/virtio/vhost.c
+++ b/hw/virtio/vhost.c
@@ -1111,9 +1111,7 @@ int vhost_dev_start(struct vhost_dev *hdev, VirtIODevice *vdev)
 
     return 0;
 fail_log:
-    if (hdev->log_size) {
-        vhost_log_put(hdev, false);
-    }
+    vhost_log_put(hdev, false);
 fail_vq:
     while (--i >= 0) {
         vhost_virtqueue_stop(hdev,