openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

cleanup and small update for OpenNebula 

* src/opennebula/one_conf.c src/opennebula/one_driver.c: cleanup
  and small update for OpenNebula driver by Abel Miguez Rodriguez
Daniel
This commit is contained in:
Daniel Veillard 2009-07-01 10:42:10 +00:00
parent 69ba4d0971
commit f7bd305904
3 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Wed Jul 1 12:38:28 CEST 2009 Daniel Veillard <veillard@redhat.com>
* src/opennebula/one_conf.c src/opennebula/one_driver.c: cleanup
and small update for OpenNebula driver by Abel Miguez Rodriguez
Wed Jul 1 11:38:15 BST 2009 Daniel P. Berrange <berrange@redhat.com>
* src/opennebula/one_client.c, src/opennebula/one_client.h:

20
src/opennebula/one_conf.c
View File

@ -85,6 +85,26 @@ virCapsPtr oneCapsInit(void)
goto no_memory;
}
if (virCapabilitiesAddGuestDomain(guest,
"one",
NULL,
NULL,
0,
NULL) == NULL)
{
goto no_memory;
}
if ((guest = virCapabilitiesAddGuest(caps,
"xen",
"i686",
32,
NULL,
NULL,
0,
NULL)) == NULL)
{
goto no_memory;
}
if (virCapabilitiesAddGuestDomain(guest,
"one",
NULL,

12
src/opennebula/one_driver.c
View File

@ -505,7 +505,7 @@ static int oneDomainShutdown(virDomainPtr dom)
ret= 0;
goto return_point;
}
oneError(dom->conn, dom, VIR_ERR_OPERATION_FAILED,
oneError(dom->conn, dom, VIR_ERR_OPERATION_INVALID,
_("Wrong state to perform action"));
goto return_point;
}
@ -541,7 +541,7 @@ static int oneDomainDestroy(virDomainPtr dom)
if(c_oneCancel(vm->pid)) {
/* VM not running, delete the instance at ONE DB */
if(c_oneFinalize(vm->pid)){
oneError(dom->conn, dom, VIR_ERR_OPERATION_FAILED,
oneError(dom->conn, dom, VIR_ERR_OPERATION_INVALID,
_("Wrong state to perform action"));
goto return_point;
}
@ -576,11 +576,11 @@ static int oneDomainSuspend(virDomainPtr dom)
ret=0;
goto return_point;
}
oneError(dom->conn, dom, VIR_ERR_OPERATION_FAILED,
oneError(dom->conn, dom, VIR_ERR_OPERATION_INVALID,
_("Wrong state to perform action"));
goto return_point;
}
oneError(dom->conn,dom,VIR_ERR_OPERATION_FAILED,
oneError(dom->conn,dom, VIR_ERR_OPERATION_INVALID,
_("domain is not running"));
} else {
oneError(dom->conn, dom, VIR_ERR_INVALID_DOMAIN,
@ -609,11 +609,11 @@ static int oneDomainResume(virDomainPtr dom)
ret=0;
goto return_point;
}
oneError(dom->conn, dom, VIR_ERR_OPERATION_FAILED,
oneError(dom->conn, dom, VIR_ERR_OPERATION_INVALID,
_("Wrong state to perform action"));
goto return_point;
}
oneError(dom->conn,dom,VIR_ERR_OPERATION_FAILED,
oneError(dom->conn,dom, VIR_ERR_OPERATION_INVALID,
_("domain is not paused "));
} else {
oneError(dom->conn, dom, VIR_ERR_INVALID_DOMAIN,