Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy(a)virtuozzo.com>
---
src/vz/vz_driver.c | 21 +++++++++++++++++++--
1 file changed, 19 insertions(+), 2 deletions(-)
diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c
index 72774ae..9c93db1 100644
--- a/src/vz/vz_driver.c
+++ b/src/vz/vz_driver.c
@@ -1062,13 +1062,15 @@ vzDomainCreateWithFlags(virDomainPtr domain, unsigned int flags)
}
static int
-vzDomainDestroy(virDomainPtr domain)
+vzDomainDestroyFlags(virDomainPtr domain, unsigned int flags)
{
vzConnPtr privconn = domain->conn->privateData;
virDomainObjPtr dom;
int ret = -1;
bool job = false;
+ virCheckFlags(0, -1);
+
if (!(dom = vzDomObjFromDomainRef(domain)))
return -1;
@@ -1096,13 +1098,21 @@ vzDomainDestroy(virDomainPtr domain)
}
static int
-vzDomainShutdown(virDomainPtr domain)
+vzDomainDestroy(virDomainPtr dom)
+{
+ return vzDomainDestroyFlags(dom, 0);
+}
+
+static int
+vzDomainShutdownFlags(virDomainPtr domain, unsigned int flags)
{
vzConnPtr privconn = domain->conn->privateData;
virDomainObjPtr dom;
int ret = -1;
bool job = false;
+ virCheckFlags(0, -1);
+
if (!(dom = vzDomObjFromDomainRef(domain)))
return -1;
@@ -1129,6 +1139,11 @@ vzDomainShutdown(virDomainPtr domain)
return ret;
}
+static int vzDomainShutdown(virDomainPtr dom)
+{
+ return vzDomainShutdownFlags(dom, 0);
+}
+
static int
vzDomainReboot(virDomainPtr domain, unsigned int flags)
{
@@ -3126,7 +3141,9 @@ static virHypervisorDriver vzHypervisorDriver = {
.domainSuspend = vzDomainSuspend, /* 0.10.0 */
.domainResume = vzDomainResume, /* 0.10.0 */
.domainDestroy = vzDomainDestroy, /* 0.10.0 */
+ .domainDestroyFlags = vzDomainDestroyFlags, /* 2.0.0 */
.domainShutdown = vzDomainShutdown, /* 0.10.0 */
+ .domainShutdownFlags = vzDomainShutdownFlags, /* 2.0.0 */
.domainCreate = vzDomainCreate, /* 0.10.0 */
.domainCreateWithFlags = vzDomainCreateWithFlags, /* 1.2.10 */
.domainReboot = vzDomainReboot, /* 1.3.0 */
--
1.8.3.1