conf: rename lifecycle enum values to correspond with typedef keyword

Reviewed-by: John Ferlan <jferlan@redhat.com>
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 25d48f977657888617d21032f075b1b1705e2770..ba9e137f36a27bc090016653579865e953c87e5a 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -208,7 +208,7 @@ VIR_ENUM_IMPL(virDomainCapsFeature, VIR_DOMAIN_CAPS_FEATURE_LAST,
               "syslog",
               "wake_alarm")
 
-VIR_ENUM_IMPL(virDomainLifecycle, VIR_DOMAIN_LIFECYCLE_LAST,
+VIR_ENUM_IMPL(virDomainLifecycle, VIR_DOMAIN_LIFECYCLE_ACTION_LAST,
               "destroy",
               "restart",
               "rename-restart",
@@ -18593,14 +18593,14 @@ virDomainDefParseXML(xmlDocPtr xml,
     if (virDomainEventActionParseXML(ctxt, "on_reboot",
                                      "string(./on_reboot[1])",
                                      &def->onReboot,
-                                     VIR_DOMAIN_LIFECYCLE_RESTART,
+                                     VIR_DOMAIN_LIFECYCLE_ACTION_RESTART,
                                      virDomainLifecycleTypeFromString) < 0)
         goto error;
 
     if (virDomainEventActionParseXML(ctxt, "on_poweroff",
                                      "string(./on_poweroff[1])",
                                      &def->onPoweroff,
-                                     VIR_DOMAIN_LIFECYCLE_DESTROY,
+                                     VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY,
                                      virDomainLifecycleTypeFromString) < 0)
         goto error;
 

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index a42efcfa68e35cfebf7c5b97d1b66cfa4923d231..4a821fb0f2a5d2edff6922e2177851a39ea7733e 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -1792,12 +1792,12 @@ typedef enum {
 } virDomainCapsFeature;
 
 typedef enum {
-    VIR_DOMAIN_LIFECYCLE_DESTROY,
-    VIR_DOMAIN_LIFECYCLE_RESTART,
-    VIR_DOMAIN_LIFECYCLE_RESTART_RENAME,
-    VIR_DOMAIN_LIFECYCLE_PRESERVE,
+    VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY,
+    VIR_DOMAIN_LIFECYCLE_ACTION_RESTART,
+    VIR_DOMAIN_LIFECYCLE_ACTION_RESTART_RENAME,
+    VIR_DOMAIN_LIFECYCLE_ACTION_PRESERVE,
 
-    VIR_DOMAIN_LIFECYCLE_LAST
+    VIR_DOMAIN_LIFECYCLE_ACTION_LAST
 } virDomainLifecycleAction;
 
 typedef enum {

diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c
index 34233a955f74a62a67c5abde51c46ab0fa279f46..15111af0b79e980b70ac08375e09f5b321db5458 100644 (file)
--- a/src/libxl/libxl_conf.c
+++ b/src/libxl/libxl_conf.c
@@ -98,19 +98,19 @@ static libxl_action_on_shutdown
 libxlActionFromVirLifecycle(virDomainLifecycleAction action)
 {
     switch (action) {
-    case VIR_DOMAIN_LIFECYCLE_DESTROY:
+    case VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY:
         return LIBXL_ACTION_ON_SHUTDOWN_DESTROY;
 
-    case VIR_DOMAIN_LIFECYCLE_RESTART:
-        return  LIBXL_ACTION_ON_SHUTDOWN_RESTART;
+    case VIR_DOMAIN_LIFECYCLE_ACTION_RESTART:
+        return LIBXL_ACTION_ON_SHUTDOWN_RESTART;
 
-    case VIR_DOMAIN_LIFECYCLE_RESTART_RENAME:
+    case VIR_DOMAIN_LIFECYCLE_ACTION_RESTART_RENAME:
         return LIBXL_ACTION_ON_SHUTDOWN_RESTART_RENAME;
 
-    case VIR_DOMAIN_LIFECYCLE_PRESERVE:
+    case VIR_DOMAIN_LIFECYCLE_ACTION_PRESERVE:
         return LIBXL_ACTION_ON_SHUTDOWN_PRESERVE;
 
-    case VIR_DOMAIN_LIFECYCLE_LAST:
+    case VIR_DOMAIN_LIFECYCLE_ACTION_LAST:
         break;
     }
 

diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c
index 7caa6747494aac637eb6d5ad7961f30c27953001..3b260ee15cccd05bd9008779d9a5b645b93a5513 100644 (file)
--- a/src/libxl/libxl_domain.c
+++ b/src/libxl/libxl_domain.c
@@ -468,13 +468,13 @@ libxlDomainShutdownThread(void *opaque)
                                            VIR_DOMAIN_EVENT_STOPPED,
                                            VIR_DOMAIN_EVENT_STOPPED_SHUTDOWN);
         switch ((virDomainLifecycleAction) vm->def->onPoweroff) {
-        case VIR_DOMAIN_LIFECYCLE_DESTROY:
+        case VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY:
             goto destroy;
-        case VIR_DOMAIN_LIFECYCLE_RESTART:
-        case VIR_DOMAIN_LIFECYCLE_RESTART_RENAME:
+        case VIR_DOMAIN_LIFECYCLE_ACTION_RESTART:
+        case VIR_DOMAIN_LIFECYCLE_ACTION_RESTART_RENAME:
             goto restart;
-        case VIR_DOMAIN_LIFECYCLE_PRESERVE:
-        case VIR_DOMAIN_LIFECYCLE_LAST:
+        case VIR_DOMAIN_LIFECYCLE_ACTION_PRESERVE:
+        case VIR_DOMAIN_LIFECYCLE_ACTION_LAST:
             goto endjob;
         }
     } else if (xl_reason == LIBXL_SHUTDOWN_REASON_CRASH) {
@@ -508,13 +508,13 @@ libxlDomainShutdownThread(void *opaque)
                                            VIR_DOMAIN_EVENT_STOPPED,
                                            VIR_DOMAIN_EVENT_STOPPED_SHUTDOWN);
         switch ((virDomainLifecycleAction) vm->def->onReboot) {
-        case VIR_DOMAIN_LIFECYCLE_DESTROY:
+        case VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY:
             goto destroy;
-        case VIR_DOMAIN_LIFECYCLE_RESTART:
-        case VIR_DOMAIN_LIFECYCLE_RESTART_RENAME:
+        case VIR_DOMAIN_LIFECYCLE_ACTION_RESTART:
+        case VIR_DOMAIN_LIFECYCLE_ACTION_RESTART_RENAME:
             goto restart;
-        case VIR_DOMAIN_LIFECYCLE_PRESERVE:
-        case VIR_DOMAIN_LIFECYCLE_LAST:
+        case VIR_DOMAIN_LIFECYCLE_ACTION_PRESERVE:
+        case VIR_DOMAIN_LIFECYCLE_ACTION_LAST:
             goto endjob;
         }
     } else {

diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c
index 5fc6e7cda441bcc236eff83e719558ec96cead53..08f82f2580bb6a37e2e838233167bb543420d6a2 100644 (file)
--- a/src/lxc/lxc_native.c
+++ b/src/lxc/lxc_native.c
@@ -1015,9 +1015,9 @@ lxcParseConfigString(const char *config,
     vmdef->id = -1;
     virDomainDefSetMemoryTotal(vmdef, 64 * 1024);
 
-    vmdef->onReboot = VIR_DOMAIN_LIFECYCLE_RESTART;
+    vmdef->onReboot = VIR_DOMAIN_LIFECYCLE_ACTION_RESTART;
     vmdef->onCrash = VIR_DOMAIN_LIFECYCLE_CRASH_DESTROY;
-    vmdef->onPoweroff = VIR_DOMAIN_LIFECYCLE_DESTROY;
+    vmdef->onPoweroff = VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY;
     vmdef->virtType = VIR_DOMAIN_VIRT_LXC;
 
     /* Value not handled by the LXC driver, setting to

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index f943e3870596c8b5fffa5ce41b0a591c776010cb..865f136d3b6141e74a1164e1a8a9ea6033cc9cdd 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -6519,8 +6519,8 @@ qemuBuildPMCommandLine(virCommandPtr cmd,
     bool allowReboot = true;
 
     /* Only add -no-reboot option if each event destroys domain */
-    if (def->onReboot == VIR_DOMAIN_LIFECYCLE_DESTROY &&
-        def->onPoweroff == VIR_DOMAIN_LIFECYCLE_DESTROY &&
+    if (def->onReboot == VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY &&
+        def->onPoweroff == VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY &&
         (def->onCrash == VIR_DOMAIN_LIFECYCLE_CRASH_DESTROY ||
          def->onCrash == VIR_DOMAIN_LIFECYCLE_CRASH_COREDUMP_DESTROY)) {
         allowReboot = false;

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index fb4d72236810b4a04066a5e050ddcaefacdd5d6d..ef283b119628102b90d4820affe54214691e1a8d 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -1981,8 +1981,8 @@ static int qemuDomainShutdownFlags(virDomainPtr dom, unsigned int flags)
     if (!(vm = qemuDomObjFromDomain(dom)))
         goto cleanup;
 
-    if (vm->def->onPoweroff == VIR_DOMAIN_LIFECYCLE_RESTART ||
-        vm->def->onPoweroff == VIR_DOMAIN_LIFECYCLE_RESTART_RENAME) {
+    if (vm->def->onPoweroff == VIR_DOMAIN_LIFECYCLE_ACTION_RESTART ||
+        vm->def->onPoweroff == VIR_DOMAIN_LIFECYCLE_ACTION_RESTART_RENAME) {
         isReboot = true;
         agentFlag = QEMU_AGENT_SHUTDOWN_REBOOT;
         VIR_INFO("Domain on_poweroff setting overridden, attempting reboot");
@@ -2076,8 +2076,8 @@ qemuDomainReboot(virDomainPtr dom, unsigned int flags)
     if (!(vm = qemuDomObjFromDomain(dom)))
         goto cleanup;
 
-    if (vm->def->onReboot == VIR_DOMAIN_LIFECYCLE_DESTROY ||
-        vm->def->onReboot == VIR_DOMAIN_LIFECYCLE_PRESERVE) {
+    if (vm->def->onReboot == VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY ||
+        vm->def->onReboot == VIR_DOMAIN_LIFECYCLE_ACTION_PRESERVE) {
         agentFlag = QEMU_AGENT_SHUTDOWN_POWERDOWN;
         isReboot = false;
         VIR_INFO("Domain on_reboot setting overridden, shutting down");

diff --git a/src/qemu/qemu_parse_command.c b/src/qemu/qemu_parse_command.c
index 7bdfbd1640ae5baa2ddb8289a5ee73e5447b98aa..42e03c728692426d80e17f58ca9cb7813f696bdf 100644 (file)
--- a/src/qemu/qemu_parse_command.c
+++ b/src/qemu/qemu_parse_command.c
@@ -1886,9 +1886,9 @@ qemuParseCommandLine(virCapsPtr caps,
         goto error;
     def->clock.offset = VIR_DOMAIN_CLOCK_OFFSET_UTC;
 
-    def->onReboot = VIR_DOMAIN_LIFECYCLE_RESTART;
+    def->onReboot = VIR_DOMAIN_LIFECYCLE_ACTION_RESTART;
     def->onCrash = VIR_DOMAIN_LIFECYCLE_CRASH_DESTROY;
-    def->onPoweroff = VIR_DOMAIN_LIFECYCLE_DESTROY;
+    def->onPoweroff = VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY;
     def->virtType = VIR_DOMAIN_VIRT_QEMU;
     if (VIR_STRDUP(def->emulator, progargv[0]) < 0)
         goto error;
@@ -2195,7 +2195,7 @@ qemuParseCommandLine(virCapsPtr caps,
         } else if (STREQ(arg, "-no-acpi")) {
             def->features[VIR_DOMAIN_FEATURE_ACPI] = VIR_TRISTATE_SWITCH_ABSENT;
         } else if (STREQ(arg, "-no-reboot")) {
-            def->onReboot = VIR_DOMAIN_LIFECYCLE_DESTROY;
+            def->onReboot = VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY;
         } else if (STREQ(arg, "-no-kvm")) {
             def->virtType = VIR_DOMAIN_VIRT_QEMU;
         } else if (STREQ(arg, "-enable-kvm")) {

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index e0621942949abb044d894b09a2bf0b3756dfa618..2606584cc1a9dcc9258a90ed2f68f52c027ad439 100644 (file)
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -496,8 +496,8 @@ qemuProcessHandleReset(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
     if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0)
         VIR_WARN("Failed to save status on vm %s", vm->def->name);
 
-    if (vm->def->onReboot == VIR_DOMAIN_LIFECYCLE_DESTROY ||
-        vm->def->onReboot == VIR_DOMAIN_LIFECYCLE_PRESERVE) {
+    if (vm->def->onReboot == VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY ||
+        vm->def->onReboot == VIR_DOMAIN_LIFECYCLE_ACTION_PRESERVE) {
 
         if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0)
             goto cleanup;

diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 5742cf41987fea2f4bebcfb3d65997503e18b051..8e9e31145f9190bcae8bf0b1c7d5b7c42c38b1d5 100644 (file)
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -1920,22 +1920,22 @@ static int testDomainReboot(virDomainPtr domain,
                          VIR_DOMAIN_SHUTDOWN_USER);
 
     switch (privdom->def->onReboot) {
-    case VIR_DOMAIN_LIFECYCLE_DESTROY:
+    case VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY:
         virDomainObjSetState(privdom, VIR_DOMAIN_SHUTOFF,
                              VIR_DOMAIN_SHUTOFF_SHUTDOWN);
         break;
 
-    case VIR_DOMAIN_LIFECYCLE_RESTART:
+    case VIR_DOMAIN_LIFECYCLE_ACTION_RESTART:
         virDomainObjSetState(privdom, VIR_DOMAIN_RUNNING,
                              VIR_DOMAIN_RUNNING_BOOTED);
         break;
 
-    case VIR_DOMAIN_LIFECYCLE_PRESERVE:
+    case VIR_DOMAIN_LIFECYCLE_ACTION_PRESERVE:
         virDomainObjSetState(privdom, VIR_DOMAIN_SHUTOFF,
                              VIR_DOMAIN_SHUTOFF_SHUTDOWN);
         break;
 
-    case VIR_DOMAIN_LIFECYCLE_RESTART_RENAME:
+    case VIR_DOMAIN_LIFECYCLE_ACTION_RESTART_RENAME:
         virDomainObjSetState(privdom, VIR_DOMAIN_RUNNING,
                              VIR_DOMAIN_RUNNING_BOOTED);
         break;

diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c
index 8aae635c170383ce8ccc7ecf91e3435b56e972b4..2cb48bb72919b0b4d237ad2d694015b55077171a 100644 (file)
--- a/src/vmx/vmx.c
+++ b/src/vmx/vmx.c
@@ -1578,8 +1578,8 @@ virVMXParseConfig(virVMXContext *ctx,
     }
 
     /* def:lifecycle */
-    def->onReboot = VIR_DOMAIN_LIFECYCLE_RESTART;
-    def->onPoweroff = VIR_DOMAIN_LIFECYCLE_DESTROY;
+    def->onReboot = VIR_DOMAIN_LIFECYCLE_ACTION_RESTART;
+    def->onPoweroff = VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY;
     def->onCrash = VIR_DOMAIN_LIFECYCLE_CRASH_DESTROY;
 
     /* def:os */

diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c
index 52bd0fcc752f4bb3003ecc3b7466f8731a801c68..9efb7b77ca91acb6dc6a7f8d8c839271cd33abdd 100644 (file)
--- a/src/vz/vz_sdk.c
+++ b/src/vz/vz_sdk.c
@@ -1887,8 +1887,8 @@ prlsdkLoadDomain(vzDriverPtr driver,
 
     def->virtType = VIR_DOMAIN_VIRT_VZ;
 
-    def->onReboot = VIR_DOMAIN_LIFECYCLE_RESTART;
-    def->onPoweroff = VIR_DOMAIN_LIFECYCLE_DESTROY;
+    def->onReboot = VIR_DOMAIN_LIFECYCLE_ACTION_RESTART;
+    def->onPoweroff = VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY;
     def->onCrash = VIR_DOMAIN_LIFECYCLE_CRASH_DESTROY;
 
     /* get RAM parameters */
@@ -2591,8 +2591,8 @@ prlsdkCheckUnsupportedParams(PRL_HANDLE sdkdom, virDomainDefPtr def)
         return -1;
     }
 
-    if (def->onReboot != VIR_DOMAIN_LIFECYCLE_RESTART ||
-        def->onPoweroff != VIR_DOMAIN_LIFECYCLE_DESTROY ||
+    if (def->onReboot != VIR_DOMAIN_LIFECYCLE_ACTION_RESTART ||
+        def->onPoweroff != VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY ||
         def->onCrash != VIR_DOMAIN_LIFECYCLE_CRASH_DESTROY) {
 
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",

diff --git a/src/xenapi/xenapi_utils.c b/src/xenapi/xenapi_utils.c
index 0b16f89a4d3b1677179edcc7e56df1669353a6cb..c4bbecc336e1321144b3735e2f1a7127c469b37f 100644 (file)
--- a/src/xenapi/xenapi_utils.c
+++ b/src/xenapi/xenapi_utils.c
@@ -131,9 +131,9 @@ enum xen_on_normal_exit
 actionShutdownLibvirt2XenapiEnum(virDomainLifecycleAction action)
 {
     enum xen_on_normal_exit num = XEN_ON_NORMAL_EXIT_RESTART;
-    if (action == VIR_DOMAIN_LIFECYCLE_DESTROY)
+    if (action == VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY)
         num = XEN_ON_NORMAL_EXIT_DESTROY;
-    else if (action == VIR_DOMAIN_LIFECYCLE_RESTART)
+    else if (action == VIR_DOMAIN_LIFECYCLE_ACTION_RESTART)
         num = XEN_ON_NORMAL_EXIT_RESTART;
     return num;
 }
@@ -201,11 +201,11 @@ map2LibvirtBootOrder(char c)
 virDomainLifecycleAction
 xenapiNormalExitEnum2virDomainLifecycle(enum xen_on_normal_exit action)
 {
-    virDomainLifecycleAction num = VIR_DOMAIN_LIFECYCLE_RESTART;
+    virDomainLifecycleAction num = VIR_DOMAIN_LIFECYCLE_ACTION_RESTART;
     if (action == XEN_ON_NORMAL_EXIT_DESTROY)
-        num = VIR_DOMAIN_LIFECYCLE_DESTROY;
+        num = VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY;
     else if (action == XEN_ON_NORMAL_EXIT_RESTART)
-        num = VIR_DOMAIN_LIFECYCLE_RESTART;
+        num = VIR_DOMAIN_LIFECYCLE_ACTION_RESTART;
     return num;
 }
 

diff --git a/src/xenconfig/xen_sxpr.c b/src/xenconfig/xen_sxpr.c
index 358d0cbef9c98f012d1adf57d9f25d303169688c..05965d7426e0cb6d815f4756c15ad27727bb2c9d 100644 (file)
--- a/src/xenconfig/xen_sxpr.c
+++ b/src/xenconfig/xen_sxpr.c
@@ -1246,7 +1246,7 @@ xenParseSxpr(const struct sexpr *root,
             goto error;
         }
     } else {
-        def->onPoweroff = VIR_DOMAIN_LIFECYCLE_DESTROY;
+        def->onPoweroff = VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY;
     }
 
     tmp = sexpr_node(root, "domain/on_reboot");
@@ -1257,7 +1257,7 @@ xenParseSxpr(const struct sexpr *root,
             goto error;
         }
     } else {
-        def->onReboot = VIR_DOMAIN_LIFECYCLE_RESTART;
+        def->onReboot = VIR_DOMAIN_LIFECYCLE_ACTION_RESTART;
     }
 
     tmp = sexpr_node(root, "domain/on_crash");