[libvirt] [PATCH 6/6] storage: sheepdog: Split out functions required for tests

Separate the headers so that functions only required for testing of the sheepdog backend are separated into their own file. --- src/Makefile.am | 3 ++- src/storage/storage_backend_sheepdog.c | 1 + src/storage/storage_backend_sheepdog.h | 5 ----- src/storage/storage_backend_sheepdog_priv.h | 29 +++++++++++++++++++++++++++++ tests/storagebackendsheepdogtest.c | 2 +- 5 files changed, 33 insertions(+), 7 deletions(-) create mode 100644 src/storage/storage_backend_sheepdog_priv.h diff --git a/src/Makefile.am b/src/Makefile.am index 348bd2a30..dc26ddf53 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -998,7 +998,8 @@ STORAGE_DRIVER_RBD_SOURCES = \ storage/storage_backend_rbd.h storage/storage_backend_rbd.c STORAGE_DRIVER_SHEEPDOG_SOURCES = \ - storage/storage_backend_sheepdog.h storage/storage_backend_sheepdog.c + storage/storage_backend_sheepdog.h storage/storage_backend_sheepdog.c \ + storage/storage_backend_sheepdog_priv.h STORAGE_DRIVER_GLUSTER_SOURCES = \ storage/storage_backend_gluster.h storage/storage_backend_gluster.c diff --git a/src/storage/storage_backend_sheepdog.c b/src/storage/storage_backend_sheepdog.c index 17202e487..36458a562 100644 --- a/src/storage/storage_backend_sheepdog.c +++ b/src/storage/storage_backend_sheepdog.c @@ -29,6 +29,7 @@ #include "virerror.h" #include "storage_backend_sheepdog.h" +#include "storage_backend_sheepdog_priv.h" #include "storage_conf.h" #include "vircommand.h" #include "viralloc.h" diff --git a/src/storage/storage_backend_sheepdog.h b/src/storage/storage_backend_sheepdog.h index b0d8440b3..df2ead5ed 100644 --- a/src/storage/storage_backend_sheepdog.h +++ b/src/storage/storage_backend_sheepdog.h @@ -29,11 +29,6 @@ # include "storage_backend.h" -int virStorageBackendSheepdogParseNodeInfo(virStoragePoolDefPtr pool, - char *output); -int virStorageBackendSheepdogParseVdiList(virStorageVolDefPtr vol, - char *output); - extern virStorageBackend virStorageBackendSheepdog; #endif /* __VIR_STORAGE_BACKEND_SHEEPDOG_H__ */ diff --git a/src/storage/storage_backend_sheepdog_priv.h b/src/storage/storage_backend_sheepdog_priv.h new file mode 100644 index 000000000..e324ef618 --- /dev/null +++ b/src/storage/storage_backend_sheepdog_priv.h @@ -0,0 +1,29 @@ +/* + * storage_backend_sheepdog_priv.h: header for functions necessary in tests + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>;. + */ + +#ifndef __VIR_STORAGE_BACKEND_SHEEPDOG_PRIV_H__ +# define __VIR_STORAGE_BACKEND_SHEEPDOG_PRIV_H__ + +# include "conf/storage_conf.h" + +int virStorageBackendSheepdogParseNodeInfo(virStoragePoolDefPtr pool, + char *output); +int virStorageBackendSheepdogParseVdiList(virStorageVolDefPtr vol, + char *output); + +#endif /* __VIR_STORAGE_BACKEND_SHEEPDOG_PRIV_H__ */ diff --git a/tests/storagebackendsheepdogtest.c b/tests/storagebackendsheepdogtest.c index fd258a800..1f6341f8a 100644 --- a/tests/storagebackendsheepdogtest.c +++ b/tests/storagebackendsheepdogtest.c @@ -32,7 +32,7 @@ #include "internal.h" #include "testutils.h" -#include "storage/storage_backend_sheepdog.h" +#include "storage/storage_backend_sheepdog_priv.h" #include "virstring.h" #define VIR_FROM_THIS VIR_FROM_NONE -- 2.11.0