[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 18/33] vhost-user-test: setup virtqueues in all tests
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 18/33] vhost-user-test: setup virtqueues in all tests |
Date: |
Tue, 16 Jan 2018 06:47:41 +0200 |
From: Maxime Coquelin <address@hidden>
Only the multiqueue test setups the virtqueues.
This patch generalizes the setup of virtqueues for all tests.
Signed-off-by: Maxime Coquelin <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
---
tests/vhost-user-test.c | 53 +++++++++++++++++++++++++++++++++++++++----------
1 file changed, 42 insertions(+), 11 deletions(-)
diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c
index df56724..969e393 100644
--- a/tests/vhost-user-test.c
+++ b/tests/vhost-user-test.c
@@ -55,6 +55,7 @@
/*********** FROM hw/virtio/vhost-user.c *************************************/
#define VHOST_MEMORY_MAX_NREGIONS 8
+#define VHOST_MAX_VIRTQUEUES 0x100
#define VHOST_USER_F_PROTOCOL_FEATURES 30
#define VHOST_USER_PROTOCOL_F_MQ 0
@@ -141,6 +142,8 @@ enum {
typedef struct TestServer {
QPCIBus *bus;
+ QVirtioPCIDevice *dev;
+ QVirtQueue *vq[VHOST_MAX_VIRTQUEUES];
gchar *socket_path;
gchar *mig_path;
gchar *chr_name;
@@ -155,6 +158,7 @@ typedef struct TestServer {
bool test_fail;
int test_flags;
int queues;
+ QGuestAllocator *alloc;
} TestServer;
static const char *tmpfs;
@@ -162,26 +166,43 @@ static const char *root;
static void init_virtio_dev(TestServer *s)
{
- QVirtioPCIDevice *dev;
uint32_t features;
+ int i;
s->bus = qpci_init_pc(NULL);
g_assert_nonnull(s->bus);
- dev = qvirtio_pci_device_find(s->bus, VIRTIO_ID_NET);
- g_assert_nonnull(dev);
+ s->dev = qvirtio_pci_device_find(s->bus, VIRTIO_ID_NET);
+ g_assert_nonnull(s->dev);
- qvirtio_pci_device_enable(dev);
- qvirtio_reset(&dev->vdev);
- qvirtio_set_acknowledge(&dev->vdev);
- qvirtio_set_driver(&dev->vdev);
+ qvirtio_pci_device_enable(s->dev);
+ qvirtio_reset(&s->dev->vdev);
+ qvirtio_set_acknowledge(&s->dev->vdev);
+ qvirtio_set_driver(&s->dev->vdev);
+
+ s->alloc = pc_alloc_init();
- features = qvirtio_get_features(&dev->vdev);
+ for (i = 0; i < s->queues * 2; i++) {
+ s->vq[i] = qvirtqueue_setup(&s->dev->vdev, s->alloc, i);
+ }
+
+ features = qvirtio_get_features(&s->dev->vdev);
features = features & (1u << VIRTIO_NET_F_MAC);
- qvirtio_set_features(&dev->vdev, features);
+ qvirtio_set_features(&s->dev->vdev, features);
- qvirtio_set_driver_ok(&dev->vdev);
- qvirtio_pci_device_free(dev);
+ qvirtio_set_driver_ok(&s->dev->vdev);
+}
+
+static void uninit_virtio_dev(TestServer *s)
+{
+ int i;
+
+ for (i = 0; i < s->queues * 2; i++) {
+ qvirtqueue_cleanup(s->dev->vdev.bus, s->vq[i], s->alloc);
+ }
+ pc_alloc_uninit(s->alloc);
+
+ qvirtio_pci_device_free(s->dev);
}
static void wait_for_fds(TestServer *s)
@@ -635,6 +656,8 @@ static void test_read_guest_mem(void)
read_guest_mem(server);
+ uninit_virtio_dev(server);
+
qtest_quit(s);
test_server_free(server);
}
@@ -711,6 +734,8 @@ static void test_migrate(void)
read_guest_mem(dest);
+ uninit_virtio_dev(s);
+
g_source_destroy(source);
g_source_unref(source);
@@ -789,6 +814,8 @@ static void test_reconnect_subprocess(void)
wait_for_fds(s);
wait_for_rings_started(s, 2);
+ uninit_virtio_dev(s);
+
qtest_end();
test_server_free(s);
return;
@@ -818,6 +845,8 @@ static void test_connect_fail_subprocess(void)
wait_for_fds(s);
wait_for_rings_started(s, 2);
+ uninit_virtio_dev(s);
+
qtest_end();
test_server_free(s);
}
@@ -846,6 +875,8 @@ static void test_flags_mismatch_subprocess(void)
wait_for_fds(s);
wait_for_rings_started(s, 2);
+ uninit_virtio_dev(s);
+
qtest_end();
test_server_free(s);
}
--
MST
- [Qemu-devel] [PULL 05/33] contrib/vhost-user-blk: introduce a vhost-user-blk sample application, (continued)
- [Qemu-devel] [PULL 05/33] contrib/vhost-user-blk: introduce a vhost-user-blk sample application, Michael S. Tsirkin, 2018/01/15
- [Qemu-devel] [PULL 09/33] pci/shpc: Move function to generic header file, Michael S. Tsirkin, 2018/01/15
- [Qemu-devel] [PULL 10/33] vhost-user: fix multiple queue specification, Michael S. Tsirkin, 2018/01/15
- [Qemu-devel] [PULL 11/33] intel-iommu: Redefine macros to enable supporting 48 bit address width, Michael S. Tsirkin, 2018/01/15
- [Qemu-devel] [PULL 14/33] ACPI/unit-test: Add a testcase for RAM allocation in numa node, Michael S. Tsirkin, 2018/01/15
- [Qemu-devel] [PULL 12/33] intel-iommu: Extend address width to 48 bits, Michael S. Tsirkin, 2018/01/15
- [Qemu-devel] [PULL 13/33] hw/pci-bridge: fix QEMU crash because of pcie-root-port, Michael S. Tsirkin, 2018/01/15
- [Qemu-devel] [PULL 15/33] hw/acpi-build: Make next_base easy to follow, Michael S. Tsirkin, 2018/01/15
- [Qemu-devel] [PULL 16/33] vhost-user-test: fix features mask, Michael S. Tsirkin, 2018/01/15
- [Qemu-devel] [PULL 17/33] vhost-user-test: extract read-guest-mem test from main loop, Michael S. Tsirkin, 2018/01/15
- [Qemu-devel] [PULL 18/33] vhost-user-test: setup virtqueues in all tests,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 19/33] vhost-user-test: make features mask an init_virtio_dev() argument, Michael S. Tsirkin, 2018/01/15
- [Qemu-devel] [PULL 20/33] vhost-user-test: use init_virtio_dev in multiqueue test, Michael S. Tsirkin, 2018/01/15
- [Qemu-devel] [PULL 21/33] vhost: Build temporary section list and deref after commit, Michael S. Tsirkin, 2018/01/15
- [Qemu-devel] [PULL 22/33] vhost: Move log_dirty check, Michael S. Tsirkin, 2018/01/15
- [Qemu-devel] [PULL 24/33] vhost: Merge sections added to temporary list, Michael S. Tsirkin, 2018/01/15
- [Qemu-devel] [PULL 23/33] vhost: Simplify ring verification checks, Michael S. Tsirkin, 2018/01/15
- [Qemu-devel] [PULL 26/33] x86_iommu: check if machine has PCI bus, Michael S. Tsirkin, 2018/01/15
- [Qemu-devel] [PULL 28/33] tests: acpi: init table descriptor in test_dst_table(), Michael S. Tsirkin, 2018/01/15
- [Qemu-devel] [PULL 29/33] tests: acpi: rename test_acpi_tables()/test_dst_table() to reflect its usage, Michael S. Tsirkin, 2018/01/15