From f7d8aa44b06e5cfa06abea4a72ee26b13754667d Mon Sep 17 00:00:00 2001
From: Martin Kletzander <mkletzan@redhat.com>
Date: Fri, 26 Jun 2015 17:26:30 +0200
Subject: [PATCH] Revert "Change livbirt version to 1.3.0 for the next release"

This reverts commit 9a8d916e89173890d7f7ce538b1ab781192b8440.

Also some changes that were introduced after that commit are fixed to
use 1.2.17 instead of 1.3.0
---
 configure.ac              | 2 +-
 docs/formatdomain.html.in | 6 +++---
 src/libvirt_public.syms   | 2 +-
 src/vz/vz_driver.c        | 8 ++++----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index 93f9e383f0..f3ae6ca14f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@ dnl You should have received a copy of the GNU Lesser General Public
 dnl License along with this library.  If not, see
 dnl <http://www.gnu.org/licenses/>.
 
-AC_INIT([libvirt], [1.3.0], [libvir-list@redhat.com], [], [http://libvirt.org])
+AC_INIT([libvirt], [1.2.17], [libvir-list@redhat.com], [], [http://libvirt.org])
 AC_CONFIG_SRCDIR([src/libvirt.c])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_HEADERS([config.h])
diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index 0f5a41b9bd..ea2fff881c 100644
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -4315,7 +4315,7 @@ qemu-kvm -net nic,model=? /dev/null
         element.  Each queue will potentially be handled by a different
         processor, resulting in much higher throughput.
         <span class="since">virtio-net since 1.0.6 (QEMU and KVM only)</span>
-        <span class="since">vhost-user since 1.3.0 (QEMU and KVM only)</span>
+        <span class="since">vhost-user since 1.2.17 (QEMU and KVM only)</span>
       </dd>
       <dt><code>host</code> offloading options</dt>
       <dd>
@@ -5724,7 +5724,7 @@ qemu-kvm -net nic,model=? /dev/null
             emulating a PCI Intel 6300ESB </li>
           <li> 'ib700' &mdash; emulating an ISA iBase IB700 </li>
           <li> 'diag288' &mdash; emulating an S390 DIAG288 device
-            <span class="since">Since 1.3.0</span></li>
+            <span class="since">Since 1.2.17</span></li>
         </ul>
       </dd>
       <dt><code>action</code></dt>
@@ -5748,7 +5748,7 @@ qemu-kvm -net nic,model=? /dev/null
             <span class="since">Since 0.8.7</span></li>
           <li>'inject-nmi' &mdash; inject a non-maskable interrupt
             into the guest
-            <span class="since">Since 1.3.0</span></li>
+            <span class="since">Since 1.2.17</span></li>
         </ul>
         <p>
         Note 1: the 'shutdown' action requires that the guest
diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms
index 59d8c12202..2c653f2fcc 100644
--- a/src/libvirt_public.syms
+++ b/src/libvirt_public.syms
@@ -715,7 +715,7 @@ LIBVIRT_1.2.16 {
         virDomainSetUserPassword;
 } LIBVIRT_1.2.15;
 
-LIBVIRT_1.3.0 {
+LIBVIRT_1.2.17 {
     global:
         virTypedParamsAddStringList;
 } LIBVIRT_1.2.16;
diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c
index ddb7179307..47c502376e 100644
--- a/src/vz/vz_driver.c
+++ b/src/vz/vz_driver.c
@@ -1424,10 +1424,10 @@ static virHypervisorDriver vzDriver = {
     .domainManagedSave = vzDomainManagedSave, /* 1.2.14 */
     .domainManagedSaveRemove = vzDomainManagedSaveRemove, /* 1.2.14 */
     .domainGetMaxMemory = vzDomainGetMaxMemory, /* 1.2.15 */
-    .domainBlockStats = vzDomainBlockStats, /* 1.3.0 */
-    .domainBlockStatsFlags = vzDomainBlockStatsFlags, /* 1.3.0 */
-    .domainInterfaceStats = vzDomainInterfaceStats, /* 1.3.0 */
-    .domainMemoryStats = vzDomainMemoryStats, /* 1.3.0 */
+    .domainBlockStats = vzDomainBlockStats, /* 1.2.17 */
+    .domainBlockStatsFlags = vzDomainBlockStatsFlags, /* 1.2.17 */
+    .domainInterfaceStats = vzDomainInterfaceStats, /* 1.2.17 */
+    .domainMemoryStats = vzDomainMemoryStats, /* 1.2.17 */
 };
 
 static virConnectDriver vzConnectDriver = {
-- 
GitLab