External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 05:35:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: secret: Provide only virSecretDefParse

Browse Source 
Replace the virSecretDefParseFile/String shims by calls to
virSecretDefParse.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2022-09-22 17:42:00 +02:00
parent fcd8750306
commit 7c32578531
6 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/conf/secret_conf.c
View File

@ -174,7 +174,7 @@ virSecretParseXML(xmlXPathContext *ctxt)
} }
static virSecretDef * virSecretDef *
virSecretDefParse(const char *xmlStr, virSecretDefParse(const char *xmlStr,
const char *filename, const char *filename,
unsigned int flags) unsigned int flags)
@ -190,18 +190,6 @@ virSecretDefParse(const char *xmlStr,
return virSecretParseXML(ctxt); return virSecretParseXML(ctxt);
} }
virSecretDef *
virSecretDefParseString(const char *xmlStr,
unsigned int flags)
{
return virSecretDefParse(xmlStr, NULL, flags);
}
virSecretDef *
virSecretDefParseFile(const char *filename)
{
return virSecretDefParse(NULL, filename, 0);
}
static int static int
virSecretDefFormatUsage(virBuffer *buf, virSecretDefFormatUsage(virBuffer *buf,

7
src/conf/secret_conf.h
View File

@ -35,8 +35,11 @@ struct _virSecretDef {
void virSecretDefFree(virSecretDef *def); void virSecretDefFree(virSecretDef *def);
G_DEFINE_AUTOPTR_CLEANUP_FUNC(virSecretDef, virSecretDefFree); G_DEFINE_AUTOPTR_CLEANUP_FUNC(virSecretDef, virSecretDefFree);
virSecretDef *virSecretDefParseString(const char *xml, unsigned int flags); virSecretDef *
virSecretDef *virSecretDefParseFile(const char *filename); virSecretDefParse(const char *xmlStr,
const char *filename,
unsigned int flags);
char *virSecretDefFormat(const virSecretDef *def); char *virSecretDefFormat(const virSecretDef *def);
#define VIR_CONNECT_LIST_SECRETS_FILTERS_EPHEMERAL \ #define VIR_CONNECT_LIST_SECRETS_FILTERS_EPHEMERAL \

2
src/conf/virsecretobj.c
View File

@ -870,7 +870,7 @@ virSecretLoad(virSecretObjList *secrets,
virSecretDef *def = NULL; virSecretDef *def = NULL;
virSecretObj *obj = NULL; virSecretObj *obj = NULL;
if (!(def = virSecretDefParseFile(path))) if (!(def = virSecretDefParse(NULL, path, 0)))
goto cleanup; goto cleanup;
if (virSecretLoadValidateUUID(def, file) < 0) if (virSecretLoadValidateUUID(def, file) < 0)

3
src/libvirt_private.syms
View File

@ -1010,8 +1010,7 @@ virObjectEventStateQueue;
# conf/secret_conf.h # conf/secret_conf.h
virSecretDefFormat; virSecretDefFormat;
virSecretDefFree; virSecretDefFree;
virSecretDefParseFile; virSecretDefParse;
virSecretDefParseString;
virSecretUsageTypeFromString; virSecretUsageTypeFromString;
virSecretUsageTypeToString; virSecretUsageTypeToString;

2
src/secret/secret_driver.c
View File

@ -207,7 +207,7 @@ secretDefineXML(virConnectPtr conn,
virCheckFlags(VIR_SECRET_DEFINE_VALIDATE, NULL); virCheckFlags(VIR_SECRET_DEFINE_VALIDATE, NULL);
if (!(def = virSecretDefParseString(xml, flags))) if (!(def = virSecretDefParse(xml, NULL, flags)))
return NULL; return NULL;
if (virSecretDefineXMLEnsureACL(conn, def) < 0) if (virSecretDefineXMLEnsureACL(conn, def) < 0)

2
tests/secretxml2xmltest.c
View File

@ -13,7 +13,7 @@ testCompareXMLToXMLFiles(const char *inxml, const char *outxml)
g_autofree char *actual = NULL; g_autofree char *actual = NULL;
g_autoptr(virSecretDef) secret = NULL; g_autoptr(virSecretDef) secret = NULL;
if (!(secret = virSecretDefParseFile(inxml))) if (!(secret = virSecretDefParse(NULL, inxml, 0)))
return -1; return -1;
if (!(actual = virSecretDefFormat(secret))) if (!(actual = virSecretDefFormat(secret)))