mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vhost-user-test: small changes to init_hugepagefs

Browse Source 
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 <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <1543851204-41186-14-git-send-email-pbonzini@redhat.com>
Message-Id: <1550165756-21617-9-git-send-email-pbonzini@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Paolo Bonzini 2019-02-14 18:35:55 +01:00 committed by Michael S. Tsirkin
parent 7d0ca3e747
commit 9ee1bb86f6
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tests/vhost-user-test.c
View File

@ -465,14 +465,20 @@ static void chr_read(void *opaque, const uint8_t *buf, int size)
g_mutex_unlock(&s->data_mutex);
}
#ifdef CONFIG_LINUX
static const char *init_hugepagefs(const char *path)
static const char *init_hugepagefs(void)
{
#ifdef CONFIG_LINUX
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;
}
@ -482,17 +488,21 @@ 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;
}
return path;
}
#else
return NULL;
#endif
}
static TestServer *test_server_new(const gchar *name)
{
@ -986,7 +996,6 @@ static void test_multiqueue(void)
int main(int argc, char **argv)
{
const char *hugefs;
int ret;
char template[] = "/tmp/vhost-test-XXXXXX";
@ -1001,14 +1010,7 @@ int main(int argc, char **argv)
}
g_assert(tmpfs);
root = tmpfs;
#ifdef CONFIG_LINUX
hugefs = getenv("QTEST_HUGETLBFS_PATH");
if (hugefs) {
root = init_hugepagefs(hugefs);
g_assert(root);
}
#endif
root = init_hugepagefs() ? : tmpfs;
if (qemu_memfd_check(0)) {
qtest_add_data_func("/vhost-user/read-guest-mem/memfd",