External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

test_driver: Fix testDomainSetMemoryFlags' behaviour on config change

Browse Source 
When commit 6ac402c456a added the API whenever VIR_DOMAIN_MEM_MAXIMUM
was passed the code always checked whether the domain was active and
therefore failed with an error even though only a config change was
requested. Fix the issue by replacing virDomainObjGetOneDef with
virDomainObjGetOneDefState which tells us what definition we're
performing the change on.

Signed-off-by: Erik Skultety <eskultet@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Erik Skultety 2019-07-25 09:29:36 +02:00
parent 96e31a628c
commit a1c04c27bd
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/test/test_driver.c
View File

@ -2524,6 +2524,7 @@ static int testDomainSetMemoryFlags(virDomainPtr domain,
virDomainObjPtr vm;
virDomainDefPtr def;
int ret = -1;
bool live = false;
virCheckFlags(VIR_DOMAIN_AFFECT_LIVE |
VIR_DOMAIN_AFFECT_CONFIG |
@ -2532,11 +2533,11 @@ static int testDomainSetMemoryFlags(virDomainPtr domain,
if (!(vm = testDomObjFromDomain(domain)))
return -1;
if (!(def = virDomainObjGetOneDef(vm, flags)))
if (!(def = virDomainObjGetOneDefState(vm, flags, &live)))
goto cleanup;
if (flags & VIR_DOMAIN_MEM_MAXIMUM) {
if (virDomainObjIsActive(vm)) {
if (live) {
virReportError(VIR_ERR_OPERATION_INVALID, "%s",
_("cannot resize the maximum memory on an "
"active domain"));