Use the correct symbol for 'onCrash'

Although defined the same way, fortunately there hadn't been any deviation.
Ensure any assignments to onCrash use VIR_DOMAIN_LIFECYCLE_CRASH_* defs and
not VIR_DOMAIN_LIFECYCLE_* defs

diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c
index 1069236e98739f73254abaa2e47c2e29a6044d6f..6faa70139b3f1faacada27fbb3344bb8474c50c6 100644 (file)
--- a/src/lxc/lxc_native.c
+++ b/src/lxc/lxc_native.c
@@ -1013,7 +1013,7 @@ lxcParseConfigString(const char *config)
     virDomainDefSetMemoryInitial(vmdef, 64 * 1024);
 
     vmdef->onReboot = VIR_DOMAIN_LIFECYCLE_RESTART;
-    vmdef->onCrash = VIR_DOMAIN_LIFECYCLE_DESTROY;
+    vmdef->onCrash = VIR_DOMAIN_LIFECYCLE_CRASH_DESTROY;
     vmdef->onPoweroff = VIR_DOMAIN_LIFECYCLE_DESTROY;
     vmdef->virtType = VIR_DOMAIN_VIRT_LXC;
 

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 9b06a4924ec42c5d06e02144ee616d89d510a44f..443a7d7739a6823f01a7c42f3200359b1a638f9f 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -9381,7 +9381,7 @@ qemuBuildCommandLine(virConnectPtr conn,
         /* Only add -no-reboot option if each event destroys domain */
         if (def->onReboot == VIR_DOMAIN_LIFECYCLE_DESTROY &&
             def->onPoweroff == VIR_DOMAIN_LIFECYCLE_DESTROY &&
-            def->onCrash == VIR_DOMAIN_LIFECYCLE_DESTROY) {
+            def->onCrash == VIR_DOMAIN_LIFECYCLE_CRASH_DESTROY) {
             allowReboot = false;
             virCommandAddArg(cmd, "-no-reboot");
         }
@@ -12603,7 +12603,7 @@ qemuParseCommandLine(virCapsPtr qemuCaps,
     def->clock.offset = VIR_DOMAIN_CLOCK_OFFSET_UTC;
 
     def->onReboot = VIR_DOMAIN_LIFECYCLE_RESTART;
-    def->onCrash = VIR_DOMAIN_LIFECYCLE_DESTROY;
+    def->onCrash = VIR_DOMAIN_LIFECYCLE_CRASH_DESTROY;
     def->onPoweroff = VIR_DOMAIN_LIFECYCLE_DESTROY;
     def->virtType = VIR_DOMAIN_VIRT_QEMU;
     if (VIR_STRDUP(def->emulator, progargv[0]) < 0)

diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c
index aede2ad295fbf1ec98a56d2f0eea067a1e49a268..e77de62515ecb7c13168cd7b48a5690438e0711f 100644 (file)
--- a/src/vmx/vmx.c
+++ b/src/vmx/vmx.c
@@ -1519,7 +1519,7 @@ virVMXParseConfig(virVMXContext *ctx,
     /* def:lifecycle */
     def->onReboot = VIR_DOMAIN_LIFECYCLE_RESTART;
     def->onPoweroff = VIR_DOMAIN_LIFECYCLE_DESTROY;
-    def->onCrash = VIR_DOMAIN_LIFECYCLE_DESTROY;
+    def->onCrash = VIR_DOMAIN_LIFECYCLE_CRASH_DESTROY;
 
     /* def:os */
     def->os.type = VIR_DOMAIN_OSTYPE_HVM;

diff --git a/src/xenconfig/xen_sxpr.c b/src/xenconfig/xen_sxpr.c
index 8985295af5adf421b2613e2dfbeb844eb3511a7c..05e938a60edf0c44e1636988a549094ee961e7d9 100644 (file)
--- a/src/xenconfig/xen_sxpr.c
+++ b/src/xenconfig/xen_sxpr.c
@@ -1208,7 +1208,7 @@ xenParseSxpr(const struct sexpr *root,
             goto error;
         }
     } else {
-        def->onCrash = VIR_DOMAIN_LIFECYCLE_DESTROY;
+        def->onCrash = VIR_DOMAIN_LIFECYCLE_CRASH_DESTROY;
     }
 
     if (hvm) {