[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 13/16] vhost: Clean up how VhostOpts method vhost_backend_init()
From: |
Markus Armbruster |
Subject: |
[PATCH 13/16] vhost: Clean up how VhostOpts method vhost_backend_init() fails |
Date: |
Tue, 20 Jul 2021 14:54:05 +0200 |
vhost_user_backend_init() can fail without setting an error. Unclean.
Its caller vhost_dev_init() compensates by substituting a generic
error then. Goes back to commit 28770ff935 "vhost: Distinguish errors
in vhost_backend_init()".
Clean up by moving the generic error from vhost_dev_init() to all the
failure paths that neglect to set an error.
Cc: Kevin Wolf <kwolf@redhat.com>
Cc: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
hw/virtio/vhost-user.c | 6 ++++++
hw/virtio/vhost.c | 4 ----
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c
index dbbd6fbc25..b4a4998088 100644
--- a/hw/virtio/vhost-user.c
+++ b/hw/virtio/vhost-user.c
@@ -1876,6 +1876,7 @@ static int vhost_user_backend_init(struct vhost_dev *dev,
void *opaque,
err = vhost_user_get_features(dev, &features);
if (err < 0) {
+ error_setg_errno(errp, -err, "vhost_backend_init failed");
return err;
}
@@ -1885,6 +1886,7 @@ static int vhost_user_backend_init(struct vhost_dev *dev,
void *opaque,
err = vhost_user_get_u64(dev, VHOST_USER_GET_PROTOCOL_FEATURES,
&protocol_features);
if (err < 0) {
+ error_setg_errno(errp, EPROTO, "vhost_backend_init failed");
return -EPROTO;
}
@@ -1903,6 +1905,7 @@ static int vhost_user_backend_init(struct vhost_dev *dev,
void *opaque,
err = vhost_user_set_protocol_features(dev, dev->protocol_features);
if (err < 0) {
+ error_setg_errno(errp, EPROTO, "vhost_backend_init failed");
return -EPROTO;
}
@@ -1911,6 +1914,7 @@ static int vhost_user_backend_init(struct vhost_dev *dev,
void *opaque,
err = vhost_user_get_u64(dev, VHOST_USER_GET_QUEUE_NUM,
&dev->max_queues);
if (err < 0) {
+ error_setg_errno(errp, EPROTO, "vhost_backend_init failed");
return -EPROTO;
}
} else {
@@ -1940,6 +1944,7 @@ static int vhost_user_backend_init(struct vhost_dev *dev,
void *opaque,
} else {
err = vhost_user_get_max_memslots(dev, &ram_slots);
if (err < 0) {
+ error_setg_errno(errp, EPROTO, "vhost_backend_init failed");
return -EPROTO;
}
@@ -1966,6 +1971,7 @@ static int vhost_user_backend_init(struct vhost_dev *dev,
void *opaque,
if (dev->vq_index == 0) {
err = vhost_setup_slave_channel(dev);
if (err < 0) {
+ error_setg_errno(errp, EPROTO, "vhost_backend_init failed");
return -EPROTO;
}
}
diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c
index 88f8a397dc..3c0b537f89 100644
--- a/hw/virtio/vhost.c
+++ b/hw/virtio/vhost.c
@@ -1289,7 +1289,6 @@ int vhost_dev_init(struct vhost_dev *hdev, void *opaque,
VhostBackendType backend_type, uint32_t busyloop_timeout,
Error **errp)
{
- ERRP_GUARD();
uint64_t features;
int i, r, n_initialized_vqs = 0;
@@ -1301,9 +1300,6 @@ int vhost_dev_init(struct vhost_dev *hdev, void *opaque,
r = hdev->vhost_ops->vhost_backend_init(hdev, opaque, errp);
if (r < 0) {
- if (!*errp) {
- error_setg_errno(errp, -r, "vhost_backend_init failed");
- }
goto fail;
}
--
2.31.1
- [PATCH 04/16] multi-process: Fix pci_proxy_dev_realize() error handling, (continued)
- [PATCH 04/16] multi-process: Fix pci_proxy_dev_realize() error handling, Markus Armbruster, 2021/07/20
- [PATCH 15/16] vl: Clean up -smp error handling, Markus Armbruster, 2021/07/20
- [PATCH 14/16] Remove superfluous ERRP_GUARD(), Markus Armbruster, 2021/07/20
- [PATCH 16/16] vl: Don't continue after -smp help., Markus Armbruster, 2021/07/20
- [PATCH 12/16] vhost: Clean up how VhostOpts method vhost_get_config() fails, Markus Armbruster, 2021/07/20
- [PATCH 13/16] vhost: Clean up how VhostOpts method vhost_backend_init() fails,
Markus Armbruster <=
- [PATCH 01/16] error: Use error_fatal to simplify obvious fatal errors (again), Markus Armbruster, 2021/07/20
- Re: [PATCH 00/16] Various error handling fixes and cleanups, Michael S. Tsirkin, 2021/07/23
- Re: [PATCH 00/16] Various error handling fixes and cleanups, Markus Armbruster, 2021/07/29