domain_conf: Introducde virDomainObjListRenameAddNew() & virDomainObjListRenameRemove()

We just need to update the entry in the second hash table. Since commit 8728a56
we have two hash tables for the domain list so that we can do O(1) lookup
regardless of looking up by UUID or name. Since with renaming a domain UUID does
not change, we only need to update the second hash table, where domains are
referenced by their name.

We will call both functions from the qemuDomainRename().

Signed-off-by: Tomas Meszaros <exo@tty.sk>
This commit is contained in:
Tomas Meszaros 2015-08-10 21:59:16 +02:00 committed by Michal Privoznik
parent ff486e0d29
commit 28257dc2be
3 changed files with 42 additions and 0 deletions

View File

@ -2864,6 +2864,41 @@ virDomainObjPtr virDomainObjListAdd(virDomainObjListPtr doms,
return ret;
}
int
virDomainObjListRenameAddNew(virDomainObjListPtr doms,
virDomainObjPtr vm,
const char *name)
{
int ret = -1;
virObjectLock(doms);
/* Add new name into the hash table of domain names. */
if (virHashAddEntry(doms->objsName, name, vm) < 0)
goto cleanup;
/* Okay, this is crazy. virHashAddEntry() does not increment
* the refcounter of @vm, but virHashRemoveEntry() does
* decrement it. We need to work around it. */
virObjectRef(vm);
ret = 0;
cleanup:
virObjectUnlock(doms);
return ret;
}
int
virDomainObjListRenameRemove(virDomainObjListPtr doms, const char *name)
{
virObjectLock(doms);
virHashRemoveEntry(doms->objsName, name);
virObjectUnlock(doms);
return 0;
}
/*
* Mark the running VM config as transient. Ensures transient hotplug
* operations do not persist past shutdown.

View File

@ -2580,6 +2580,11 @@ virDomainObjPtr virDomainObjListAdd(virDomainObjListPtr doms,
virDomainXMLOptionPtr xmlopt,
unsigned int flags,
virDomainDefPtr *oldDef);
int virDomainObjListRenameAddNew(virDomainObjListPtr doms,
virDomainObjPtr vm,
const char *name);
int virDomainObjListRenameRemove(virDomainObjListPtr doms,
const char *name);
void virDomainObjAssignDef(virDomainObjPtr domain,
virDomainDefPtr def,
bool live,

View File

@ -410,6 +410,8 @@ virDomainObjListNew;
virDomainObjListNumOfDomains;
virDomainObjListRemove;
virDomainObjListRemoveLocked;
virDomainObjListRenameAddNew;
virDomainObjListRenameRemove;
virDomainObjNew;
virDomainObjParseNode;
virDomainObjSetDefTransient;