mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-08-26 18:41:17 +00:00
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:
parent
69ba4d0971
commit
f7bd305904
@ -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>
|
Wed Jul 1 11:38:15 BST 2009 Daniel P. Berrange <berrange@redhat.com>
|
||||||
|
|
||||||
* src/opennebula/one_client.c, src/opennebula/one_client.h:
|
* src/opennebula/one_client.c, src/opennebula/one_client.h:
|
||||||
|
@ -85,6 +85,26 @@ virCapsPtr oneCapsInit(void)
|
|||||||
goto no_memory;
|
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,
|
if (virCapabilitiesAddGuestDomain(guest,
|
||||||
"one",
|
"one",
|
||||||
NULL,
|
NULL,
|
||||||
|
@ -505,7 +505,7 @@ static int oneDomainShutdown(virDomainPtr dom)
|
|||||||
ret= 0;
|
ret= 0;
|
||||||
goto return_point;
|
goto return_point;
|
||||||
}
|
}
|
||||||
oneError(dom->conn, dom, VIR_ERR_OPERATION_FAILED,
|
oneError(dom->conn, dom, VIR_ERR_OPERATION_INVALID,
|
||||||
_("Wrong state to perform action"));
|
_("Wrong state to perform action"));
|
||||||
goto return_point;
|
goto return_point;
|
||||||
}
|
}
|
||||||
@ -541,7 +541,7 @@ static int oneDomainDestroy(virDomainPtr dom)
|
|||||||
if(c_oneCancel(vm->pid)) {
|
if(c_oneCancel(vm->pid)) {
|
||||||
/* VM not running, delete the instance at ONE DB */
|
/* VM not running, delete the instance at ONE DB */
|
||||||
if(c_oneFinalize(vm->pid)){
|
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"));
|
_("Wrong state to perform action"));
|
||||||
goto return_point;
|
goto return_point;
|
||||||
}
|
}
|
||||||
@ -576,11 +576,11 @@ static int oneDomainSuspend(virDomainPtr dom)
|
|||||||
ret=0;
|
ret=0;
|
||||||
goto return_point;
|
goto return_point;
|
||||||
}
|
}
|
||||||
oneError(dom->conn, dom, VIR_ERR_OPERATION_FAILED,
|
oneError(dom->conn, dom, VIR_ERR_OPERATION_INVALID,
|
||||||
_("Wrong state to perform action"));
|
_("Wrong state to perform action"));
|
||||||
goto return_point;
|
goto return_point;
|
||||||
}
|
}
|
||||||
oneError(dom->conn,dom,VIR_ERR_OPERATION_FAILED,
|
oneError(dom->conn,dom, VIR_ERR_OPERATION_INVALID,
|
||||||
_("domain is not running"));
|
_("domain is not running"));
|
||||||
} else {
|
} else {
|
||||||
oneError(dom->conn, dom, VIR_ERR_INVALID_DOMAIN,
|
oneError(dom->conn, dom, VIR_ERR_INVALID_DOMAIN,
|
||||||
@ -609,11 +609,11 @@ static int oneDomainResume(virDomainPtr dom)
|
|||||||
ret=0;
|
ret=0;
|
||||||
goto return_point;
|
goto return_point;
|
||||||
}
|
}
|
||||||
oneError(dom->conn, dom, VIR_ERR_OPERATION_FAILED,
|
oneError(dom->conn, dom, VIR_ERR_OPERATION_INVALID,
|
||||||
_("Wrong state to perform action"));
|
_("Wrong state to perform action"));
|
||||||
goto return_point;
|
goto return_point;
|
||||||
}
|
}
|
||||||
oneError(dom->conn,dom,VIR_ERR_OPERATION_FAILED,
|
oneError(dom->conn,dom, VIR_ERR_OPERATION_INVALID,
|
||||||
_("domain is not paused "));
|
_("domain is not paused "));
|
||||||
} else {
|
} else {
|
||||||
oneError(dom->conn, dom, VIR_ERR_INVALID_DOMAIN,
|
oneError(dom->conn, dom, VIR_ERR_INVALID_DOMAIN,
|
||||||
|
Loading…
Reference in New Issue
Block a user