From: Michal Privoznik Date: Fri, 7 Jan 2022 13:10:03 +0000 (+0100) Subject: storage_file: Declare virStorageSourceParseRBDColonString only in one header X-Git-Tag: v8.1.0-rc1~434 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad051d2a74513730ef55bf879133451989242644;p=thirdparty%2Flibvirt.git storage_file: Declare virStorageSourceParseRBDColonString only in one header The virStorageSourceParseRBDColonString() function is declared in src/storage_file/storage_source.h and src/storage_file/storage_source_backingstore.h but implemented only in the .c that corresponds to the latter header file. Therefore, drop declaration from storage_source.h as the function is not implemented in its corresponding .c file. Leftover from: 2d29a3a9d86b5f95a859888283e6caa98593b1d2 Signed-off-by: Michal Privoznik Reviewed-by: Ján Tomko --- diff --git a/src/libxl/xen_xl.c b/src/libxl/xen_xl.c index 7604e3d534..94268fb76d 100644 --- a/src/libxl/xen_xl.c +++ b/src/libxl/xen_xl.c @@ -30,6 +30,7 @@ #include "viralloc.h" #include "virstring.h" #include "storage_source.h" +#include "storage_source_backingstore.h" #include "xen_xl.h" #include "libxl_capabilities.h" #include "libxl_conf.h" diff --git a/src/storage_file/storage_source.h b/src/storage_file/storage_source.h index 5aaf4c356a..0ae06f4e7d 100644 --- a/src/storage_file/storage_source.h +++ b/src/storage_file/storage_source.h @@ -66,11 +66,6 @@ int virStorageSourceNewFromBacking(virStorageSource *parent, virStorageSource **backing); -int -virStorageSourceParseRBDColonString(const char *rbdstr, - virStorageSource *src) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); - int virStorageSourceGetRelativeBackingPath(virStorageSource *top, virStorageSource *base, diff --git a/src/storage_file/storage_source_backingstore.h b/src/storage_file/storage_source_backingstore.h index f5ec8e9154..e7e2a58eb9 100644 --- a/src/storage_file/storage_source_backingstore.h +++ b/src/storage_file/storage_source_backingstore.h @@ -29,7 +29,8 @@ virStorageSourceParseBackingURI(virStorageSource *src, int virStorageSourceParseRBDColonString(const char *rbdstr, - virStorageSource *src); + virStorageSource *src) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); int virStorageSourceParseBackingColon(virStorageSource *src,