External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-30 01:43:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

xenapi_utils: Adapt to enum cleanups

Browse Source 
It was just very recently that we transfered from:

  enum virSomeEnumName{
      ...
  };

to:
  typedef enum {
      ...
  } virSomeEnumName;

This change requires some code adaptation, which wasn't done for
xenapi driver. With this fix we are able to build again.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Michal Privoznik 2014-06-03 09:18:58 +02:00
parent 3dd23b6106
commit b20060bae2
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/xenapi/xenapi_utils.c
View File

@ -127,7 +127,7 @@ xenapiUtil_ParseQuery(virConnectPtr conn, virURIPtr uri, int *noVerify)
enum xen_on_normal_exit enum xen_on_normal_exit
actionShutdownLibvirt2XenapiEnum(enum virDomainLifecycleAction action) actionShutdownLibvirt2XenapiEnum(virDomainLifecycleAction action)
{ {
enum xen_on_normal_exit num = XEN_ON_NORMAL_EXIT_RESTART; enum xen_on_normal_exit num = XEN_ON_NORMAL_EXIT_RESTART;
if (action == VIR_DOMAIN_LIFECYCLE_DESTROY) if (action == VIR_DOMAIN_LIFECYCLE_DESTROY)
@ -139,7 +139,7 @@ actionShutdownLibvirt2XenapiEnum(enum virDomainLifecycleAction action)
enum xen_on_crash_behaviour enum xen_on_crash_behaviour
actionCrashLibvirt2XenapiEnum(enum virDomainLifecycleCrashAction action) actionCrashLibvirt2XenapiEnum(virDomainLifecycleCrashAction action)
{ {
enum xen_on_crash_behaviour num = XEN_ON_CRASH_BEHAVIOUR_RESTART; enum xen_on_crash_behaviour num = XEN_ON_CRASH_BEHAVIOUR_RESTART;
if (action == VIR_DOMAIN_LIFECYCLE_CRASH_DESTROY) if (action == VIR_DOMAIN_LIFECYCLE_CRASH_DESTROY)
@ -180,7 +180,7 @@ createXenAPIBootOrderString(int nboot, int *bootDevs)
} }
/* convert boot order string to libvirt boot order enum */ /* convert boot order string to libvirt boot order enum */
enum virDomainBootOrder virDomainBootOrder
map2LibvirtBootOrder(char c) map2LibvirtBootOrder(char c)
{ {
switch (c) { switch (c) {
@ -197,10 +197,10 @@ map2LibvirtBootOrder(char c)
} }
} }
enum virDomainLifecycleAction virDomainLifecycleAction
xenapiNormalExitEnum2virDomainLifecycle(enum xen_on_normal_exit action) xenapiNormalExitEnum2virDomainLifecycle(enum xen_on_normal_exit action)
{ {
enum virDomainLifecycleAction num = VIR_DOMAIN_LIFECYCLE_RESTART; virDomainLifecycleAction num = VIR_DOMAIN_LIFECYCLE_RESTART;
if (action == XEN_ON_NORMAL_EXIT_DESTROY) if (action == XEN_ON_NORMAL_EXIT_DESTROY)
num = VIR_DOMAIN_LIFECYCLE_DESTROY; num = VIR_DOMAIN_LIFECYCLE_DESTROY;
else if (action == XEN_ON_NORMAL_EXIT_RESTART) else if (action == XEN_ON_NORMAL_EXIT_RESTART)
@ -209,10 +209,10 @@ xenapiNormalExitEnum2virDomainLifecycle(enum xen_on_normal_exit action)
} }
enum virDomainLifecycleCrashAction virDomainLifecycleCrashAction
xenapiCrashExitEnum2virDomainLifecycle(enum xen_on_crash_behaviour action) xenapiCrashExitEnum2virDomainLifecycle(enum xen_on_crash_behaviour action)
{ {
enum virDomainLifecycleCrashAction num = VIR_DOMAIN_LIFECYCLE_CRASH_RESTART; virDomainLifecycleCrashAction num = VIR_DOMAIN_LIFECYCLE_CRASH_RESTART;
if (action == XEN_ON_CRASH_BEHAVIOUR_DESTROY) if (action == XEN_ON_CRASH_BEHAVIOUR_DESTROY)
num = VIR_DOMAIN_LIFECYCLE_CRASH_DESTROY; num = VIR_DOMAIN_LIFECYCLE_CRASH_DESTROY;
else if (action == XEN_ON_CRASH_BEHAVIOUR_RESTART) else if (action == XEN_ON_CRASH_BEHAVIOUR_RESTART)

10
src/xenapi/xenapi_utils.h
View File

@ -43,20 +43,20 @@ int
xenapiUtil_ParseQuery(virConnectPtr conn, virURIPtr uri, int *noVerify); xenapiUtil_ParseQuery(virConnectPtr conn, virURIPtr uri, int *noVerify);
enum xen_on_normal_exit enum xen_on_normal_exit
actionShutdownLibvirt2XenapiEnum(enum virDomainLifecycleAction action); actionShutdownLibvirt2XenapiEnum(virDomainLifecycleAction action);
enum xen_on_crash_behaviour enum xen_on_crash_behaviour
actionCrashLibvirt2XenapiEnum(enum virDomainLifecycleCrashAction action); actionCrashLibvirt2XenapiEnum(virDomainLifecycleCrashAction action);
char * char *
createXenAPIBootOrderString(int nboot, int *bootDevs); createXenAPIBootOrderString(int nboot, int *bootDevs);
enum virDomainBootOrder map2LibvirtBootOrder(char c); virDomainBootOrder map2LibvirtBootOrder(char c);
enum virDomainLifecycleAction virDomainLifecycleAction
xenapiNormalExitEnum2virDomainLifecycle(enum xen_on_normal_exit action); xenapiNormalExitEnum2virDomainLifecycle(enum xen_on_normal_exit action);
enum virDomainLifecycleCrashAction virDomainLifecycleCrashAction
xenapiCrashExitEnum2virDomainLifecycle(enum xen_on_crash_behaviour action); xenapiCrashExitEnum2virDomainLifecycle(enum xen_on_crash_behaviour action);
void getCpuBitMapfromString(char *mask, unsigned char *cpumap, int maplen); void getCpuBitMapfromString(char *mask, unsigned char *cpumap, int maplen);