[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 19/34] vhost-user-test: make features mask an init
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL v2 19/34] vhost-user-test: make features mask an init_virtio_dev() argument |
Date: |
Tue, 16 Jan 2018 19:51:14 +0200 |
From: Maxime Coquelin <address@hidden>
The goal is to generalize the use of [un]init_virtio_dev() to
all tests, which does not necessarily expose the same features
set.
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 | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c
index 969e393..6a144e8 100644
--- a/tests/vhost-user-test.c
+++ b/tests/vhost-user-test.c
@@ -164,7 +164,7 @@ typedef struct TestServer {
static const char *tmpfs;
static const char *root;
-static void init_virtio_dev(TestServer *s)
+static void init_virtio_dev(TestServer *s, uint32_t features_mask)
{
uint32_t features;
int i;
@@ -187,7 +187,7 @@ static void init_virtio_dev(TestServer *s)
}
features = qvirtio_get_features(&s->dev->vdev);
- features = features & (1u << VIRTIO_NET_F_MAC);
+ features = features & features_mask;
qvirtio_set_features(&s->dev->vdev, features);
qvirtio_set_driver_ok(&s->dev->vdev);
@@ -652,7 +652,7 @@ static void test_read_guest_mem(void)
s = qtest_start(qemu_cmd);
g_free(qemu_cmd);
- init_virtio_dev(server);
+ init_virtio_dev(server, 1u << VIRTIO_NET_F_MAC);
read_guest_mem(server);
@@ -681,7 +681,7 @@ static void test_migrate(void)
from = qtest_start(cmd);
g_free(cmd);
- init_virtio_dev(s);
+ init_virtio_dev(s, 1u << VIRTIO_NET_F_MAC);
wait_for_fds(s);
size = get_log_size(s);
g_assert_cmpint(size, ==, (2 * 1024 * 1024) / (VHOST_LOG_PAGE * 8));
@@ -803,7 +803,7 @@ static void test_reconnect_subprocess(void)
qtest_start(cmd);
g_free(cmd);
- init_virtio_dev(s);
+ init_virtio_dev(s, 1u << VIRTIO_NET_F_MAC);
wait_for_fds(s);
wait_for_rings_started(s, 2);
@@ -841,7 +841,7 @@ static void test_connect_fail_subprocess(void)
qtest_start(cmd);
g_free(cmd);
- init_virtio_dev(s);
+ init_virtio_dev(s, 1u << VIRTIO_NET_F_MAC);
wait_for_fds(s);
wait_for_rings_started(s, 2);
@@ -871,7 +871,7 @@ static void test_flags_mismatch_subprocess(void)
qtest_start(cmd);
g_free(cmd);
- init_virtio_dev(s);
+ init_virtio_dev(s, 1u << VIRTIO_NET_F_MAC);
wait_for_fds(s);
wait_for_rings_started(s, 2);
--
MST
- [Qemu-devel] [PULL v2 10/34] vhost-user: fix multiple queue specification, (continued)
- [Qemu-devel] [PULL v2 10/34] vhost-user: fix multiple queue specification, Michael S. Tsirkin, 2018/01/16
- [Qemu-devel] [PULL v2 09/34] pci/shpc: Move function to generic header file, Michael S. Tsirkin, 2018/01/16
- [Qemu-devel] [PULL v2 11/34] intel-iommu: Redefine macros to enable supporting 48 bit address width, Michael S. Tsirkin, 2018/01/16
- [Qemu-devel] [PULL v2 12/34] intel-iommu: Extend address width to 48 bits, Michael S. Tsirkin, 2018/01/16
- [Qemu-devel] [PULL v2 14/34] ACPI/unit-test: Add a testcase for RAM allocation in numa node, Michael S. Tsirkin, 2018/01/16
- [Qemu-devel] [PULL v2 13/34] hw/pci-bridge: fix QEMU crash because of pcie-root-port, Michael S. Tsirkin, 2018/01/16
- [Qemu-devel] [PULL v2 15/34] hw/acpi-build: Make next_base easy to follow, Michael S. Tsirkin, 2018/01/16
- [Qemu-devel] [PULL v2 16/34] vhost-user-test: fix features mask, Michael S. Tsirkin, 2018/01/16
- [Qemu-devel] [PULL v2 17/34] vhost-user-test: extract read-guest-mem test from main loop, Michael S. Tsirkin, 2018/01/16
- [Qemu-devel] [PULL v2 18/34] vhost-user-test: setup virtqueues in all tests, Michael S. Tsirkin, 2018/01/16
- [Qemu-devel] [PULL v2 19/34] vhost-user-test: make features mask an init_virtio_dev() argument,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL v2 20/34] vhost-user-test: use init_virtio_dev in multiqueue test, Michael S. Tsirkin, 2018/01/16
- [Qemu-devel] [PULL v2 22/34] vhost: Simplify ring verification checks, Michael S. Tsirkin, 2018/01/16
- [Qemu-devel] [PULL v2 21/34] vhost: Build temporary section list and deref after commit, Michael S. Tsirkin, 2018/01/16
- [Qemu-devel] [PULL v2 23/34] vhost: Merge sections added to temporary list, Michael S. Tsirkin, 2018/01/16
- [Qemu-devel] [PULL v2 24/34] x86_iommu: Move machine check to x86_iommu_realize(), Michael S. Tsirkin, 2018/01/16
- [Qemu-devel] [PULL v2 25/34] x86_iommu: check if machine has PCI bus, Michael S. Tsirkin, 2018/01/16
- [Qemu-devel] [PULL v2 26/34] tests: acpi: move tested tables array allocation outside of test_acpi_dsdt_table(), Michael S. Tsirkin, 2018/01/16
- [Qemu-devel] [PULL v2 28/34] tests: acpi: rename test_acpi_tables()/test_dst_table() to reflect its usage, Michael S. Tsirkin, 2018/01/16
- [Qemu-devel] [PULL v2 27/34] tests: acpi: init table descriptor in test_dst_table(), Michael S. Tsirkin, 2018/01/16
- [Qemu-devel] [PULL v2 29/34] tests: acpi: add comments to fetch_rsdt_referenced_tables/data->tables usage, Michael S. Tsirkin, 2018/01/16