[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 13/71] vhost-user-test: small changes to init_hugepa
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 13/71] vhost-user-test: small changes to init_hugepagefs |
Date: |
Mon, 3 Dec 2018 16:32:26 +0100 |
After the conversion to qgraph, the equivalent of "main" will be in
a constructor and will run even if the tests are not being requested.
Therefore, it should not assert that init_hugepagefs succeeds and will
be called when creating the TestServer. This patch changes the prototype
of init_hugepagefs, this way the next patch looks nicer.
Reviewed-by: Marc-André Lureau <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
tests/vhost-user-test.c | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c
index 93d5157..a282fc5 100644
--- a/tests/vhost-user-test.c
+++ b/tests/vhost-user-test.c
@@ -461,13 +461,19 @@ static void chr_read(void *opaque, const uint8_t *buf,
int size)
g_mutex_unlock(&s->data_mutex);
}
-static const char *init_hugepagefs(const char *path)
+static const char *init_hugepagefs(void)
{
+ const char *path = getenv("QTEST_HUGETLBFS_PATH");
struct statfs fs;
int ret;
+ if (!path) {
+ return NULL;
+ }
+
if (access(path, R_OK | W_OK | X_OK)) {
g_test_message("access on path (%s): %s\n", path, strerror(errno));
+ abort();
return NULL;
}
@@ -477,11 +483,13 @@ static const char *init_hugepagefs(const char *path)
if (ret != 0) {
g_test_message("statfs on path (%s): %s\n", path, strerror(errno));
+ abort();
return NULL;
}
if (fs.f_type != HUGETLBFS_MAGIC) {
g_test_message("Warning: path not on HugeTLBFS: %s\n", path);
+ abort();
return NULL;
}
@@ -974,7 +982,6 @@ static void test_multiqueue(void)
int main(int argc, char **argv)
{
- const char *hugefs;
int ret;
char template[] = "/tmp/vhost-test-XXXXXX";
@@ -989,13 +996,7 @@ int main(int argc, char **argv)
}
g_assert(tmpfs);
- hugefs = getenv("QTEST_HUGETLBFS_PATH");
- if (hugefs) {
- root = init_hugepagefs(hugefs);
- g_assert(root);
- } else {
- root = tmpfs;
- }
+ root = init_hugepagefs() ? : tmpfs;
if (qemu_memfd_check(0)) {
qtest_add_data_func("/vhost-user/read-guest-mem/memfd",
--
1.8.3.1
- Re: [Qemu-devel] [PATCH 11/71] vhost-user-test: reduce usage of global_qtest, (continued)
- [Qemu-devel] [PATCH 12/71] vhost-user-test: create a main loop per TestServer, Paolo Bonzini, 2018/12/03
- [Qemu-devel] [PATCH 14/71] vhost-user-test: create a temporary directory per TestServer, Paolo Bonzini, 2018/12/03
- [Qemu-devel] [PATCH 17/71] tests: remove rule for nonexisting qdev-monitor-test, Paolo Bonzini, 2018/12/03
- [Qemu-devel] [PATCH 16/71] tests/libqos: rename qpci_init_pc and qpci_init_spapr functions, Paolo Bonzini, 2018/12/03
- [Qemu-devel] [PATCH 15/71] tests/libqos: introduce virtio_start_device, Paolo Bonzini, 2018/12/03
- [Qemu-devel] [PATCH 13/71] vhost-user-test: small changes to init_hugepagefs,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 18/71] tests/libqos: embed allocators instead of malloc-ing them, Paolo Bonzini, 2018/12/03
- [Qemu-devel] [PATCH 22/71] tests/libqos: sdhci driver and interface nodes, Paolo Bonzini, 2018/12/03
- [Qemu-devel] [PATCH 21/71] tests/libqos: x86_64/pc machine node, Paolo Bonzini, 2018/12/03
- [Qemu-devel] [PATCH 23/71] tests/libqos: arm/raspi2 machine node, Paolo Bonzini, 2018/12/03
- [Qemu-devel] [PATCH 24/71] tests/libqos: arm/smdkc210 machine node, Paolo Bonzini, 2018/12/03