[libvirt] [PATCH] OpenVZ: accept NULL as type for GetMaxVCPUs.

Chris Lalancette clalance at redhat.com
Mon Aug 31 19:03:57 UTC 2009


Daniel P. Berrange wrote:
> On Fri, Aug 28, 2009 at 04:56:08PM +0200, Chris Lalancette wrote:
>> All of the other drivers that support the getMaxVcpus callback
>> also accept a NULL value for type.  Make openvz also accept a
>> NULL value.
>>
>> Signed-off-by: Chris Lalancette <clalance at redhat.com>
>> ---
>>  src/openvz_driver.c |    7 ++++---
>>  1 files changed, 4 insertions(+), 3 deletions(-)
>>
>> diff --git a/src/openvz_driver.c b/src/openvz_driver.c
>> index 6b7c49d..43d54f9 100644
>> --- a/src/openvz_driver.c
>> +++ b/src/openvz_driver.c
>> @@ -1000,9 +1000,10 @@ cleanup:
>>      return ret;
>>  }
>>  
>> -static int openvzGetMaxVCPUs(virConnectPtr conn, const char *type) {
>> -    if (STRCASEEQ(type, "openvz"))
>> -        return 1028; //OpenVZ has no limitation
>> +static int openvzGetMaxVCPUs(virConnectPtr conn, const char *type)
>> +{
>> +    if (type == NULL || STRCASEEQ(type, "openvz"))
>> +        return 1028; /* OpenVZ has no limitation */
>>  
>>      openvzError(conn, VIR_ERR_INVALID_ARG,
>>                       _("unknown type '%s'"), type);
> 
> ACK

Committed.

-- 
Chris Lalancette




More information about the libvir-list mailing list