[libvirt] [PATCH 05/34] conf: Use local copy of maxvcpus in virDomainVcpuParse

[John Ferlan]

On 11/20/2015 10:21 AM, Peter Krempa wrote:
> Use the local variable rather than getting it all the time from the
> struct. This will simplify further refactors.
> ---
>  src/conf/domain_conf.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
> index 0ac7dbf..3c8a926 100644
> --- a/src/conf/domain_conf.c
> +++ b/src/conf/domain_conf.c
> @@ -14664,13 +14664,13 @@ virDomainVcpuParse(virDomainDefPtr def,
>              goto cleanup;
>          }
> 
> -        def->vcpus = def->maxvcpus;
> +        def->vcpus = maxvcpus;

There is no local maxvcpus (yet) and this breaks git bisect.

ACK 1-5 with this fixed

John
>      }
> 
> -    if (def->maxvcpus < def->vcpus) {
> +    if (maxvcpus < def->vcpus) {
>          virReportError(VIR_ERR_INTERNAL_ERROR,
>                         _("maxvcpus must not be less than current vcpus "
> -                         "(%u < %u)"), def->maxvcpus, def->vcpus);
> +                         "(%u < %u)"), maxvcpus, def->vcpus);
>          goto cleanup;
>      }
>