tests/9pfs: fix creator of 'local' test dir

The test dir for the 9pfs 'local' tests should not be created by
a constructor in libqos, rather use a constructor on test unit
side.

Signed-off-by: Christian Schoenebeck <qemu_oss@crudebyte.com>

Author: cschoenebeck

tests/qtest/libqos/virtio-9p.c

@@ -59,12 +59,17 @@ static void init_local_test_path(void)
     g_free(pwd);
 }
 
-/* Creates the directory for the 9pfs 'local' filesystem driver to access. */
-static void create_local_test_dir(void)
+void virtio_9p_create_local_test_dir(void)
 {
     struct stat st;
     int res;
 
+    if (local_test_path) {
+        return;
+    }
+
+    init_local_test_path();
+
     g_assert(local_test_path != NULL);
     res = mkdir(local_test_path, 0777);
     if (res < 0) {
@@ -78,8 +83,7 @@ static void create_local_test_dir(void)
     g_assert((st.st_mode & S_IFMT) == S_IFDIR);
 }
 
-/* Deletes directory previously created by create_local_test_dir(). */
-static void remove_local_test_dir(void)
+void virtio_9p_remove_local_test_dir(void)
 {
     g_assert(local_test_path != NULL);
     char *cmd = g_strdup_printf("rm -fr '%s'\n", local_test_path);
@@ -298,19 +302,3 @@ static void virtio_9p_register_nodes(void)
 }
 
 libqos_init(virtio_9p_register_nodes);
-
-static void __attribute__((constructor)) construct_virtio_9p(void)
-{
-    /* make sure test dir for the 'local' tests exists */
-    if (local_test_path) {
-        return;
-    }
-    init_local_test_path();
-    create_local_test_dir();
-}
-
-static void __attribute__((destructor)) destruct_virtio_9p(void)
-{
-    /* remove previously created test dir when test suite completed */
-    remove_local_test_dir();
-}

tests/qtest/libqos/virtio-9p.h

@@ -44,6 +44,16 @@ struct QVirtio9PDevice {
     QVirtio9P v9p;
 };
 
+/**
+ * Creates the directory for the 9pfs 'local' filesystem driver to access.
+ */
+void virtio_9p_create_local_test_dir(void);
+
+/**
+ * Deletes directory previously created by virtio_9p_create_local_test_dir().
+ */
+void virtio_9p_remove_local_test_dir(void);
+
 /**
  * Prepares QEMU command line for 9pfs tests using the 'local' fs driver.
  */

tests/qtest/virtio-9p-test.c

@@ -1471,3 +1471,15 @@ static void register_virtio_9p_test(void)
 }
 
 libqos_init(register_virtio_9p_test);
+
+static void __attribute__((constructor)) construct_9p_test(void)
+{
+    /* make sure test dir for the 'local' tests exists */
+    virtio_9p_create_local_test_dir();
+}
+
+static void __attribute__((destructor)) destruct_9p_test(void)
+{
+    /* remove previously created test dir when test suite completed */
+    virtio_9p_remove_local_test_dir();
+}