提交 f7d8aa44 编写于 作者: M Martin Kletzander 提交者: Daniel Veillard

Revert "Change livbirt version to 1.3.0 for the next release"

This reverts commit 9a8d916e.

Also some changes that were introduced after that commit are fixed to
use 1.2.17 instead of 1.3.0
上级 1bcc88bb
...@@ -16,7 +16,7 @@ dnl You should have received a copy of the GNU Lesser General Public ...@@ -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 License along with this library. If not, see
dnl <http://www.gnu.org/licenses/>. 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_SRCDIR([src/libvirt.c])
AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_HEADERS([config.h]) AC_CONFIG_HEADERS([config.h])
......
...@@ -4315,7 +4315,7 @@ qemu-kvm -net nic,model=? /dev/null ...@@ -4315,7 +4315,7 @@ qemu-kvm -net nic,model=? /dev/null
element. Each queue will potentially be handled by a different element. Each queue will potentially be handled by a different
processor, resulting in much higher throughput. processor, resulting in much higher throughput.
<span class="since">virtio-net since 1.0.6 (QEMU and KVM only)</span> <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> </dd>
<dt><code>host</code> offloading options</dt> <dt><code>host</code> offloading options</dt>
<dd> <dd>
...@@ -5724,7 +5724,7 @@ qemu-kvm -net nic,model=? /dev/null ...@@ -5724,7 +5724,7 @@ qemu-kvm -net nic,model=? /dev/null
emulating a PCI Intel 6300ESB </li> emulating a PCI Intel 6300ESB </li>
<li> 'ib700' &mdash; emulating an ISA iBase IB700 </li> <li> 'ib700' &mdash; emulating an ISA iBase IB700 </li>
<li> 'diag288' &mdash; emulating an S390 DIAG288 device <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> </ul>
</dd> </dd>
<dt><code>action</code></dt> <dt><code>action</code></dt>
...@@ -5748,7 +5748,7 @@ qemu-kvm -net nic,model=? /dev/null ...@@ -5748,7 +5748,7 @@ qemu-kvm -net nic,model=? /dev/null
<span class="since">Since 0.8.7</span></li> <span class="since">Since 0.8.7</span></li>
<li>'inject-nmi' &mdash; inject a non-maskable interrupt <li>'inject-nmi' &mdash; inject a non-maskable interrupt
into the guest into the guest
<span class="since">Since 1.3.0</span></li> <span class="since">Since 1.2.17</span></li>
</ul> </ul>
<p> <p>
Note 1: the 'shutdown' action requires that the guest Note 1: the 'shutdown' action requires that the guest
......
...@@ -715,7 +715,7 @@ LIBVIRT_1.2.16 { ...@@ -715,7 +715,7 @@ LIBVIRT_1.2.16 {
virDomainSetUserPassword; virDomainSetUserPassword;
} LIBVIRT_1.2.15; } LIBVIRT_1.2.15;
LIBVIRT_1.3.0 { LIBVIRT_1.2.17 {
global: global:
virTypedParamsAddStringList; virTypedParamsAddStringList;
} LIBVIRT_1.2.16; } LIBVIRT_1.2.16;
......
...@@ -1424,10 +1424,10 @@ static virHypervisorDriver vzDriver = { ...@@ -1424,10 +1424,10 @@ static virHypervisorDriver vzDriver = {
.domainManagedSave = vzDomainManagedSave, /* 1.2.14 */ .domainManagedSave = vzDomainManagedSave, /* 1.2.14 */
.domainManagedSaveRemove = vzDomainManagedSaveRemove, /* 1.2.14 */ .domainManagedSaveRemove = vzDomainManagedSaveRemove, /* 1.2.14 */
.domainGetMaxMemory = vzDomainGetMaxMemory, /* 1.2.15 */ .domainGetMaxMemory = vzDomainGetMaxMemory, /* 1.2.15 */
.domainBlockStats = vzDomainBlockStats, /* 1.3.0 */ .domainBlockStats = vzDomainBlockStats, /* 1.2.17 */
.domainBlockStatsFlags = vzDomainBlockStatsFlags, /* 1.3.0 */ .domainBlockStatsFlags = vzDomainBlockStatsFlags, /* 1.2.17 */
.domainInterfaceStats = vzDomainInterfaceStats, /* 1.3.0 */ .domainInterfaceStats = vzDomainInterfaceStats, /* 1.2.17 */
.domainMemoryStats = vzDomainMemoryStats, /* 1.3.0 */ .domainMemoryStats = vzDomainMemoryStats, /* 1.2.17 */
}; };
static virConnectDriver vzConnectDriver = { static virConnectDriver vzConnectDriver = {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册