[libvirt] [PATCH 3/6] conf: domain: Improve vcpus validation reporting

[Daniel P. Berrange]

On Mon, Nov 22, 2010 at 04:35:31PM -0500, Cole Robinson wrote:
> 
> Signed-off-by: Cole Robinson <crobinso at redhat.com>
> ---
>  src/conf/domain_conf.c |   11 +++++++++--
>  1 files changed, 9 insertions(+), 2 deletions(-)
> 
> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
> index 11a6280..045934d 100644
> --- a/src/conf/domain_conf.c
> +++ b/src/conf/domain_conf.c
> @@ -4569,7 +4569,7 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps,
>          def->maxvcpus = 1;
>      } else {
>          def->maxvcpus = count;
> -        if (def->maxvcpus != count || count == 0) {
> +        if (count == 0) {
>              virDomainReportError(VIR_ERR_XML_ERROR,
>                                   _("invalid maxvcpus %lu"), count);
>              goto error;
> @@ -4585,11 +4585,18 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps,
>          def->vcpus = def->maxvcpus;
>      } else {
>          def->vcpus = count;
> -        if (def->vcpus != count || count == 0 || def->maxvcpus < count) {
> +        if (count == 0) {
>              virDomainReportError(VIR_ERR_XML_ERROR,
>                                   _("invalid current vcpus %lu"), count);
>              goto error;
>          }
> +
> +        if (def->maxvcpus < count) {
> +            virDomainReportError(VIR_ERR_INTERNAL_ERROR,
> +                _("maxvcpus must not be less than current vcpus (%d < %lu)"),
> +                def->maxvcpus, count);
> +            goto error;
> +        }
>      }


ACK