提交 575cf9a9 编写于 作者: J Jiri Denemark

Factor out def assignment to existing domain from virDomainAssignDef

We need to be able to assign new def to an existing virDomainObj which
is already locked. This patch factors out the relevant code from
virDomainAssignDef into virDomainObjAssignDef.
上级 de5a60e1
...@@ -808,15 +808,10 @@ static virDomainObjPtr virDomainObjNew(virCapsPtr caps) ...@@ -808,15 +808,10 @@ static virDomainObjPtr virDomainObjNew(virCapsPtr caps)
return domain; return domain;
} }
virDomainObjPtr virDomainAssignDef(virCapsPtr caps, void virDomainObjAssignDef(virDomainObjPtr domain,
virDomainObjListPtr doms,
const virDomainDefPtr def, const virDomainDefPtr def,
bool live) bool live)
{ {
virDomainObjPtr domain;
char uuidstr[VIR_UUID_STRING_BUFLEN];
if ((domain = virDomainFindByUUID(doms, def->uuid))) {
if (!virDomainObjIsActive(domain)) { if (!virDomainObjIsActive(domain)) {
if (live) { if (live) {
/* save current configuration to be restored on domain shutdown */ /* save current configuration to be restored on domain shutdown */
...@@ -831,7 +826,18 @@ virDomainObjPtr virDomainAssignDef(virCapsPtr caps, ...@@ -831,7 +826,18 @@ virDomainObjPtr virDomainAssignDef(virCapsPtr caps,
virDomainDefFree(domain->newDef); virDomainDefFree(domain->newDef);
domain->newDef = def; domain->newDef = def;
} }
}
virDomainObjPtr virDomainAssignDef(virCapsPtr caps,
virDomainObjListPtr doms,
const virDomainDefPtr def,
bool live)
{
virDomainObjPtr domain;
char uuidstr[VIR_UUID_STRING_BUFLEN];
if ((domain = virDomainFindByUUID(doms, def->uuid))) {
virDomainObjAssignDef(domain, def, live);
return domain; return domain;
} }
......
...@@ -954,6 +954,9 @@ virDomainObjPtr virDomainAssignDef(virCapsPtr caps, ...@@ -954,6 +954,9 @@ virDomainObjPtr virDomainAssignDef(virCapsPtr caps,
virDomainObjListPtr doms, virDomainObjListPtr doms,
const virDomainDefPtr def, const virDomainDefPtr def,
bool live); bool live);
void virDomainObjAssignDef(virDomainObjPtr domain,
const virDomainDefPtr def,
bool live);
void virDomainRemoveInactive(virDomainObjListPtr doms, void virDomainRemoveInactive(virDomainObjListPtr doms,
virDomainObjPtr dom); virDomainObjPtr dom);
......
...@@ -215,6 +215,7 @@ virDomainSnapshotObjUnref; ...@@ -215,6 +215,7 @@ virDomainSnapshotObjUnref;
virDomainSnapshotDefParseString; virDomainSnapshotDefParseString;
virDomainSnapshotDefFormat; virDomainSnapshotDefFormat;
virDomainSnapshotAssignDef; virDomainSnapshotAssignDef;
virDomainObjAssignDef;
# domain_event.h # domain_event.h
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册