Re: [libvirt] [PATCH 3/3] conf: more enum cleanups in "src/conf/domain_conf.h"

On 05/31/2014 06:22 PM, Julio Faracco wrote: Merge conflict here based on changes in the meantime, but trivial enough to resolve. You missed changes required in libxl/libxl_domain.c. ACK with fixes, and pushed. diff --git i/src/libxl/libxl_domain.c w/src/libxl/libxl_domain.c index 80d5280..9743c85 100644 --- i/src/libxl/libxl_domain.c +++ w/src/libxl/libxl_domain.c @@ -526,7 +526,7 @@ libxlDomainShutdownThread(void *opaque) dom_event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED_SHUTDOWN); - switch ((enum virDomainLifecycleAction) vm->def->onPoweroff) { + switch ((virDomainLifecycleAction) vm->def->onPoweroff) { case VIR_DOMAIN_LIFECYCLE_DESTROY: reason = VIR_DOMAIN_SHUTOFF_SHUTDOWN; goto destroy; @@ -541,7 +541,7 @@ libxlDomainShutdownThread(void *opaque) dom_event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED_CRASHED); - switch ((enum virDomainLifecycleCrashAction) vm->def->onCrash) { + switch ((virDomainLifecycleCrashAction) vm->def->onCrash) { case VIR_DOMAIN_LIFECYCLE_CRASH_DESTROY: reason = VIR_DOMAIN_SHUTOFF_CRASHED; goto destroy; @@ -562,7 +562,7 @@ libxlDomainShutdownThread(void *opaque) dom_event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED_SHUTDOWN); - switch ((enum virDomainLifecycleAction) vm->def->onReboot) { + switch ((virDomainLifecycleAction) vm->def->onReboot) { case VIR_DOMAIN_LIFECYCLE_DESTROY: reason = VIR_DOMAIN_SHUTOFF_SHUTDOWN; goto destroy; -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org