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

[Eric Blake]

On 05/31/2014 06:22 PM, Julio Faracco wrote:
> In "src/conf/domain_conf.h" there are many enum declarations. The
> cleanup in this header filer was started, but it wasn't enough and
> there are many other files that has enum variables declared. So, the
> commit was starting to be big. This commit finish the cleanup in this
> header file and in other files that has enum variables, parameters,
> or functions declared.
> 
> Signed-off-by: Julio Faracco <jcfaracco at gmail.com>
> ---
>  src/conf/domain_audit.c      |    6 +-
>  src/conf/domain_conf.c       |   46 +++----
>  src/conf/domain_conf.h       |  274 +++++++++++++++++++++---------------------
>  src/network/bridge_driver.c  |    6 +-
>  src/qemu/qemu_command.c      |   24 ++--

Merge conflict here based on changes in the meantime, but trivial enough
to resolve.

>  src/qemu/qemu_domain.c       |    2 +-
>  src/qemu/qemu_domain.h       |    2 +-
>  src/qemu/qemu_hotplug.c      |    2 +-
>  src/qemu/qemu_monitor.c      |    2 +-
>  src/qemu/qemu_monitor.h      |    2 +-
>  src/qemu/qemu_monitor_json.c |    4 +-
>  src/qemu/qemu_monitor_json.h |    2 +-
>  src/qemu/qemu_monitor_text.c |    2 +-
>  src/qemu/qemu_monitor_text.h |    2 +-
>  src/security/security_dac.c  |    4 +-
>  15 files changed, 190 insertions(+), 190 deletions(-)

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

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 604 bytes
Desc: OpenPGP digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20140602/cc80d136/attachment-0001.sig>