[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 4/7] tests/qtest/libqos/virtio-blk: add support for vhost-user
From: |
Dima Stepanov |
Subject: |
[PATCH v5 4/7] tests/qtest/libqos/virtio-blk: add support for vhost-user-blk |
Date: |
Fri, 11 Sep 2020 11:39:46 +0300 |
Add support for the vhost-user-blk-pci device. This node can be used by
the vhost-user-blk tests. Tests for the vhost-user-blk device are added
in the following patches.
Signed-off-by: Dima Stepanov <dimastep@yandex-team.ru>
---
tests/qtest/libqos/virtio-blk.c | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/tests/qtest/libqos/virtio-blk.c b/tests/qtest/libqos/virtio-blk.c
index 5da0259..c0fd9d2 100644
--- a/tests/qtest/libqos/virtio-blk.c
+++ b/tests/qtest/libqos/virtio-blk.c
@@ -30,7 +30,8 @@
static void *qvirtio_blk_get_driver(QVirtioBlk *v_blk,
const char *interface)
{
- if (!g_strcmp0(interface, "virtio-blk")) {
+ if (!g_strcmp0(interface, "virtio-blk") ||
+ !g_strcmp0(interface, "vhost-user-blk")) {
return v_blk;
}
if (!g_strcmp0(interface, "virtio")) {
@@ -120,6 +121,17 @@ static void virtio_blk_register_nodes(void)
qos_node_produces("virtio-blk-pci", "virtio-blk");
g_free(arg);
+
+ /* vhost-user-blk-pci */
+ arg = g_strdup_printf("id=drv0,chardev=chdev0,addr=%x.%x",
+ PCI_SLOT, PCI_FN);
+ opts.extra_device_opts = arg;
+ add_qpci_address(&opts, &addr);
+ qos_node_create_driver("vhost-user-blk-pci", virtio_blk_pci_create);
+ qos_node_consumes("vhost-user-blk-pci", "pci-bus", &opts);
+ qos_node_produces("vhost-user-blk-pci", "vhost-user-blk");
+
+ g_free(arg);
}
libqos_init(virtio_blk_register_nodes);
--
2.7.4
[PATCH v5 5/7] tests/qtest/vhost-user-test: add support for the vhost-user-blk device, Dima Stepanov, 2020/09/11
[PATCH v5 6/7] tests/qtest/vhost-user-test: add migrate_reconnect test, Dima Stepanov, 2020/09/11
[PATCH v5 7/7] tests/qtest/vhost-user-test: enable the reconnect tests, Dima Stepanov, 2020/09/11
Re: [PATCH v5 0/7] vhost-user-blk: fix the migration issue and enhance qtests, Michael S. Tsirkin, 2020/09/24