[libvirt] [PATCH v2 0/2] test_driver: implement virDomainSetLifecycleAction
Ilias Stamatis (2): test_driver: handle different lifecycle actions in testDomainShutdownFlags test_driver: implement virDomainSetLifecycleAction src/test/test_driver.c | 135 +++++++++++++++++++++++++++++++---------- 1 file changed, 103 insertions(+), 32 deletions(-) -- 2.22.0
Signed-off-by: Ilias Stamatis <stamatis.iliass@gmail.com> --- src/test/test_driver.c | 77 ++++++++++++++++++++++++------------------ 1 file changed, 45 insertions(+), 32 deletions(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 5f5c512571..5a3ed45008 100755 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -1902,6 +1902,40 @@ static int testDomainSuspend(virDomainPtr domain) return ret; } + +static void +testDomainActionSetState(virDomainObjPtr dom, + int lifecycle_type) +{ + switch (lifecycle_type) { + case VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY: + virDomainObjSetState(dom, VIR_DOMAIN_SHUTOFF, + VIR_DOMAIN_SHUTOFF_SHUTDOWN); + break; + + case VIR_DOMAIN_LIFECYCLE_ACTION_RESTART: + virDomainObjSetState(dom, VIR_DOMAIN_RUNNING, + VIR_DOMAIN_RUNNING_BOOTED); + break; + + case VIR_DOMAIN_LIFECYCLE_ACTION_PRESERVE: + virDomainObjSetState(dom, VIR_DOMAIN_SHUTOFF, + VIR_DOMAIN_SHUTOFF_SHUTDOWN); + break; + + case VIR_DOMAIN_LIFECYCLE_ACTION_RESTART_RENAME: + virDomainObjSetState(dom, VIR_DOMAIN_RUNNING, + VIR_DOMAIN_RUNNING_BOOTED); + break; + + default: + virDomainObjSetState(dom, VIR_DOMAIN_SHUTOFF, + VIR_DOMAIN_SHUTOFF_SHUTDOWN); + break; + } +} + + static int testDomainShutdownFlags(virDomainPtr domain, unsigned int flags) { @@ -1922,13 +1956,17 @@ static int testDomainShutdownFlags(virDomainPtr domain, goto cleanup; } - testDomainShutdownState(domain, privdom, VIR_DOMAIN_SHUTOFF_SHUTDOWN); - event = virDomainEventLifecycleNewFromObj(privdom, - VIR_DOMAIN_EVENT_STOPPED, - VIR_DOMAIN_EVENT_STOPPED_SHUTDOWN); + testDomainActionSetState(privdom, privdom->def->onPoweroff); - if (!privdom->persistent) - virDomainObjListRemove(privconn->domains, privdom); + if (virDomainObjGetState(privdom, NULL) == VIR_DOMAIN_SHUTOFF) { + testDomainShutdownState(domain, privdom, VIR_DOMAIN_SHUTOFF_SHUTDOWN); + event = virDomainEventLifecycleNewFromObj(privdom, + VIR_DOMAIN_EVENT_STOPPED, + VIR_DOMAIN_EVENT_STOPPED_SHUTDOWN); + + if (!privdom->persistent) + virDomainObjListRemove(privconn->domains, privdom); + } ret = 0; cleanup: @@ -1967,32 +2005,7 @@ static int testDomainReboot(virDomainPtr domain, virDomainObjSetState(privdom, VIR_DOMAIN_SHUTDOWN, VIR_DOMAIN_SHUTDOWN_USER); - switch (privdom->def->onReboot) { - case VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY: - virDomainObjSetState(privdom, VIR_DOMAIN_SHUTOFF, - VIR_DOMAIN_SHUTOFF_SHUTDOWN); - break; - - case VIR_DOMAIN_LIFECYCLE_ACTION_RESTART: - virDomainObjSetState(privdom, VIR_DOMAIN_RUNNING, - VIR_DOMAIN_RUNNING_BOOTED); - break; - - case VIR_DOMAIN_LIFECYCLE_ACTION_PRESERVE: - virDomainObjSetState(privdom, VIR_DOMAIN_SHUTOFF, - VIR_DOMAIN_SHUTOFF_SHUTDOWN); - break; - - case VIR_DOMAIN_LIFECYCLE_ACTION_RESTART_RENAME: - virDomainObjSetState(privdom, VIR_DOMAIN_RUNNING, - VIR_DOMAIN_RUNNING_BOOTED); - break; - - default: - virDomainObjSetState(privdom, VIR_DOMAIN_SHUTOFF, - VIR_DOMAIN_SHUTOFF_SHUTDOWN); - break; - } + testDomainActionSetState(privdom, privdom->def->onReboot); if (virDomainObjGetState(privdom, NULL) == VIR_DOMAIN_SHUTOFF) { testDomainShutdownState(domain, privdom, VIR_DOMAIN_SHUTOFF_SHUTDOWN); -- 2.22.0
On Tue, Aug 13, 2019 at 3:28 PM Ilias Stamatis <stamatis.iliass@gmail.com> wrote:
Signed-off-by: Ilias Stamatis <stamatis.iliass@gmail.com> --- src/test/test_driver.c | 77 ++++++++++++++++++++++++------------------ 1 file changed, 45 insertions(+), 32 deletions(-)
diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 5f5c512571..5a3ed45008 100755 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -1902,6 +1902,40 @@ static int testDomainSuspend(virDomainPtr domain) return ret; }
+ +static void +testDomainActionSetState(virDomainObjPtr dom, + int lifecycle_type) +{ + switch (lifecycle_type) { + case VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY: + virDomainObjSetState(dom, VIR_DOMAIN_SHUTOFF, + VIR_DOMAIN_SHUTOFF_SHUTDOWN); + break; + + case VIR_DOMAIN_LIFECYCLE_ACTION_RESTART: + virDomainObjSetState(dom, VIR_DOMAIN_RUNNING, + VIR_DOMAIN_RUNNING_BOOTED); + break; + + case VIR_DOMAIN_LIFECYCLE_ACTION_PRESERVE: + virDomainObjSetState(dom, VIR_DOMAIN_SHUTOFF, + VIR_DOMAIN_SHUTOFF_SHUTDOWN); + break; + + case VIR_DOMAIN_LIFECYCLE_ACTION_RESTART_RENAME: + virDomainObjSetState(dom, VIR_DOMAIN_RUNNING, + VIR_DOMAIN_RUNNING_BOOTED); + break; + + default: + virDomainObjSetState(dom, VIR_DOMAIN_SHUTOFF, + VIR_DOMAIN_SHUTOFF_SHUTDOWN); + break; + } +} + + static int testDomainShutdownFlags(virDomainPtr domain, unsigned int flags) { @@ -1922,13 +1956,17 @@ static int testDomainShutdownFlags(virDomainPtr domain, goto cleanup; }
- testDomainShutdownState(domain, privdom, VIR_DOMAIN_SHUTOFF_SHUTDOWN); - event = virDomainEventLifecycleNewFromObj(privdom, - VIR_DOMAIN_EVENT_STOPPED, - VIR_DOMAIN_EVENT_STOPPED_SHUTDOWN); + testDomainActionSetState(privdom, privdom->def->onPoweroff);
- if (!privdom->persistent) - virDomainObjListRemove(privconn->domains, privdom); + if (virDomainObjGetState(privdom, NULL) == VIR_DOMAIN_SHUTOFF) { + testDomainShutdownState(domain, privdom, VIR_DOMAIN_SHUTOFF_SHUTDOWN); + event = virDomainEventLifecycleNewFromObj(privdom, + VIR_DOMAIN_EVENT_STOPPED, + VIR_DOMAIN_EVENT_STOPPED_SHUTDOWN); + + if (!privdom->persistent) + virDomainObjListRemove(privconn->domains, privdom); + }
ret = 0; cleanup: @@ -1967,32 +2005,7 @@ static int testDomainReboot(virDomainPtr domain, virDomainObjSetState(privdom, VIR_DOMAIN_SHUTDOWN, VIR_DOMAIN_SHUTDOWN_USER);
^ Actually probably this is not needed since it's going to get overridden anyways.
- switch (privdom->def->onReboot) { - case VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY: - virDomainObjSetState(privdom, VIR_DOMAIN_SHUTOFF, - VIR_DOMAIN_SHUTOFF_SHUTDOWN); - break; - - case VIR_DOMAIN_LIFECYCLE_ACTION_RESTART: - virDomainObjSetState(privdom, VIR_DOMAIN_RUNNING, - VIR_DOMAIN_RUNNING_BOOTED); - break; - - case VIR_DOMAIN_LIFECYCLE_ACTION_PRESERVE: - virDomainObjSetState(privdom, VIR_DOMAIN_SHUTOFF, - VIR_DOMAIN_SHUTOFF_SHUTDOWN); - break; - - case VIR_DOMAIN_LIFECYCLE_ACTION_RESTART_RENAME: - virDomainObjSetState(privdom, VIR_DOMAIN_RUNNING, - VIR_DOMAIN_RUNNING_BOOTED); - break; - - default: - virDomainObjSetState(privdom, VIR_DOMAIN_SHUTOFF, - VIR_DOMAIN_SHUTOFF_SHUTDOWN); - break; - } + testDomainActionSetState(privdom, privdom->def->onReboot);
if (virDomainObjGetState(privdom, NULL) == VIR_DOMAIN_SHUTOFF) { testDomainShutdownState(domain, privdom, VIR_DOMAIN_SHUTOFF_SHUTDOWN); -- 2.22.0
On Tue, Aug 13, 2019 at 03:34:02PM +0300, Ilias Stamatis wrote:
On Tue, Aug 13, 2019 at 3:28 PM Ilias Stamatis <stamatis.iliass@gmail.com> wrote:
Signed-off-by: Ilias Stamatis <stamatis.iliass@gmail.com> --- src/test/test_driver.c | 77 ++++++++++++++++++++++++------------------ 1 file changed, 45 insertions(+), 32 deletions(-)
diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 5f5c512571..5a3ed45008 100755 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -1902,6 +1902,40 @@ static int testDomainSuspend(virDomainPtr domain) return ret; }
+ +static void +testDomainActionSetState(virDomainObjPtr dom, + int lifecycle_type) +{ + switch (lifecycle_type) { + case VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY: + virDomainObjSetState(dom, VIR_DOMAIN_SHUTOFF, + VIR_DOMAIN_SHUTOFF_SHUTDOWN); + break; + + case VIR_DOMAIN_LIFECYCLE_ACTION_RESTART: + virDomainObjSetState(dom, VIR_DOMAIN_RUNNING, + VIR_DOMAIN_RUNNING_BOOTED); + break; + + case VIR_DOMAIN_LIFECYCLE_ACTION_PRESERVE: + virDomainObjSetState(dom, VIR_DOMAIN_SHUTOFF, + VIR_DOMAIN_SHUTOFF_SHUTDOWN); + break; + + case VIR_DOMAIN_LIFECYCLE_ACTION_RESTART_RENAME: + virDomainObjSetState(dom, VIR_DOMAIN_RUNNING, + VIR_DOMAIN_RUNNING_BOOTED); + break; + + default: + virDomainObjSetState(dom, VIR_DOMAIN_SHUTOFF, + VIR_DOMAIN_SHUTOFF_SHUTDOWN); + break; + } +} + + static int testDomainShutdownFlags(virDomainPtr domain, unsigned int flags) { @@ -1922,13 +1956,17 @@ static int testDomainShutdownFlags(virDomainPtr domain, goto cleanup; }
- testDomainShutdownState(domain, privdom, VIR_DOMAIN_SHUTOFF_SHUTDOWN); - event = virDomainEventLifecycleNewFromObj(privdom, - VIR_DOMAIN_EVENT_STOPPED, - VIR_DOMAIN_EVENT_STOPPED_SHUTDOWN); + testDomainActionSetState(privdom, privdom->def->onPoweroff);
- if (!privdom->persistent) - virDomainObjListRemove(privconn->domains, privdom); + if (virDomainObjGetState(privdom, NULL) == VIR_DOMAIN_SHUTOFF) { + testDomainShutdownState(domain, privdom, VIR_DOMAIN_SHUTOFF_SHUTDOWN); + event = virDomainEventLifecycleNewFromObj(privdom, + VIR_DOMAIN_EVENT_STOPPED, + VIR_DOMAIN_EVENT_STOPPED_SHUTDOWN);
indentation... The thing with the events like proposed is that onPoweroff "restart" would not generate any, but I think that events are a problem for another day.
+ + if (!privdom->persistent) + virDomainObjListRemove(privconn->domains, privdom); + }
ret = 0; cleanup: @@ -1967,32 +2005,7 @@ static int testDomainReboot(virDomainPtr domain, virDomainObjSetState(privdom, VIR_DOMAIN_SHUTDOWN, VIR_DOMAIN_SHUTDOWN_USER);
^ Actually probably this is not needed since it's going to get overridden anyways.
Yes, I'll drop that.
- switch (privdom->def->onReboot) { - case VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY: - virDomainObjSetState(privdom, VIR_DOMAIN_SHUTOFF, - VIR_DOMAIN_SHUTOFF_SHUTDOWN); - break; - - case VIR_DOMAIN_LIFECYCLE_ACTION_RESTART: - virDomainObjSetState(privdom, VIR_DOMAIN_RUNNING, - VIR_DOMAIN_RUNNING_BOOTED); - break; - - case VIR_DOMAIN_LIFECYCLE_ACTION_PRESERVE: - virDomainObjSetState(privdom, VIR_DOMAIN_SHUTOFF, - VIR_DOMAIN_SHUTOFF_SHUTDOWN); - break; - - case VIR_DOMAIN_LIFECYCLE_ACTION_RESTART_RENAME: - virDomainObjSetState(privdom, VIR_DOMAIN_RUNNING, - VIR_DOMAIN_RUNNING_BOOTED); - break; - - default: - virDomainObjSetState(privdom, VIR_DOMAIN_SHUTOFF, - VIR_DOMAIN_SHUTOFF_SHUTDOWN); - break; - } + testDomainActionSetState(privdom, privdom->def->onReboot);
if (virDomainObjGetState(privdom, NULL) == VIR_DOMAIN_SHUTOFF) { testDomainShutdownState(domain, privdom, VIR_DOMAIN_SHUTOFF_SHUTDOWN); -- 2.22.0
-- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
On Tue, Aug 13, 2019 at 03:28:09PM +0300, Ilias Stamatis wrote:
Signed-off-by: Ilias Stamatis <stamatis.iliass@gmail.com>
I'll rephrase the commit subject to: Introduce testDomainActionSetState helper Erik
Signed-off-by: Ilias Stamatis <stamatis.iliass@gmail.com> --- src/test/test_driver.c | 58 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 5a3ed45008..2008e7e43a 100755 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -8132,6 +8132,63 @@ testDomainGetBlockInfo(virDomainPtr dom, } +static void +testDomainModifyLifecycleAction(virDomainDefPtr def, + virDomainLifecycle type, + virDomainLifecycleAction action) +{ + switch (type) { + case VIR_DOMAIN_LIFECYCLE_POWEROFF: + def->onPoweroff = action; + break; + case VIR_DOMAIN_LIFECYCLE_REBOOT: + def->onReboot = action; + break; + case VIR_DOMAIN_LIFECYCLE_CRASH: + def->onCrash = action; + break; + case VIR_DOMAIN_LIFECYCLE_LAST: + break; + } +} + + +static int +testDomainSetLifecycleAction(virDomainPtr dom, + unsigned int type, + unsigned int action, + unsigned int flags) +{ + virDomainObjPtr vm = NULL; + virDomainDefPtr def = NULL; + virDomainDefPtr persistentDef = NULL; + int ret = -1; + + virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | + VIR_DOMAIN_AFFECT_CONFIG, -1); + + if (!virDomainDefLifecycleActionAllowed(type, action)) + return -1; + + if (!(vm = testDomObjFromDomain(dom))) + return -1; + + if (virDomainObjGetDefs(vm, flags, &def, &persistentDef) < 0) + goto cleanup; + + if (def) + testDomainModifyLifecycleAction(def, type, action); + + if (persistentDef) + testDomainModifyLifecycleAction(persistentDef, type, action); + + ret = 0; + cleanup: + virDomainObjEndAPI(&vm); + return ret; +} + + /* * Snapshot APIs */ @@ -9437,6 +9494,7 @@ static virHypervisorDriver testHypervisorDriver = { .domainMemoryStats = testDomainMemoryStats, /* 5.7.0 */ .domainMemoryPeek = testDomainMemoryPeek, /* 5.4.0 */ .domainGetBlockInfo = testDomainGetBlockInfo, /* 5.7.0 */ + .domainSetLifecycleAction = testDomainSetLifecycleAction, /* 5.7.0 */ .domainSnapshotNum = testDomainSnapshotNum, /* 1.1.4 */ .domainSnapshotListNames = testDomainSnapshotListNames, /* 1.1.4 */ -- 2.22.0
On Tue, Aug 13, 2019 at 03:28:08PM +0300, Ilias Stamatis wrote:
Ilias Stamatis (2): test_driver: handle different lifecycle actions in testDomainShutdownFlags test_driver: implement virDomainSetLifecycleAction
src/test/test_driver.c | 135 +++++++++++++++++++++++++++++++---------- 1 file changed, 103 insertions(+), 32 deletions(-)
Reviewed-by: Erik Skultety <eskultet@redhat.com>
participants (2)
-
Erik Skultety -
Ilias Stamatis