[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 11/14] vhost-user-blk: Improve error reporting in realize
From: |
Kevin Wolf |
Subject: |
[PULL 11/14] vhost-user-blk: Improve error reporting in realize |
Date: |
Fri, 14 May 2021 18:31:21 +0200 |
Now that vhost_user_blk_connect() is not called from an event handler
any more, but directly from vhost_user_blk_device_realize(), we can
actually make use of Error again instead of calling error_report() in
the inner function and setting a more generic and therefore less useful
error message in realize() itself.
With Error, the callers are responsible for adding context if necessary
(such as the "-device" option the error refers to). Additional prefixes
are redundant and better omitted.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Acked-by: Raphael Norwitz <raphael.norwitz@nutanix.com>
Message-Id: <20210429171316.162022-4-kwolf@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
hw/block/vhost-user-blk.c | 23 +++++++++++------------
1 file changed, 11 insertions(+), 12 deletions(-)
diff --git a/hw/block/vhost-user-blk.c b/hw/block/vhost-user-blk.c
index c0b9958da1..f3a45af97c 100644
--- a/hw/block/vhost-user-blk.c
+++ b/hw/block/vhost-user-blk.c
@@ -311,7 +311,7 @@ static void vhost_user_blk_reset(VirtIODevice *vdev)
vhost_dev_free_inflight(s->inflight);
}
-static int vhost_user_blk_connect(DeviceState *dev)
+static int vhost_user_blk_connect(DeviceState *dev, Error **errp)
{
VirtIODevice *vdev = VIRTIO_DEVICE(dev);
VHostUserBlk *s = VHOST_USER_BLK(vdev);
@@ -331,8 +331,7 @@ static int vhost_user_blk_connect(DeviceState *dev)
ret = vhost_dev_init(&s->dev, &s->vhost_user, VHOST_BACKEND_TYPE_USER, 0);
if (ret < 0) {
- error_report("vhost-user-blk: vhost initialization failed: %s",
- strerror(-ret));
+ error_setg_errno(errp, -ret, "vhost initialization failed");
return ret;
}
@@ -340,8 +339,7 @@ static int vhost_user_blk_connect(DeviceState *dev)
if (virtio_device_started(vdev, vdev->status)) {
ret = vhost_user_blk_start(vdev);
if (ret < 0) {
- error_report("vhost-user-blk: vhost start failed: %s",
- strerror(-ret));
+ error_setg_errno(errp, -ret, "vhost start failed");
return ret;
}
}
@@ -380,10 +378,12 @@ static void vhost_user_blk_event(void *opaque,
QEMUChrEvent event)
DeviceState *dev = opaque;
VirtIODevice *vdev = VIRTIO_DEVICE(dev);
VHostUserBlk *s = VHOST_USER_BLK(vdev);
+ Error *local_err = NULL;
switch (event) {
case CHR_EVENT_OPENED:
- if (vhost_user_blk_connect(dev) < 0) {
+ if (vhost_user_blk_connect(dev, &local_err) < 0) {
+ error_report_err(local_err);
qemu_chr_fe_disconnect(&s->chardev);
return;
}
@@ -426,7 +426,7 @@ static void vhost_user_blk_device_realize(DeviceState *dev,
Error **errp)
int i, ret;
if (!s->chardev.chr) {
- error_setg(errp, "vhost-user-blk: chardev is mandatory");
+ error_setg(errp, "chardev is mandatory");
return;
}
@@ -434,16 +434,16 @@ static void vhost_user_blk_device_realize(DeviceState
*dev, Error **errp)
s->num_queues = 1;
}
if (!s->num_queues || s->num_queues > VIRTIO_QUEUE_MAX) {
- error_setg(errp, "vhost-user-blk: invalid number of IO queues");
+ error_setg(errp, "invalid number of IO queues");
return;
}
if (!s->queue_size) {
- error_setg(errp, "vhost-user-blk: queue size must be non-zero");
+ error_setg(errp, "queue size must be non-zero");
return;
}
if (s->queue_size > VIRTQUEUE_MAX_SIZE) {
- error_setg(errp, "vhost-user-blk: queue size must not exceed %d",
+ error_setg(errp, "queue size must not exceed %d",
VIRTQUEUE_MAX_SIZE);
return;
}
@@ -469,8 +469,7 @@ static void vhost_user_blk_device_realize(DeviceState *dev,
Error **errp)
goto virtio_err;
}
- if (vhost_user_blk_connect(dev) < 0) {
- error_setg(errp, "vhost-user-blk: could not connect");
+ if (vhost_user_blk_connect(dev, errp) < 0) {
qemu_chr_fe_disconnect(&s->chardev);
goto virtio_err;
}
--
2.30.2
- [PULL 01/14] qcow2: set bdi->is_dirty, (continued)
- [PULL 01/14] qcow2: set bdi->is_dirty, Kevin Wolf, 2021/05/14
- [PULL 03/14] block: Fix Transaction leak in bdrv_reopen_multiple(), Kevin Wolf, 2021/05/14
- [PULL 07/14] tests/qtest: add multi-queue test case to vhost-user-blk-test, Kevin Wolf, 2021/05/14
- [PULL 02/14] block: Fix Transaction leak in bdrv_root_attach_child(), Kevin Wolf, 2021/05/14
- [PULL 04/14] qapi: spelling fix (addtional), Kevin Wolf, 2021/05/14
- [PULL 05/14] block/export: improve vu_blk_sect_range_ok(), Kevin Wolf, 2021/05/14
- [PULL 10/14] vhost-user-blk: Don't reconnect during initialisation, Kevin Wolf, 2021/05/14
- [PULL 06/14] test: new qTest case to test the vhost-user-blk-server, Kevin Wolf, 2021/05/14
- [PULL 13/14] virtio: Fail if iommu_platform is requested, but unsupported, Kevin Wolf, 2021/05/14
- [PULL 11/14] vhost-user-blk: Improve error reporting in realize,
Kevin Wolf <=
- [PULL 14/14] vhost-user-blk: Check that num-queues is supported by backend, Kevin Wolf, 2021/05/14
- [PULL 08/14] vhost-user-blk-test: test discard/write zeroes invalid inputs, Kevin Wolf, 2021/05/14
- [PULL 09/14] vhost-user-blk: Make sure to set Error on realize failure, Kevin Wolf, 2021/05/14
- [PULL 12/14] vhost-user-blk: Get more feature flags from vhost device, Kevin Wolf, 2021/05/14
- Re: [PULL 00/14] Block layer patches, Philippe Mathieu-Daudé, 2021/05/16