[libvirt] [PATCH 05/12] qemu: domain: split out post parse default device handling

[Peter Krempa]

On Thu, Jan 07, 2016 at 22:49:59 -0500, Cole Robinson wrote:
> Should be a no-op
> ---
>  src/qemu/qemu_domain.c | 53 +++++++++++++++++++++++++++++++-------------------
>  1 file changed, 33 insertions(+), 20 deletions(-)
> 
> diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
> index bb8d47f..26a29b1 100644
> --- a/src/qemu/qemu_domain.c
> +++ b/src/qemu/qemu_domain.c
> @@ -1025,14 +1025,10 @@ virDomainXMLNamespace virQEMUDriverDomainXMLNamespace = {
>      .href = qemuDomainDefNamespaceHref,
>  };
>  
> -

This creates wrong spacing ...

>  static int
> -qemuDomainDefPostParse(virDomainDefPtr def,
> -                       virCapsPtr caps,
> -                       void *opaque)
> +qemuDomainDefAddDefaultDevices(virDomainDefPtr def,
> +                               virQEMUCapsPtr qemuCaps)
>  {
> -    virQEMUDriverPtr driver = opaque;
> -    virQEMUCapsPtr qemuCaps = NULL;
>      bool addDefaultUSB = true;
>      bool addImplicitSATA = false;
>      bool addPCIRoot = false;

[...]

> @@ -1212,6 +1194,37 @@ qemuDomainDefPostParse(virDomainDefPtr def,
>  
>      ret = 0;
>   cleanup:
> +    return ret;
> +}
> +
> +

While here you add correct one ...

> +static int
> +qemuDomainDefPostParse(virDomainDefPtr def,
> +                       virCapsPtr caps,

[...]

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