[libvirt] [PATCH 05/11] domain: Convert os.type to VIR_DOMAIN_OSTYPE enum

[Michal Privoznik]

On 18.04.2015 03:45, Cole Robinson wrote:
> ---
>  src/conf/capabilities.c          |  55 ++++---------------
>  src/conf/capabilities.h          |  10 ++--
>  src/conf/domain_audit.c          |   2 +-
>  src/conf/domain_conf.c           | 115 +++++++++++++++++++--------------------
>  src/conf/domain_conf.h           |   2 +-
>  src/hyperv/hyperv_driver.c       |   4 +-
>  src/libvirt_private.syms         |   2 +
>  src/libxl/libxl_conf.c           |  10 ++--
>  src/libxl/libxl_domain.c         |   6 +-
>  src/libxl/libxl_driver.c         |   2 +-
>  src/lxc/lxc_driver.c             |   2 +-
>  src/lxc/lxc_native.c             |   4 +-
>  src/openvz/openvz_conf.c         |   3 +-
>  src/openvz/openvz_driver.c       |   4 +-
>  src/parallels/parallels_driver.c |   8 +--
>  src/parallels/parallels_sdk.c    |   6 +-
>  src/parallels/parallels_utils.h  |   2 +-
>  src/phyp/phyp_driver.c           |   3 +-
>  src/qemu/qemu_capabilities.c     |   2 +-
>  src/qemu/qemu_command.c          |  10 ++--
>  src/qemu/qemu_driver.c           |   2 +-
>  src/uml/uml_driver.c             |   2 +-
>  src/vbox/vbox_common.c           |  15 ++---
>  src/vmware/vmware_driver.c       |   2 +-
>  src/vmx/vmx.c                    |   3 +-
>  src/xen/xen_driver.c             |   2 +-
>  src/xen/xend_internal.c          |   6 +-
>  src/xenapi/xenapi_driver.c       |  12 +---
>  src/xenapi/xenapi_utils.c        |   4 +-
>  src/xenconfig/xen_common.c       |  29 +++++-----
>  src/xenconfig/xen_sxpr.c         |   5 +-
>  src/xenconfig/xen_xl.c           |  15 ++---
>  src/xenconfig/xen_xm.c           |  12 ++--
>  tests/openvzutilstest.c          |   2 +-
>  34 files changed, 152 insertions(+), 211 deletions(-)
> 

> diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
> index 8c37303..a587597 100644
> --- a/src/libvirt_private.syms
> +++ b/src/libvirt_private.syms
> @@ -400,6 +400,8 @@ virDomainObjSetDefTransient;
>  virDomainObjSetMetadata;
>  virDomainObjSetState;
>  virDomainObjTaint;
> +virDomainOSTypeFromString;
> +virDomainOSTypeToString;
>  virDomainParseMemory;
>  virDomainPausedReasonTypeFromString;
>  virDomainPausedReasonTypeToString;

See? This should have been in one of the previous patches.

> diff --git a/src/parallels/parallels_driver.c b/src/parallels/parallels_driver.c
> index d80fe24..f7a75e0 100644
> --- a/src/parallels/parallels_driver.c
> +++ b/src/parallels/parallels_driver.c
> @@ -184,7 +184,7 @@ parallelsDomainDeviceDefPostParse(virDomainDeviceDefPtr dev,
>          (dev->data.net->type == VIR_DOMAIN_NET_TYPE_NETWORK ||
>           dev->data.net->type == VIR_DOMAIN_NET_TYPE_BRIDGE) &&
>          !dev->data.net->model &&
> -        STREQ(def->os.type, "hvm") &&
> +        def->os.type == VIR_DOMAIN_OSTYPE_HVM &&
>          VIR_STRDUP(dev->data.net->model, "e1000") < 0)
>          goto cleanup;
>  
> @@ -575,7 +575,7 @@ parallelsDomainGetOSType(virDomainPtr domain)
>          goto cleanup;
>      }
>  
> -    ignore_value(VIR_STRDUP(ret, privdom->def->os.type));
> +    ignore_value(VIR_STRDUP(ret, virDomainOSTypeToString(privdom->def->os.type)));
>  
>   cleanup:
>      if (privdom)

This part is missing:

diff --git a/src/parallels/parallels_driver.c
b/src/parallels/parallels_driver.c
index f7a75e0..a654861 100644
--- a/src/parallels/parallels_driver.c
+++ b/src/parallels/parallels_driver.c
@@ -720,7 +720,8 @@ parallelsDomainDefineXMLFlags(virConnectPtr conn,
const char *xml, unsigned int
                 goto cleanup;
         } else {
             virReportError(VIR_ERR_INVALID_ARG,
-                           _("Unsupported OS type: %s"), def->os.type);
+                           _("Unsupported OS type: %s"),
+                           virDomainOSTypeToString(def->os.type));
             goto cleanup;
         }

Michal