mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-23 06:05:27 +00:00
secret: Alter FindByUUID to expect the formatted uuidstr
Since we're storing a virUUIDFormat'd string in our Hash Table, let's modify the Lookup API to receive a formatted string as well. Signed-off-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
parent
836c40be53
commit
f9ccfd5962
@ -171,12 +171,8 @@ virSecretObjListDispose(void *obj)
|
||||
*/
|
||||
static virSecretObjPtr
|
||||
virSecretObjListFindByUUIDLocked(virSecretObjListPtr secrets,
|
||||
const unsigned char *uuid)
|
||||
const char *uuidstr)
|
||||
{
|
||||
char uuidstr[VIR_UUID_STRING_BUFLEN];
|
||||
|
||||
virUUIDFormat(uuid, uuidstr);
|
||||
|
||||
return virObjectRef(virHashLookup(secrets->objs, uuidstr));
|
||||
}
|
||||
|
||||
@ -184,7 +180,7 @@ virSecretObjListFindByUUIDLocked(virSecretObjListPtr secrets,
|
||||
/**
|
||||
* virSecretObjFindByUUID:
|
||||
* @secrets: list of secret objects
|
||||
* @uuid: secret uuid to find
|
||||
* @uuidstr: secret uuid to find
|
||||
*
|
||||
* This function locks @secrets and finds the secret object which
|
||||
* corresponds to @uuid.
|
||||
@ -193,12 +189,12 @@ virSecretObjListFindByUUIDLocked(virSecretObjListPtr secrets,
|
||||
*/
|
||||
virSecretObjPtr
|
||||
virSecretObjListFindByUUID(virSecretObjListPtr secrets,
|
||||
const unsigned char *uuid)
|
||||
const char *uuidstr)
|
||||
{
|
||||
virSecretObjPtr obj;
|
||||
|
||||
virObjectLock(secrets);
|
||||
obj = virSecretObjListFindByUUIDLocked(secrets, uuid);
|
||||
obj = virSecretObjListFindByUUIDLocked(secrets, uuidstr);
|
||||
virObjectUnlock(secrets);
|
||||
if (obj)
|
||||
virObjectLock(obj);
|
||||
@ -346,13 +342,14 @@ virSecretObjListAdd(virSecretObjListPtr secrets,
|
||||
if (oldDef)
|
||||
*oldDef = NULL;
|
||||
|
||||
virUUIDFormat(newdef->uuid, uuidstr);
|
||||
|
||||
/* Is there a secret already matching this UUID */
|
||||
if ((obj = virSecretObjListFindByUUIDLocked(secrets, newdef->uuid))) {
|
||||
if ((obj = virSecretObjListFindByUUIDLocked(secrets, uuidstr))) {
|
||||
virObjectLock(obj);
|
||||
def = obj->def;
|
||||
|
||||
if (STRNEQ_NULLABLE(def->usage_id, newdef->usage_id)) {
|
||||
virUUIDFormat(def->uuid, uuidstr);
|
||||
virReportError(VIR_ERR_INTERNAL_ERROR,
|
||||
_("a secret with UUID %s is already defined for "
|
||||
"use with %s"),
|
||||
@ -390,7 +387,6 @@ virSecretObjListAdd(virSecretObjListPtr secrets,
|
||||
/* Generate the possible configFile and base64File strings
|
||||
* using the configDir, uuidstr, and appropriate suffix
|
||||
*/
|
||||
virUUIDFormat(newdef->uuid, uuidstr);
|
||||
if (!(configFile = virFileBuildPath(configDir, uuidstr, ".xml")) ||
|
||||
!(base64File = virFileBuildPath(configDir, uuidstr, ".base64")))
|
||||
goto cleanup;
|
||||
|
@ -40,7 +40,7 @@ virSecretObjListNew(void);
|
||||
|
||||
virSecretObjPtr
|
||||
virSecretObjListFindByUUID(virSecretObjListPtr secrets,
|
||||
const unsigned char *uuid);
|
||||
const char *uuidstr);
|
||||
|
||||
virSecretObjPtr
|
||||
virSecretObjListFindByUsage(virSecretObjListPtr secrets,
|
||||
|
@ -86,8 +86,8 @@ secretObjFromSecret(virSecretPtr secret)
|
||||
virSecretObjPtr obj;
|
||||
char uuidstr[VIR_UUID_STRING_BUFLEN];
|
||||
|
||||
if (!(obj = virSecretObjListFindByUUID(driver->secrets, secret->uuid))) {
|
||||
virUUIDFormat(secret->uuid, uuidstr);
|
||||
virUUIDFormat(secret->uuid, uuidstr);
|
||||
if (!(obj = virSecretObjListFindByUUID(driver->secrets, uuidstr))) {
|
||||
virReportError(VIR_ERR_NO_SECRET,
|
||||
_("no secret with matching uuid '%s'"), uuidstr);
|
||||
return NULL;
|
||||
@ -148,10 +148,10 @@ secretLookupByUUID(virConnectPtr conn,
|
||||
virSecretPtr ret = NULL;
|
||||
virSecretObjPtr obj;
|
||||
virSecretDefPtr def;
|
||||
char uuidstr[VIR_UUID_STRING_BUFLEN];
|
||||
|
||||
if (!(obj = virSecretObjListFindByUUID(driver->secrets, uuid))) {
|
||||
char uuidstr[VIR_UUID_STRING_BUFLEN];
|
||||
virUUIDFormat(uuid, uuidstr);
|
||||
virUUIDFormat(uuid, uuidstr);
|
||||
if (!(obj = virSecretObjListFindByUUID(driver->secrets, uuidstr))) {
|
||||
virReportError(VIR_ERR_NO_SECRET,
|
||||
_("no secret with matching uuid '%s'"), uuidstr);
|
||||
goto cleanup;
|
||||
|
Loading…
Reference in New Issue
Block a user