[libvirt] [PATCH 1/3] vmx: Use the allocator virDomainChrDefNew

Pavel Hrdina phrdina at redhat.com
Fri Oct 21 16:01:30 UTC 2016


On Fri, Oct 21, 2016 at 09:01:42AM -0400, John Ferlan wrote:
> Rather than VIR_ALLOC of the virDomainChrDefPtr
> 
> Signed-off-by: John Ferlan <jferlan at redhat.com>
> ---
>  src/vmx/vmx.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c
> index fc4347f..f61c4d6 100644
> --- a/src/vmx/vmx.c
> +++ b/src/vmx/vmx.c
> @@ -2758,7 +2758,7 @@ virVMXParseSerial(virVMXContext *ctx, virConfPtr conf, int port,
>          return -1;
>      }
>  
> -    if (VIR_ALLOC(*def) < 0)
> +    if (!(*def = virDomainChrDefNew(NULL)))
>          return -1;
>  
>      (*def)->deviceType = VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL;
> @@ -2946,7 +2946,7 @@ virVMXParseParallel(virVMXContext *ctx, virConfPtr conf, int port,
>          return -1;
>      }
>  
> -    if (VIR_ALLOC(*def) < 0)
> +    if (!(*def = virDomainChrDefNew(NULL)))
>          return -1;
>  
>      (*def)->deviceType = VIR_DOMAIN_CHR_DEVICE_TYPE_PARALLEL;
> -- 

You've missed those two occurrences:
    src/conf/domain_conf.c:3876            if (VIR_ALLOC(def->consoles[0]) < 0)
    src/conf/domain_conf.c:3891        if (VIR_ALLOC(chr) < 0)

I've found those because virt-aa-helper-test was crashing after applying the
next patch.  Because this is a generic code for all drivers we need to pass
xmlopt to allocate the privateData.

Pavel
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 801 bytes
Desc: Digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20161021/fa9ca986/attachment-0001.sig>


More information about the libvir-list mailing list