[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 01/42] vhost: put log correctly in vhost_dev_start()
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 01/42] vhost: put log correctly in vhost_dev_start() |
Date: |
Thu, 11 Jun 2015 13:58:06 +0200 |
From: Jason Wang <address@hidden>
We allocate an dummy log even if the size is zero. So we should put it
unconditionally too.
Signed-off-by: Jason Wang <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/virtio/vhost.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c
index 01f1e04..3a52a4d 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,
--
MST
- [Qemu-devel] [PULL 00/42] pc, acpi, virtio, Michael S. Tsirkin, 2015/06/11
- [Qemu-devel] [PULL 01/42] vhost: put log correctly in vhost_dev_start(),
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 02/42] virtio: endianness checks for virtio 1.0 devices, Michael S. Tsirkin, 2015/06/11
- [Qemu-devel] [PULL 03/42] virtio: allow virtio-1 queue layout, Michael S. Tsirkin, 2015/06/11
- [Qemu-devel] [PULL 05/42] virtio: disallow late feature changes for virtio-1, Michael S. Tsirkin, 2015/06/11
- [Qemu-devel] [PULL 04/42] dataplane: allow virtio-1 devices, Michael S. Tsirkin, 2015/06/11
- [Qemu-devel] [PULL 06/42] virtio: allow to fail setting status, Michael S. Tsirkin, 2015/06/11
- [Qemu-devel] [PULL 07/42] virtio-net: no writeable mac for virtio-1, Michael S. Tsirkin, 2015/06/11
- [Qemu-devel] [PULL 08/42] virtio-net: support longer header, Michael S. Tsirkin, 2015/06/11
- [Qemu-devel] [PULL 10/42] vhost_net: add version_1 feature, Michael S. Tsirkin, 2015/06/11
- [Qemu-devel] [PULL 09/42] virtio-net: enable virtio 1.0, Michael S. Tsirkin, 2015/06/11
- [Qemu-devel] [PULL 12/42] linux-headers: add virtio_pci, Michael S. Tsirkin, 2015/06/11