[libvirt] [PATCH] OpenVZ: accept NULL as type for GetMaxVCPUs.
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@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); -- 1.6.0.6
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@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 Daniel -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|
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@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
participants (2)
-
Chris Lalancette -
Daniel P. Berrange