| Message ID | ec90703cbc23d6b612b3672f946d7741f4a16080.1604243521.git.qemu_oss@crudebyte.com |
|---|---|
| State | New |
| Headers | show |
| Series | 9pfs: test suite fixes | expand |
On Sun, 1 Nov 2020 15:25:14 +0100 Christian Schoenebeck <qemu_oss@crudebyte.com> wrote: > Make functions create_local_test_dir() and remove_local_test_dir() > public. They're going to be used in the next patch. > > Signed-off-by: Christian Schoenebeck <qemu_oss@crudebyte.com> > --- Reviewed-by: Greg Kurz <groug@kaod.org> > tests/qtest/libqos/virtio-9p.c | 10 ++++------ > tests/qtest/libqos/virtio-9p.h | 10 ++++++++++ > 2 files changed, 14 insertions(+), 6 deletions(-) > > diff --git a/tests/qtest/libqos/virtio-9p.c b/tests/qtest/libqos/virtio-9p.c > index d43647b3b7..2736e9ae2a 100644 > --- a/tests/qtest/libqos/virtio-9p.c > +++ b/tests/qtest/libqos/virtio-9p.c > @@ -39,8 +39,7 @@ 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; > > @@ -53,8 +52,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 -r '%s'\n", local_test_path); > @@ -248,8 +246,8 @@ static void virtio_9p_register_nodes(void) > > /* make sure test dir for the 'local' tests exists and is clean */ > init_local_test_path(); > - remove_local_test_dir(); > - create_local_test_dir(); > + virtio_9p_remove_local_test_dir(); > + virtio_9p_create_local_test_dir(); > > QPCIAddress addr = { > .devfn = QPCI_DEVFN(4, 0), > diff --git a/tests/qtest/libqos/virtio-9p.h b/tests/qtest/libqos/virtio-9p.h > index 19a4d97454..480727120e 100644 > --- a/tests/qtest/libqos/virtio-9p.h > +++ b/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. > */
diff --git a/tests/qtest/libqos/virtio-9p.c b/tests/qtest/libqos/virtio-9p.c index d43647b3b7..2736e9ae2a 100644 --- a/tests/qtest/libqos/virtio-9p.c +++ b/tests/qtest/libqos/virtio-9p.c @@ -39,8 +39,7 @@ 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; @@ -53,8 +52,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 -r '%s'\n", local_test_path); @@ -248,8 +246,8 @@ static void virtio_9p_register_nodes(void) /* make sure test dir for the 'local' tests exists and is clean */ init_local_test_path(); - remove_local_test_dir(); - create_local_test_dir(); + virtio_9p_remove_local_test_dir(); + virtio_9p_create_local_test_dir(); QPCIAddress addr = { .devfn = QPCI_DEVFN(4, 0), diff --git a/tests/qtest/libqos/virtio-9p.h b/tests/qtest/libqos/virtio-9p.h index 19a4d97454..480727120e 100644 --- a/tests/qtest/libqos/virtio-9p.h +++ b/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. */
Make functions create_local_test_dir() and remove_local_test_dir() public. They're going to be used in the next patch. Signed-off-by: Christian Schoenebeck <qemu_oss@crudebyte.com> --- tests/qtest/libqos/virtio-9p.c | 10 ++++------ tests/qtest/libqos/virtio-9p.h | 10 ++++++++++ 2 files changed, 14 insertions(+), 6 deletions(-)