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

test: start using virDomainObjCheckActive 

Signed-off-by: Clementine Hayat <clem@lse.epita.fr>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Clementine Hayat 2018-04-17 22:13:28 +00:00 committed by Ján Tomko
parent 749282d400
commit 7b0caca4ea
1 changed files with 7 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/test/test_driver.c
View File

@ -1779,11 +1779,8 @@ static int testDomainDestroyFlags(virDomainPtr domain,
if (!(privdom = testDomObjFromDomain(domain))) if (!(privdom = testDomObjFromDomain(domain)))
goto cleanup; goto cleanup;
if (!virDomainObjIsActive(privdom)) { if (virDomainObjCheckActive(privdom) < 0)
virReportError(VIR_ERR_OPERATION_INVALID,
"%s", _("domain is not running"));
goto cleanup; goto cleanup;
}
testDomainShutdownState(domain, privdom, VIR_DOMAIN_SHUTOFF_DESTROYED); testDomainShutdownState(domain, privdom, VIR_DOMAIN_SHUTOFF_DESTROYED);
event = virDomainEventLifecycleNewFromObj(privdom, event = virDomainEventLifecycleNewFromObj(privdom,
@ -1921,11 +1918,8 @@ static int testDomainReboot(virDomainPtr domain,
if (!(privdom = testDomObjFromDomain(domain))) if (!(privdom = testDomObjFromDomain(domain)))
goto cleanup; goto cleanup;
if (!virDomainObjIsActive(privdom)) { if (virDomainObjCheckActive(privdom) < 0)
virReportError(VIR_ERR_OPERATION_INVALID,
"%s", _("domain is not running"));
goto cleanup; goto cleanup;
}
virDomainObjSetState(privdom, VIR_DOMAIN_SHUTDOWN, virDomainObjSetState(privdom, VIR_DOMAIN_SHUTDOWN,
VIR_DOMAIN_SHUTDOWN_USER); VIR_DOMAIN_SHUTDOWN_USER);
@ -2049,11 +2043,8 @@ testDomainSaveFlags(virDomainPtr domain, const char *path,
if (!(privdom = testDomObjFromDomain(domain))) if (!(privdom = testDomObjFromDomain(domain)))
goto cleanup; goto cleanup;
if (!virDomainObjIsActive(privdom)) { if (virDomainObjCheckActive(privdom) < 0)
virReportError(VIR_ERR_OPERATION_INVALID,
"%s", _("domain is not running"));
goto cleanup; goto cleanup;
}
xml = virDomainDefFormat(privdom->def, privconn->caps, xml = virDomainDefFormat(privdom->def, privconn->caps,
VIR_DOMAIN_DEF_FORMAT_SECURE); VIR_DOMAIN_DEF_FORMAT_SECURE);
@ -2255,11 +2246,8 @@ static int testDomainCoreDumpWithFormat(virDomainPtr domain,
if (!(privdom = testDomObjFromDomain(domain))) if (!(privdom = testDomObjFromDomain(domain)))
goto cleanup; goto cleanup;
if (!virDomainObjIsActive(privdom)) { if (virDomainObjCheckActive(privdom) < 0)
virReportError(VIR_ERR_OPERATION_INVALID,
"%s", _("domain is not running"));
goto cleanup; goto cleanup;
}
if ((fd = open(to, O_CREAT|O_TRUNC|O_WRONLY, S_IRUSR|S_IWUSR)) < 0) { if ((fd = open(to, O_CREAT|O_TRUNC|O_WRONLY, S_IRUSR|S_IWUSR)) < 0) {
virReportSystemError(errno, virReportSystemError(errno,
@ -3231,11 +3219,8 @@ static int testDomainBlockStats(virDomainPtr domain,
if (!(privdom = testDomObjFromDomain(domain))) if (!(privdom = testDomObjFromDomain(domain)))
return ret; return ret;
if (!virDomainObjIsActive(privdom)) { if (virDomainObjCheckActive(privdom) < 0)
virReportError(VIR_ERR_OPERATION_INVALID,
"%s", _("domain is not running"));
goto error; goto error;
}
if (virDomainDiskIndexByName(privdom->def, path, false) < 0) { if (virDomainDiskIndexByName(privdom->def, path, false) < 0) {
virReportError(VIR_ERR_INVALID_ARG, virReportError(VIR_ERR_INVALID_ARG,
@ -3278,11 +3263,8 @@ testDomainInterfaceStats(virDomainPtr domain,
if (!(privdom = testDomObjFromDomain(domain))) if (!(privdom = testDomObjFromDomain(domain)))
return -1; return -1;
if (!virDomainObjIsActive(privdom)) { if (virDomainObjCheckActive(privdom) < 0)
virReportError(VIR_ERR_OPERATION_INVALID,
"%s", _("domain is not running"));
goto error; goto error;
}
if (!(net = virDomainNetFind(privdom->def, device))) if (!(net = virDomainNetFind(privdom->def, device)))
goto error; goto error;
@ -5962,11 +5944,8 @@ testDomainManagedSave(virDomainPtr dom, unsigned int flags)
if (!(vm = testDomObjFromDomain(dom))) if (!(vm = testDomObjFromDomain(dom)))
return -1; return -1;
if (!virDomainObjIsActive(vm)) { if (virDomainObjCheckActive(vm) < 0)
virReportError(VIR_ERR_OPERATION_INVALID,
"%s", _("domain is not running"));
goto cleanup; goto cleanup;
}
if (!vm->persistent) { if (!vm->persistent) {
virReportError(VIR_ERR_OPERATION_INVALID, "%s", virReportError(VIR_ERR_OPERATION_INVALID, "%s",