[libvirt] [PATCH 2/2] conf: Improve error messages if parsing of vCPU count fails

[Peter Krempa]

On 01/22/13 16:07, John Ferlan wrote:
> On 01/22/2013 09:31 AM, Peter Krempa wrote:
>> ---
>>   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 3e95ec9..75450ad 100644
>> --- a/src/conf/domain_conf.c
>> +++ b/src/conf/domain_conf.c
>> @@ -9087,7 +9087,7 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps,
>>           def->maxvcpus = count;
>>           if (count == 0 || (unsigned short) count != count) {
>>               virReportError(VIR_ERR_XML_ERROR,
>> -                           _("invalid maxvcpus %lu"), count);
>> +                           _("invalid maximum number of vCPUs '%lu'"), count);
>>               goto error;
>>           }
>>       }
>> @@ -9103,13 +9103,14 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps,
>>           def->vcpus = count;
>>           if (count == 0 || (unsigned short) count != count) {
>>               virReportError(VIR_ERR_XML_ERROR,
>> -                           _("invalid current vcpus %lu"), count);
>> +                           _("invalid current number of vCPUs ;%lu'"), count);
>
> s/;%lu/'%lu
>
>>               goto error;
>>           }
>>
>>           if (def->maxvcpus < count) {
>>               virReportError(VIR_ERR_INTERNAL_ERROR,
>> -                           _("maxvcpus must not be less than current vcpus (%d < %lu)"),
>> +                           _("maxvcpus must not be less than current vcpus "
>> +                             "(%d < %lu)"),
>>                              def->maxvcpus, count);
>>               goto error;
>>           }
>>
>
> ACK with the change

Bah, right. Thanks for the review.

Peter