[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [libvirt] [PATCH] Fix --with-xen-proxy related compile error



On 07/29/10 - 04:07:08PM, Matthias Bolte wrote:
> Move virDomainChrTargetTypeToString out of the #ifndef PROXY
> block, because it's used outside of it.
> ---
>  src/conf/domain_conf.c |   40 ++++++++++++++++++++--------------------
>  1 files changed, 20 insertions(+), 20 deletions(-)
> 
> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
> index 82e5ce7..883c682 100644
> --- a/src/conf/domain_conf.c
> +++ b/src/conf/domain_conf.c
> @@ -2441,26 +2441,6 @@ out:
>      return ret;
>  }
>  
> -static const char *
> -virDomainChrTargetTypeToString(int deviceType,
> -                               int targetType)
> -{
> -    const char *type = NULL;
> -
> -    switch (deviceType) {
> -    case VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL:
> -        type = virDomainChrChannelTargetTypeToString(targetType);
> -        break;
> -    case VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE:
> -        type = virDomainChrConsoleTargetTypeToString(targetType);
> -        break;
> -    default:
> -        break;
> -    }
> -
> -    return type;
> -}
> -
>  static int
>  virDomainChrDefParseTargetXML(virCapsPtr caps,
>                                virDomainChrDefPtr def,
> @@ -3952,6 +3932,26 @@ virDomainDeviceDefPtr virDomainDeviceDefParse(virCapsPtr caps,
>  #endif /* !PROXY */
>  
>  
> +static const char *
> +virDomainChrTargetTypeToString(int deviceType,
> +                               int targetType)
> +{
> +    const char *type = NULL;
> +
> +    switch (deviceType) {
> +    case VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL:
> +        type = virDomainChrChannelTargetTypeToString(targetType);
> +        break;
> +    case VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE:
> +        type = virDomainChrConsoleTargetTypeToString(targetType);
> +        break;
> +    default:
> +        break;
> +    }
> +
> +    return type;
> +}
> +
>  static void
>  virVirtualPortProfileFormat(virBufferPtr buf,
>                              virVirtualPortProfileParamsPtr virtPort,

Makes sense to me, ACK

--
Chris Lalancette


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]