[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 08/37] vhost-user-blk: Add return value for vhost_use
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 08/37] vhost-user-blk: Add return value for vhost_user_blk_start() |
Date: |
Thu, 16 May 2019 08:18:35 -0400 |
From: Xie Yongji <address@hidden>
Add a return value for vhost_user_blk_start() to check whether
we start vhost-user backend successfully or not.
Signed-off-by: Xie Yongji <address@hidden>
Signed-off-by: Zhang Yu <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/block/vhost-user-blk.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/hw/block/vhost-user-blk.c b/hw/block/vhost-user-blk.c
index 39e1adc60a..6802c19d65 100644
--- a/hw/block/vhost-user-blk.c
+++ b/hw/block/vhost-user-blk.c
@@ -103,7 +103,7 @@ const VhostDevConfigOps blk_ops = {
.vhost_dev_config_notifier = vhost_user_blk_handle_config_change,
};
-static void vhost_user_blk_start(VirtIODevice *vdev)
+static int vhost_user_blk_start(VirtIODevice *vdev)
{
VHostUserBlk *s = VHOST_USER_BLK(vdev);
BusState *qbus = BUS(qdev_get_parent_bus(DEVICE(vdev)));
@@ -112,13 +112,13 @@ static void vhost_user_blk_start(VirtIODevice *vdev)
if (!k->set_guest_notifiers) {
error_report("binding does not support guest notifiers");
- return;
+ return -ENOSYS;
}
ret = vhost_dev_enable_notifiers(&s->dev, vdev);
if (ret < 0) {
error_report("Error enabling host notifiers: %d", -ret);
- return;
+ return ret;
}
ret = k->set_guest_notifiers(qbus->parent, s->dev.nvqs, true);
@@ -157,12 +157,13 @@ static void vhost_user_blk_start(VirtIODevice *vdev)
vhost_virtqueue_mask(&s->dev, vdev, i, false);
}
- return;
+ return ret;
err_guest_notifiers:
k->set_guest_notifiers(qbus->parent, s->dev.nvqs, false);
err_host_notifiers:
vhost_dev_disable_notifiers(&s->dev, vdev);
+ return ret;
}
static void vhost_user_blk_stop(VirtIODevice *vdev)
--
MST
- [Qemu-devel] [PULL 00/37] pci, pc, virtio: features, fixes, Michael S. Tsirkin, 2019/05/16
- [Qemu-devel] [PULL 01/37] hw: report invalid disable-legacy|modern usage for virtio-1-only devs, Michael S. Tsirkin, 2019/05/16
- [Qemu-devel] [PULL 02/37] Revert "globals: Allow global properties to be optional", Michael S. Tsirkin, 2019/05/16
- [Qemu-devel] [PULL 03/37] docs: reST-ify vhost-user documentation, Michael S. Tsirkin, 2019/05/16
- [Qemu-devel] [PULL 04/37] virtio: Introduce started flag to VirtioDevice, Michael S. Tsirkin, 2019/05/16
- [Qemu-devel] [PULL 05/37] virtio: Use started flag in virtio_vmstate_change(), Michael S. Tsirkin, 2019/05/16
- [Qemu-devel] [PULL 06/37] vhost-user-blk: Use started flag in vhost_user_blk_set_status(), Michael S. Tsirkin, 2019/05/16
- [Qemu-devel] [PULL 07/37] vhost-user-blk: Only start vhost-user backend with the first kick, Michael S. Tsirkin, 2019/05/16
- [Qemu-devel] [PULL 08/37] vhost-user-blk: Add return value for vhost_user_blk_start(),
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 09/37] vhost-user-blk: Add support to reconnect backend, Michael S. Tsirkin, 2019/05/16
- [Qemu-devel] [PULL 10/37] contrib/vhost-user-blk: enable inflight I/O tracking, Michael S. Tsirkin, 2019/05/16
- [Qemu-devel] [PULL 11/37] acpi/piix4: Convert debug printf()s to trace events, Michael S. Tsirkin, 2019/05/16
- [Qemu-devel] [PULL 12/37] acpi/pcihp: Convert debug printf()s to trace events, Michael S. Tsirkin, 2019/05/16
- [Qemu-devel] [PULL 13/37] acpi/pcihp: Add a few more trace points related to unplug, Michael S. Tsirkin, 2019/05/16
- [Qemu-devel] [PULL 14/37] q35: acpi: do not create dummy MCFG table, Michael S. Tsirkin, 2019/05/16
- [Qemu-devel] [PULL 15/37] do not call vhost_net_cleanup() on running net from char user event, Michael S. Tsirkin, 2019/05/16
- [Qemu-devel] [PULL 16/37] hw/arm/virt-acpi-build: remove unnecessary variable mcfg_start, Michael S. Tsirkin, 2019/05/16
- [Qemu-devel] [PULL 17/37] i386, acpi: remove mcfg_ prefix in AcpiMcfgInfo members, Michael S. Tsirkin, 2019/05/16
- [Qemu-devel] [PULL 18/37] hw/arm/virt-acpi-build: pass AcpiMcfgInfo to build_mcfg(), Michael S. Tsirkin, 2019/05/16