[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 03/29] vhost: don't assume opaque is a fd, use ba
From: |
marcandre . lureau |
Subject: |
[Qemu-devel] [PATCH v4 03/29] vhost: don't assume opaque is a fd, use backend cleanup |
Date: |
Thu, 7 Jul 2016 03:00:27 +0200 |
From: Marc-André Lureau <address@hidden>
vhost-dev opaque isn't necessarily an fd, it can be a chardev when using
vhost-user. Goto fail, so vhost_backend_cleanup() is called to handle
backend cleanup appropriately.
vhost_set_backend_type() should never fail, use an assert().
Signed-off-by: Marc-André Lureau <address@hidden>
---
hw/virtio/vhost.c | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c
index a01394d..dbb4deb 100644
--- a/hw/virtio/vhost.c
+++ b/hw/virtio/vhost.c
@@ -997,21 +997,19 @@ int vhost_dev_init(struct vhost_dev *hdev, void *opaque,
hdev->migration_blocker = NULL;
- if (vhost_set_backend_type(hdev, backend_type) < 0) {
- close((uintptr_t)opaque);
- return -1;
- }
+ r = vhost_set_backend_type(hdev, backend_type);
+ assert(r >= 0);
- if (hdev->vhost_ops->vhost_backend_init(hdev, opaque) < 0) {
- close((uintptr_t)opaque);
- return -errno;
+ r = hdev->vhost_ops->vhost_backend_init(hdev, opaque);
+ if (r < 0) {
+ goto fail;
}
if (used_memslots > hdev->vhost_ops->vhost_backend_memslots_limit(hdev)) {
fprintf(stderr, "vhost backend memory slots limit is less"
" than current number of present memory slots\n");
- close((uintptr_t)opaque);
- return -1;
+ r = -1;
+ goto fail;
}
QLIST_INSERT_HEAD(&vhost_devices, hdev, entry);
--
2.9.0
- [Qemu-devel] [PATCH v4 00/29] vhost-user reconnect fixes, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v4 01/29] misc: indentation, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v4 03/29] vhost: don't assume opaque is a fd, use backend cleanup,
marcandre . lureau <=
- [Qemu-devel] [PATCH v4 02/29] vhost-user: minor simplification, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v4 04/29] vhost: make vhost_log_put() idempotent, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v4 05/29] vhost: assert the log was cleaned up, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v4 06/29] vhost: fix cleanup on not fully initialized device, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v4 08/29] vhost-net: always call vhost_dev_cleanup() on failure, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v4 09/29] vhost: fix calling vhost_dev_cleanup() after vhost_dev_init(), marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v4 07/29] vhost: make vhost_dev_cleanup() idempotent, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v4 10/29] vhost: do not assert() on vhost_ops failure, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v4 11/29] vhost: use error_report() instead of fprintf(stderr, ...), marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v4 12/29] qemu-char: fix qemu_chr_fe_set_msgfds() crash when disconnected, marcandre . lureau, 2016/07/06