External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-16 22:57:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure VirtualBox domain IDs start from 1 instead of 0

Browse Source
This commit is contained in:
Daniel P. Berrange 2009-04-21 19:13:23 +00:00
parent 4c3f3b4d46
commit 7a367cca30
3 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Tue Apr 21 14:39:03 BST 2009 Daniel P. Berrange <berrange@redhat.com>
* po/POTFILES.in: Add vbox_tmpl.c file
* src/vbox/vbox_tmpl.c: Adjust domain IDs to start from 1
instead of 0, refuse domain ID 0.
Tue Apr 21 20:58:50 CEST 2009 Daniel Veillard <veillard@redhat.com>
* src/network_conf.c src/network_conf.h: add dynamic bridge names

1
po/POTFILES.in
View File

@ -38,6 +38,7 @@ src/uml_conf.c
src/uml_driver.c
src/util.c
src/uuid.c
src/vbox/vbox_tmpl.c
src/virsh.c
src/virterror.c
src/xen_inotify.c

19
src/vbox/vbox_tmpl.c
View File

@ -434,7 +434,7 @@ static int vboxListDomains(virConnectPtr conn, int *ids, int nids) {
if ((state == MachineState_Running) ||
(state == MachineState_Paused) ) {
ret++;
ids[j++] = i;
ids[j++] = i + 1;
}
}
}
@ -535,6 +535,15 @@ static virDomainPtr vboxDomainLookupByID(virConnectPtr conn, int id) {
PRUint32 state;
int i;
/* Internal vbox IDs start from 0, the public libvirt ID
* starts from 1, so refuse id==0, and adjust the rest*/
if (id == 0) {
vboxError(conn, VIR_ERR_NO_DOMAIN,
_("no domain with matching id %d"), id);
return NULL;
}
id = id - 1;
if(data->vboxObj) {
rc = data->vboxObj->vtbl->GetMachines(data->vboxObj, &machineCnt, &machines);
if (NS_FAILED(rc)) {
@ -568,7 +577,7 @@ static virDomainPtr vboxDomainLookupByID(virConnectPtr conn, int id) {
dom = virGetDomain(conn, machineName, iidl);
if (dom)
dom->id = id;
dom->id = id + 1;
/* Cleanup all the XPCOM allocated stuff here */
g_pVBoxFuncs->pfnComUnallocMem(iid);
@ -645,7 +654,7 @@ static virDomainPtr vboxDomainLookupByUUID(virConnectPtr conn, const unsigned ch
if (dom)
if ((state == MachineState_Running) ||
(state == MachineState_Paused) )
dom->id = i;
dom->id = i + 1;
}
if (iid) {
@ -725,7 +734,7 @@ static virDomainPtr vboxDomainLookupByName(virConnectPtr conn, const char *name)
if (dom)
if ((state == MachineState_Running) ||
(state == MachineState_Paused) )
dom->id = i;
dom->id = i + 1;
}
if (machineName) {
@ -2311,7 +2320,7 @@ static int vboxDomainCreate(virDomainPtr dom) {
ret = -1;
} else {
/* all ok set the domid */
dom->id = i;
dom->id = i + 1;
ret = 0;
}
}