External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-22 04:25:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix test driver inactive domains and domain ID allocation

Browse Source
This commit is contained in:
Daniel P. Berrange 2008-07-25 13:27:12 +00:00
parent 8c6f5a546b
commit 73d021c5c1
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Fri Jul 25 14:00:27 BST 2008 Daniel P. Berrange <berrange@redhat.com>
* src/test.c: Increment dom ID tracker when setting up
default domain. Reset dom ID when destroying domain. Fix
listing of defined domains
Fri Jul 25 14:00:27 BST 2008 Daniel P. Berrange <berrange@redhat.com> Fri Jul 25 14:00:27 BST 2008 Daniel P. Berrange <berrange@redhat.com>
Convert XenD XML->SEXPR conversion to new domain XML APIs Convert XenD XML->SEXPR conversion to new domain XML APIs

6
src/test.c
View File

@ -259,7 +259,7 @@ static int testOpenDefault(virConnectPtr conn) {
virDomainDefFree(domdef); virDomainDefFree(domdef);
goto error; goto error;
} }
domobj->def->id = 1; domobj->def->id = privconn->nextDomID++;
domobj->state = VIR_DOMAIN_RUNNING; domobj->state = VIR_DOMAIN_RUNNING;
domobj->persistent = 1; domobj->persistent = 1;
@ -776,6 +776,8 @@ static int testDestroyDomain (virDomainPtr domain)
GET_DOMAIN(domain, -1); GET_DOMAIN(domain, -1);
privdom->state = VIR_DOMAIN_SHUTOFF; privdom->state = VIR_DOMAIN_SHUTOFF;
privdom->def->id = -1;
domain->id = -1;
if (!privdom->persistent) { if (!privdom->persistent) {
virDomainRemoveInactive(&privconn->domains, virDomainRemoveInactive(&privconn->domains,
privdom); privdom);
@ -1132,7 +1134,7 @@ static int testListDefinedDomains(virConnectPtr conn,
dom = privconn->domains; dom = privconn->domains;
memset(names, 0, sizeof(*names)*maxnames); memset(names, 0, sizeof(*names)*maxnames);
while (dom && n < maxnames) { while (dom && n < maxnames) {
if (virDomainIsActive(dom) && if (!virDomainIsActive(dom) &&
!(names[n++] = strdup(dom->def->name))) !(names[n++] = strdup(dom->def->name)))
goto no_memory; goto no_memory;
dom = dom->next; dom = dom->next;