External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 21:55:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use the correct symbol for 'onCrash'

Browse Source 
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
This commit is contained in:
John Ferlan 2015-06-29 15:22:28 -04:00
parent a77056bdb5
commit 5cd985221b
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lxc/lxc_native.c
View File

@ -1013,7 +1013,7 @@ lxcParseConfigString(const char *config)
virDomainDefSetMemoryInitial(vmdef, 64 * 1024); virDomainDefSetMemoryInitial(vmdef, 64 * 1024);
vmdef->onReboot = VIR_DOMAIN_LIFECYCLE_RESTART; 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->onPoweroff = VIR_DOMAIN_LIFECYCLE_DESTROY;
vmdef->virtType = VIR_DOMAIN_VIRT_LXC; vmdef->virtType = VIR_DOMAIN_VIRT_LXC;

4
src/qemu/qemu_command.c
View File

@ -9381,7 +9381,7 @@ qemuBuildCommandLine(virConnectPtr conn,
/* Only add -no-reboot option if each event destroys domain */ /* Only add -no-reboot option if each event destroys domain */
if (def->onReboot == VIR_DOMAIN_LIFECYCLE_DESTROY && if (def->onReboot == VIR_DOMAIN_LIFECYCLE_DESTROY &&
def->onPoweroff == 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; allowReboot = false;
virCommandAddArg(cmd, "-no-reboot"); virCommandAddArg(cmd, "-no-reboot");
} }
@ -12603,7 +12603,7 @@ qemuParseCommandLine(virCapsPtr qemuCaps,
def->clock.offset = VIR_DOMAIN_CLOCK_OFFSET_UTC; def->clock.offset = VIR_DOMAIN_CLOCK_OFFSET_UTC;
def->onReboot = VIR_DOMAIN_LIFECYCLE_RESTART; 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->onPoweroff = VIR_DOMAIN_LIFECYCLE_DESTROY;
def->virtType = VIR_DOMAIN_VIRT_QEMU; def->virtType = VIR_DOMAIN_VIRT_QEMU;
if (VIR_STRDUP(def->emulator, progargv[0]) < 0) if (VIR_STRDUP(def->emulator, progargv[0]) < 0)

2
src/vmx/vmx.c
View File

@ -1519,7 +1519,7 @@ virVMXParseConfig(virVMXContext *ctx,
/* def:lifecycle */ /* def:lifecycle */
def->onReboot = VIR_DOMAIN_LIFECYCLE_RESTART; def->onReboot = VIR_DOMAIN_LIFECYCLE_RESTART;
def->onPoweroff = VIR_DOMAIN_LIFECYCLE_DESTROY; def->onPoweroff = VIR_DOMAIN_LIFECYCLE_DESTROY;
def->onCrash = VIR_DOMAIN_LIFECYCLE_DESTROY; def->onCrash = VIR_DOMAIN_LIFECYCLE_CRASH_DESTROY;
/* def:os */ /* def:os */
def->os.type = VIR_DOMAIN_OSTYPE_HVM; def->os.type = VIR_DOMAIN_OSTYPE_HVM;

2
src/xenconfig/xen_sxpr.c
View File

@ -1208,7 +1208,7 @@ xenParseSxpr(const struct sexpr *root,
goto error; goto error;
} }
} else { } else {
def->onCrash = VIR_DOMAIN_LIFECYCLE_DESTROY; def->onCrash = VIR_DOMAIN_LIFECYCLE_CRASH_DESTROY;
} }
if (hvm) { if (hvm) {