[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 09/15] tests/qtest/libqos/virtio-blk: add support for vhost-use
From: |
Michael S. Tsirkin |
Subject: |
[PULL v2 09/15] tests/qtest/libqos/virtio-blk: add support for vhost-user-blk |
Date: |
Fri, 18 Sep 2020 12:20:22 -0400 |
From: Dima Stepanov <dimastep@yandex-team.ru>
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>
Message-Id:
<4d3e683a87557bcef520826c54aa3e5ab7c64111.1599813294.git.dimastep@yandex-team.ru>
Reviewed-by: Raphael Norwitz <raphael.norwitz@nutanix.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
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 5da02591bc..c0fd9d24e3 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);
--
MST
- [PULL v2 00/15] virtio,pc,acpi: fixes, tests, Michael S. Tsirkin, 2020/09/18
- [PULL v2 01/15] linux headers: sync to 5.9-rc4, Michael S. Tsirkin, 2020/09/18
- [PULL v2 04/15] virtio-mem: detach the element from the virtqueue when error occurs, Michael S. Tsirkin, 2020/09/18
- [PULL v2 03/15] vhost-vdpa: batch updating IOTLB mappings, Michael S. Tsirkin, 2020/09/18
- [PULL v2 05/15] pc: fix auto_enable_numa_with_memhp/auto_enable_numa_with_memdev for the 5.0 machine, Michael S. Tsirkin, 2020/09/18
- [PULL v2 07/15] vhost: check queue state in the vhost_dev_set_log routine, Michael S. Tsirkin, 2020/09/18
- [PULL v2 08/15] tests/qtest/vhost-user-test: prepare the tests for adding new dev class, Michael S. Tsirkin, 2020/09/18
- [PULL v2 06/15] vhost: recheck dev state in the vhost_migration_log routine, Michael S. Tsirkin, 2020/09/18
- [PULL v2 09/15] tests/qtest/libqos/virtio-blk: add support for vhost-user-blk,
Michael S. Tsirkin <=
- [PULL v2 10/15] tests/qtest/vhost-user-test: add support for the vhost-user-blk device, Michael S. Tsirkin, 2020/09/18
- [PULL v2 15/15] virtio-iommu-pci: force virtio version 1, Michael S. Tsirkin, 2020/09/18
- [PULL v2 11/15] tests/qtest/vhost-user-test: add migrate_reconnect test, Michael S. Tsirkin, 2020/09/18
- [PULL v2 12/15] tests/qtest/vhost-user-test: enable the reconnect tests, Michael S. Tsirkin, 2020/09/18
- [PULL v2 14/15] virtio-iommu: Check gtrees are non null before destroying them, Michael S. Tsirkin, 2020/09/18
- [PULL v2 13/15] cphp: remove deprecated cpu-add command(s), Michael S. Tsirkin, 2020/09/18
- [PULL v2 02/15] vhost: switch to use IOTLB v2 format, Michael S. Tsirkin, 2020/09/18
- Re: [PULL v2 00/15] virtio,pc,acpi: fixes, tests, Michael S. Tsirkin, 2020/09/18
- Re: [PULL v2 00/15] virtio,pc,acpi: fixes, tests, no-reply, 2020/09/18