[libvirt] [PATCH 4/9] util: utility functions for virNetDevVPortProfile

[Laine Stump]

On 08/05/2012 01:16 AM, Laine Stump wrote:
> diff --git a/src/util/virnetdevvportprofile.c b/src/util/virnetdevvportprofile.c
> index 6db04f7..176190f 100644
> --- a/src/util/virnetdevvportprofile.c
> +++ b/src/util/virnetdevvportprofile.c
> [...]
> +int virNetDevVPortProfileMerge3(virNetDevVPortProfilePtr *result,
> +                                virNetDevVPortProfilePtr fromInterface,
> +                                virNetDevVPortProfilePtr fromNetwork,
> +                                virNetDevVPortProfilePtr fromPortgroup)
> +{
> +    int ret = -1;
> +    *result = NULL;
> +
> +    if ((!fromInterface || (fromInterface->virtPortType == VIR_NETDEV_VPORT_PROFILE_NONE)) &&
> +        (!fromNetwork   || (fromNetwork->virtPortType   == VIR_NETDEV_VPORT_PROFILE_NONE)) &&
> +        (!fromPortgroup || (fromPortgroup->virtPortType == VIR_NETDEV_VPORT_PROFILE_NONE))) {
> +        return ret;

Note that the above statement should be "return 0;" instead of "return
ret;". I've already squashed that fix into my local copy. (No matter how
long I wait to send patches, I always find something to fix after the fact.)