From: Ilja Livenson <ilja.livenson@gmail.com>
Date: Wed, 4 Apr 2012 20:30:43 +0000 (-0600)
Subject: openvz: support vzctl 3.1
X-Git-Tag: v0.9.12-rc1~133
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=37075dfe6ccdb5a257cdd64194b5fdd51458fa8b;p=thirdparty%2Flibvirt.git

openvz: support vzctl 3.1

https://bugzilla.redhat.com/show_bug.cgi?id=809895

Basically, openvz dropped strict version numbering (3.1 vs 3.1.0),
which caused parsing to fail.
---

diff --git a/AUTHORS b/AUTHORS
index 33154400a2..2077306c29 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -228,6 +228,7 @@ Patches have also been contributed by:
   Li Zhang             <zhlcindy@linux.vnet.ibm.com>
   Stef Walter          <stefw@gnome.org>
   Christian Benvenuti  <benve@cisco.com>
+  Ilja Livenson        <ilja.livenson@gmail.com>
 
   [....send patches to get your name here....]
 
diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c
index 28f86ff2d9..5848ec4edd 100644
--- a/src/openvz/openvz_conf.c
+++ b/src/openvz/openvz_conf.c
@@ -1,7 +1,7 @@
 /*
  * openvz_conf.c: config functions for managing OpenVZ VEs
  *
- * Copyright (C) 2010-2011 Red Hat, Inc.
+ * Copyright (C) 2010-2012 Red Hat, Inc.
  * Copyright (C) 2006, 2007 Binary Karma
  * Copyright (C) 2006 Shuveb Hussain
  * Copyright (C) 2007 Anoop Joe Cyriac
@@ -99,7 +99,7 @@ openvzExtractVersionInfo(const char *cmdstr, int *retversion)
     if ((tmp = STRSKIP(tmp, "vzctl version ")) == NULL)
         goto cleanup;
 
-    if (virParseVersionString(tmp, &version, false) < 0)
+    if (virParseVersionString(tmp, &version, true) < 0)
         goto cleanup;
 
     if (retversion)