[libvirt] [PATCHv2] Fix virDomainChrEquals for spicevmc

[Pavel Hrdina]

On 11/11/2014 12:23 PM, Ján Tomko wrote:
> virDomainChrSourceDefIsEqual should return 'true' for
> identical SPICEVMC chardevs, and those that have no source
> specification.
>
> After this change, a failed hotplug no longer leaves a stale
> pointer in the domain definition.
>
> https://bugzilla.redhat.com/show_bug.cgi?id=1162097
> ---
>   src/conf/domain_conf.c | 7 ++++---
>   1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
> index 54b2bfe..73b2393 100644
> --- a/src/conf/domain_conf.c
> +++ b/src/conf/domain_conf.c
> @@ -1591,13 +1591,14 @@ virDomainChrSourceDefIsEqual(const virDomainChrSourceDef *src,
>                                 tgt->data.spiceport.channel);
>           break;
>
> +    case VIR_DOMAIN_CHR_TYPE_SPICEVMC:
> +        return src->data.spicevmc == tgt->data.spicevmc;
> +
>       case VIR_DOMAIN_CHR_TYPE_NULL:
>       case VIR_DOMAIN_CHR_TYPE_VC:
>       case VIR_DOMAIN_CHR_TYPE_STDIO:
> -    case VIR_DOMAIN_CHR_TYPE_SPICEVMC:
>       case VIR_DOMAIN_CHR_TYPE_LAST:
> -        /* nada */
> -        break;
> +        return true;
>       }
>
>       return false;
>

ACK,

Pavel