New upstream version 2.4.0~rc1

9 files changed, 406 insertions, 97 deletions

diff --git a/docs/Makefile.am b/docs/Makefile.am
index 14aad8347..fabae0306 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -16,11 +16,6 @@
 ## License along with this library.  If not, see
 ## <http://www.gnu.org/licenses/>.
 
-PERL = perl
-
-# The directory containing the source code (if it contains documentation).
-DOC_SOURCE_DIR=../src
-
 DEVHELP_DIR=$(datadir)/gtk-doc/html/libvirt
 
 apihtml =					\
@@ -101,9 +96,11 @@ internals_html = $(internals_html_in:%.html.in=%.html)
 # For all other files, since we ship pre-built html in the
 # tarball, we must also ship the sources, even when those
 # sources are themselves generated.
-dot_html_in = $(notdir $(wildcard $(srcdir)/*.html.in)) \
+# Generate hvsupport.html first, since it takes one extra step.
+dot_html_in = \
+  hvsupport.html.in \
   todo.html.in \
-  hvsupport.html.in
+  $(notdir $(wildcard $(srcdir)/*.html.in))
 dot_html = $(dot_html_in:%.html.in=%.html)
 
 dot_php_in = $(notdir $(wildcard $(srcdir)/*.php.in))
diff --git a/docs/Makefile.in b/docs/Makefile.in
index af2e457ed..a7e585bc0 100644
--- a/docs/Makefile.in
+++ b/docs/Makefile.in
@@ -1393,7 +1393,7 @@ PARTED = @PARTED@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
 PCIACCESS_LIBS = @PCIACCESS_LIBS@
-PERL = perl
+PERL = @PERL@
 PIE_CFLAGS = @PIE_CFLAGS@
 PIE_LDFLAGS = @PIE_LDFLAGS@
 PKCHECK_PATH = @PKCHECK_PATH@
@@ -1764,7 +1764,6 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-plugindir = @plugindir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -1777,9 +1776,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-
-# The directory containing the source code (if it contains documentation).
-DOC_SOURCE_DIR = ../src
+ws_plugindir = @ws_plugindir@
 DEVHELP_DIR = $(datadir)/gtk-doc/html/libvirt
 apihtml = \
   html/index.html				\
@@ -1857,9 +1854,11 @@ internals_html = $(internals_html_in:%.html.in=%.html)
 # For all other files, since we ship pre-built html in the
 # tarball, we must also ship the sources, even when those
 # sources are themselves generated.
-dot_html_in = $(notdir $(wildcard $(srcdir)/*.html.in)) \
+# Generate hvsupport.html first, since it takes one extra step.
+dot_html_in = \
+  hvsupport.html.in \
   todo.html.in \
-  hvsupport.html.in
+  $(notdir $(wildcard $(srcdir)/*.html.in))
 
 dot_html = $(dot_html_in:%.html.in=%.html)
 dot_php_in = $(notdir $(wildcard $(srcdir)/*.php.in))
diff --git a/docs/apps.html b/docs/apps.html
index e9a427199..3b470e771 100644
--- a/docs/apps.html
+++ b/docs/apps.html
@@ -372,6 +372,12 @@
         You can use this tool to either set up a new Nagios installation for
         your Xen or QEMU/KVM guests, or to integrate with your existing Nagios
         installation.
+      </dd><dt><a href="http://www.pcp.io/man/man1/pmdalibvirt.1.html" shape="rect">PCP</a></dt><dd>
+        The PCP libvirt PMDA (plugin) is part of the
+        <a href="http://pcp.io/" shape="rect">PCP</a> toolkit and provides
+        hypervisor and guest information and complete set of guest performance
+        metrics. It supports pCPU, vCPU, memory, block device, network interface,
+        and performance event metrics for each virtual guest.
       </dd><dt><a href="http://community.zenoss.org/docs/DOC-4687" shape="rect">Zenoss</a></dt><dd>
         The Zenoss libvirt Zenpack adds support for monitoring virtualization
         servers.  It has been tested with KVM, QEMU, VMware ESX, and VMware
diff --git a/docs/apps.html.in b/docs/apps.html.in
index 1a6fd3f43..1a138b3a1 100644
--- a/docs/apps.html.in
+++ b/docs/apps.html.in
@@ -351,6 +351,14 @@
         your Xen or QEMU/KVM guests, or to integrate with your existing Nagios
         installation.
       </dd>
+      <dt><a href="http://www.pcp.io/man/man1/pmdalibvirt.1.html" shape="rect">PCP</a></dt>
+      <dd>
+        The PCP libvirt PMDA (plugin) is part of the
+        <a href="http://pcp.io/" shape="rect">PCP</a> toolkit and provides
+        hypervisor and guest information and complete set of guest performance
+        metrics. It supports pCPU, vCPU, memory, block device, network interface,
+        and performance event metrics for each virtual guest.
+      </dd>
       <dt><a href="http://community.zenoss.org/docs/DOC-4687">Zenoss</a></dt>
       <dd>
         The Zenoss libvirt Zenpack adds support for monitoring virtualization
diff --git a/docs/formatdomain.html b/docs/formatdomain.html
index 0e938a671..1f1fdf037 100644
--- a/docs/formatdomain.html
+++ b/docs/formatdomain.html
@@ -1832,7 +1832,7 @@
   &lt;/perf&gt;
   ...
 </pre>
-        <table class="top_table"><tr><th rowspan="1" colspan="1">event name</th><th rowspan="1" colspan="1">Description</th><th rowspan="1" colspan="1">stats parameter name</th></tr><tr><td rowspan="1" colspan="1"><code>cmt</code></td><td rowspan="1" colspan="1">usage of l3 cache in bytes by applications running on the platform</td><td rowspan="1" colspan="1"><code>perf.cmt</code></td></tr><tr><td rowspan="1" colspan="1"><code>mbmt</code></td><td rowspan="1" colspan="1">total system bandwidth from one level of cache</td><td rowspan="1" colspan="1"><code>perf.mbmt</code></td></tr><tr><td rowspan="1" colspan="1"><code>mbml</code></td><td rowspan="1" colspan="1">bandwidth of memory traffic for a memory controller</td><td rowspan="1" colspan="1"><code>perf.mbml</code></td></tr><tr><td rowspan="1" colspan="1"><code>cpu_cycles</code></td><td rowspan="1" colspan="1">the number of cpu cycles one instruction needs</td><td rowspan="1" colspan="1"><code>perf.cpu_cycles</code></td></tr><tr><td rowspan="1" colspan="1"><code>instructions</code></td><td rowspan="1" colspan="1">the count of instructions by applications running on the platform</td><td rowspan="1" colspan="1"><code>perf.instructions</code></td></tr><tr><td rowspan="1" colspan="1"><code>cache_references</code></td><td rowspan="1" colspan="1">the count of cache hits by applications running on the platform</td><td rowspan="1" colspan="1"><code>perf.cache_references</code></td></tr><tr><td rowspan="1" colspan="1"><code>cache_misses</code></td><td rowspan="1" colspan="1">the count of cache misses by applications running on the platform</td><td rowspan="1" colspan="1"><code>perf.cache_misses</code></td></tr></table>
+        <table class="top_table"><tr><th rowspan="1" colspan="1">event name</th><th rowspan="1" colspan="1">Description</th><th rowspan="1" colspan="1">stats parameter name</th></tr><tr><td rowspan="1" colspan="1"><code>cmt</code></td><td rowspan="1" colspan="1">usage of l3 cache in bytes by applications running on the platform</td><td rowspan="1" colspan="1"><code>perf.cmt</code></td></tr><tr><td rowspan="1" colspan="1"><code>mbmt</code></td><td rowspan="1" colspan="1">total system bandwidth from one level of cache</td><td rowspan="1" colspan="1"><code>perf.mbmt</code></td></tr><tr><td rowspan="1" colspan="1"><code>mbml</code></td><td rowspan="1" colspan="1">bandwidth of memory traffic for a memory controller</td><td rowspan="1" colspan="1"><code>perf.mbml</code></td></tr><tr><td rowspan="1" colspan="1"><code>cpu_cycles</code></td><td rowspan="1" colspan="1">the count of cpu cycles (total/elapsed)</td><td rowspan="1" colspan="1"><code>perf.cpu_cycles</code></td></tr><tr><td rowspan="1" colspan="1"><code>instructions</code></td><td rowspan="1" colspan="1">the count of instructions by applications running on the platform</td><td rowspan="1" colspan="1"><code>perf.instructions</code></td></tr><tr><td rowspan="1" colspan="1"><code>cache_references</code></td><td rowspan="1" colspan="1">the count of cache hits by applications running on the platform</td><td rowspan="1" colspan="1"><code>perf.cache_references</code></td></tr><tr><td rowspan="1" colspan="1"><code>cache_misses</code></td><td rowspan="1" colspan="1">the count of cache misses by applications running on the platform</td><td rowspan="1" colspan="1"><code>perf.cache_misses</code></td></tr></table>
         <h3>
           <a name="elementsDevices" shape="rect" id="elementsDevices">Devices</a>
           <a class="headerlink" href="#elementsDevices" title="Permalink to this headline">¶</a>
@@ -2343,7 +2343,33 @@
             or <code>write_iops_sec_max</code>.</dd><dt><code>read_iops_sec_max</code></dt><dd>The optional <code>read_iops_sec_max</code> element is the
             maximum read I/O operations per second.</dd><dt><code>write_iops_sec_max</code></dt><dd>The optional <code>write_iops_sec_max</code> element is the
             maximum write I/O operations per second.</dd><dt><code>size_iops_sec</code></dt><dd>The optional <code>size_iops_sec</code> element is the
-            size of I/O operations per second.</dd></dl>
+            size of I/O operations per second.
+          <p>
+            <span class="since">Throughput limits since 1.2.11 and QEMU 1.7</span>
+          </p>
+          </dd><dt><code>total_bytes_sec_max_length</code></dt><dd>The optional <code>total_bytes_sec_max_length</code>
+            element is the maximum duration in seconds for the
+            <code>total_bytes_sec_max</code> burst period. Only valid
+            when the <code>total_bytes_sec_max</code> is set.</dd><dt><code>read_bytes_sec_max_length</code></dt><dd>The optional <code>read_bytes_sec_max_length</code>
+            element is the maximum duration in seconds for the
+            <code>read_bytes_sec_max</code> burst period. Only valid
+            when the <code>read_bytes_sec_max</code> is set.</dd><dt><code>write_bytes_sec_max</code></dt><dd>The optional <code>write_bytes_sec_max_length</code>
+            element is the maximum duration in seconds for the
+            <code>write_bytes_sec_max</code> burst period. Only valid
+            when the <code>write_bytes_sec_max</code> is set.</dd><dt><code>total_iops_sec_max_length</code></dt><dd>The optional <code>total_iops_sec_max_length</code>
+            element is the maximum duration in seconds for the
+            <code>total_iops_sec_max</code> burst period. Only valid
+            when the <code>total_iops_sec_max</code> is set.</dd><dt><code>read_iops_sec_max_length</code></dt><dd>The optional <code>read_iops_sec_max_length</code>
+            element is the maximum duration in seconds for the
+            <code>read_iops_sec_max</code> burst period. Only valid
+            when the <code>read_iops_sec_max</code> is set.</dd><dt><code>write_iops_sec_max</code></dt><dd>The optional <code>write_iops_sec_max_length</code>
+            element is the maximum duration in seconds for the
+            <code>write_iops_sec_max</code> burst period. Only valid
+            when the <code>write_iops_sec_max</code> is set.
+          <p>
+            <span class="since">Throughput length since 2.4.0 and QEMU 2.6</span>
+          </p>
+          </dd></dl>
       </dd><dt><code>driver</code></dt><dd>
         The optional driver element allows specifying further details
         related to the hypervisor driver used to provide the disk.
@@ -5022,7 +5048,8 @@ qemu-kvm -net nic,model=? /dev/null
           video device in domain xml is the primary one, but the optional
           attribute <code>primary</code> (<span class="since">since 1.0.2</span>)
           with value 'yes' can be used to mark the primary in cases of multiple
-          video device. The non-primary must be type of "qxl".
+          video device. The non-primary must be type of "qxl" or
+          (<span class="since">since 2.4.0</span>) "virtio".
         </p>
       </dd><dt><code>model</code></dt><dd>
         <p>
@@ -5534,6 +5561,33 @@ qemu-kvm -net nic,model=? /dev/null
     &lt;/serial&gt;
   &lt;/devices&gt;
   ...</pre>
+        <p>
+      <span class="since">Since 2.4.0,</span> the optional attribute
+      <code>tls</code> can be used to control whether a chardev
+      TCP communication channel would utilize a hypervisor configured
+      TLS X.509 certificate environment in order to encrypt the data
+      channel. For the QEMU hypervisor, usage of a TLS environment can
+      be controlled on the host by the <code>chardev_tls</code> and
+      <code>chardev_tls_x509_cert_dir</code> or
+      <code>default_tls_x509_cert_dir</code> settings in the file
+      /etc/libvirt/qemu.conf. If <code>chardev_tls</code> is enabled,
+      then unless the <code>tls</code> attribute is set to "no", libvirt
+      will use the host configured TLS environment.
+      If <code>chardev_tls</code> is disabled, but the <code>tls</code>
+      attribute is set to "yes", then libvirt will attempt to use the
+      host TLS environment if either the <code>chardev_tls_x509_cert_dir</code>
+      or <code>default_tls_x509_cert_dir</code> TLS directory structure exists.
+    </p>
+        <pre xml:space="preserve">
+  ...
+  &lt;devices&gt;
+    &lt;serial type="tcp"&gt;
+      &lt;source mode='connect' host="127.0.0.1" service="5555" tls="yes"/&gt;
+      &lt;protocol type="raw"/&gt;
+      &lt;target port="0"/&gt;
+    &lt;/serial&gt;
+  &lt;/devices&gt;
+  ...</pre>
         <h6>
           <a name="elementsCharUDP" shape="rect" id="elementsCharUDP">UDP network console</a>
           <a class="headerlink" href="#elementsCharUDP" title="Permalink to this headline">¶</a>
diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index 1266e9d16..c70377ba4 100644
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -1954,7 +1954,7 @@
     </tr>
     <tr>
       <td><code>cpu_cycles</code></td>
-      <td>the number of cpu cycles one instruction needs</td>
+      <td>the count of cpu cycles (total/elapsed)</td>
       <td><code>perf.cpu_cycles</code></td>
     </tr>
     <tr>
@@ -2617,7 +2617,45 @@
             maximum write I/O operations per second.</dd>
           <dt><code>size_iops_sec</code></dt>
           <dd>The optional <code>size_iops_sec</code> element is the
-            size of I/O operations per second.</dd>
+            size of I/O operations per second.
+          <p>
+            <span class="since">Throughput limits since 1.2.11 and QEMU 1.7</span>
+          </p>
+          </dd>
+          <dt><code>total_bytes_sec_max_length</code></dt>
+          <dd>The optional <code>total_bytes_sec_max_length</code>
+            element is the maximum duration in seconds for the
+            <code>total_bytes_sec_max</code> burst period. Only valid
+            when the <code>total_bytes_sec_max</code> is set.</dd>
+          <dt><code>read_bytes_sec_max_length</code></dt>
+          <dd>The optional <code>read_bytes_sec_max_length</code>
+            element is the maximum duration in seconds for the
+            <code>read_bytes_sec_max</code> burst period. Only valid
+            when the <code>read_bytes_sec_max</code> is set.</dd>
+          <dt><code>write_bytes_sec_max</code></dt>
+          <dd>The optional <code>write_bytes_sec_max_length</code>
+            element is the maximum duration in seconds for the
+            <code>write_bytes_sec_max</code> burst period. Only valid
+            when the <code>write_bytes_sec_max</code> is set.</dd>
+          <dt><code>total_iops_sec_max_length</code></dt>
+          <dd>The optional <code>total_iops_sec_max_length</code>
+            element is the maximum duration in seconds for the
+            <code>total_iops_sec_max</code> burst period. Only valid
+            when the <code>total_iops_sec_max</code> is set.</dd>
+          <dt><code>read_iops_sec_max_length</code></dt>
+          <dd>The optional <code>read_iops_sec_max_length</code>
+            element is the maximum duration in seconds for the
+            <code>read_iops_sec_max</code> burst period. Only valid
+            when the <code>read_iops_sec_max</code> is set.</dd>
+          <dt><code>write_iops_sec_max</code></dt>
+          <dd>The optional <code>write_iops_sec_max_length</code>
+            element is the maximum duration in seconds for the
+            <code>write_iops_sec_max</code> burst period. Only valid
+            when the <code>write_iops_sec_max</code> is set.
+          <p>
+            <span class="since">Throughput length since 2.4.0 and QEMU 2.6</span>
+          </p>
+          </dd>
         </dl>
       </dd>
       <dt><code>driver</code></dt>
@@ -5641,7 +5679,8 @@ qemu-kvm -net nic,model=? /dev/null
           video device in domain xml is the primary one, but the optional
           attribute <code>primary</code> (<span class="since">since 1.0.2</span>)
           with value 'yes' can be used to mark the primary in cases of multiple
-          video device. The non-primary must be type of "qxl".
+          video device. The non-primary must be type of "qxl" or
+          (<span class="since">since 2.4.0</span>) "virtio".
         </p>
       </dd>
 
@@ -6203,6 +6242,34 @@ qemu-kvm -net nic,model=? /dev/null
   &lt;/devices&gt;
   ...</pre>
 
+    <p>
+      <span class="since">Since 2.4.0,</span> the optional attribute
+      <code>tls</code> can be used to control whether a chardev
+      TCP communication channel would utilize a hypervisor configured
+      TLS X.509 certificate environment in order to encrypt the data
+      channel. For the QEMU hypervisor, usage of a TLS environment can
+      be controlled on the host by the <code>chardev_tls</code> and
+      <code>chardev_tls_x509_cert_dir</code> or
+      <code>default_tls_x509_cert_dir</code> settings in the file
+      /etc/libvirt/qemu.conf. If <code>chardev_tls</code> is enabled,
+      then unless the <code>tls</code> attribute is set to "no", libvirt
+      will use the host configured TLS environment.
+      If <code>chardev_tls</code> is disabled, but the <code>tls</code>
+      attribute is set to "yes", then libvirt will attempt to use the
+      host TLS environment if either the <code>chardev_tls_x509_cert_dir</code>
+      or <code>default_tls_x509_cert_dir</code> TLS directory structure exists.
+    </p>
+<pre>
+  ...
+  &lt;devices&gt;
+    &lt;serial type="tcp"&gt;
+      &lt;source mode='connect' host="127.0.0.1" service="5555" tls="yes"/&gt;
+      &lt;protocol type="raw"/&gt;
+      &lt;target port="0"/&gt;
+    &lt;/serial&gt;
+  &lt;/devices&gt;
+  ...</pre>
+
     <h6><a name="elementsCharUDP">UDP network console</a></h6>
 
     <p>
diff --git a/docs/libvirt-api.xml b/docs/libvirt-api.xml
index 1f4d8c2ae..4d1b7abed 100644
--- a/docs/libvirt-api.xml
+++ b/docs/libvirt-api.xml
@@ -134,17 +134,23 @@
      <exports symbol='VIR_DOMAIN_BLOCK_COPY_GRANULARITY' type='macro'/>
      <exports symbol='VIR_DOMAIN_BLOCK_IOTUNE_READ_BYTES_SEC' type='macro'/>
      <exports symbol='VIR_DOMAIN_BLOCK_IOTUNE_READ_BYTES_SEC_MAX' type='macro'/>
+     <exports symbol='VIR_DOMAIN_BLOCK_IOTUNE_READ_BYTES_SEC_MAX_LENGTH' type='macro'/>
      <exports symbol='VIR_DOMAIN_BLOCK_IOTUNE_READ_IOPS_SEC' type='macro'/>
      <exports symbol='VIR_DOMAIN_BLOCK_IOTUNE_READ_IOPS_SEC_MAX' type='macro'/>
+     <exports symbol='VIR_DOMAIN_BLOCK_IOTUNE_READ_IOPS_SEC_MAX_LENGTH' type='macro'/>
      <exports symbol='VIR_DOMAIN_BLOCK_IOTUNE_SIZE_IOPS_SEC' type='macro'/>
      <exports symbol='VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_BYTES_SEC' type='macro'/>
      <exports symbol='VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_BYTES_SEC_MAX' type='macro'/>
+     <exports symbol='VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_BYTES_SEC_MAX_LENGTH' type='macro'/>
      <exports symbol='VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_IOPS_SEC' type='macro'/>
      <exports symbol='VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_IOPS_SEC_MAX' type='macro'/>
+     <exports symbol='VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_IOPS_SEC_MAX_LENGTH' type='macro'/>
      <exports symbol='VIR_DOMAIN_BLOCK_IOTUNE_WRITE_BYTES_SEC' type='macro'/>
      <exports symbol='VIR_DOMAIN_BLOCK_IOTUNE_WRITE_BYTES_SEC_MAX' type='macro'/>
+     <exports symbol='VIR_DOMAIN_BLOCK_IOTUNE_WRITE_BYTES_SEC_MAX_LENGTH' type='macro'/>
      <exports symbol='VIR_DOMAIN_BLOCK_IOTUNE_WRITE_IOPS_SEC' type='macro'/>
      <exports symbol='VIR_DOMAIN_BLOCK_IOTUNE_WRITE_IOPS_SEC_MAX' type='macro'/>
+     <exports symbol='VIR_DOMAIN_BLOCK_IOTUNE_WRITE_IOPS_SEC_MAX_LENGTH' type='macro'/>
      <exports symbol='VIR_DOMAIN_BLOCK_STATS_ERRS' type='macro'/>
      <exports symbol='VIR_DOMAIN_BLOCK_STATS_FIELD_LENGTH' type='macro'/>
      <exports symbol='VIR_DOMAIN_BLOCK_STATS_FLUSH_REQ' type='macro'/>
@@ -215,17 +221,23 @@
      <exports symbol='VIR_DOMAIN_TUNABLE_BLKDEV_DISK' type='macro'/>
      <exports symbol='VIR_DOMAIN_TUNABLE_BLKDEV_READ_BYTES_SEC' type='macro'/>
      <exports symbol='VIR_DOMAIN_TUNABLE_BLKDEV_READ_BYTES_SEC_MAX' type='macro'/>
+     <exports symbol='VIR_DOMAIN_TUNABLE_BLKDEV_READ_BYTES_SEC_MAX_LENGTH' type='macro'/>
      <exports symbol='VIR_DOMAIN_TUNABLE_BLKDEV_READ_IOPS_SEC' type='macro'/>
      <exports symbol='VIR_DOMAIN_TUNABLE_BLKDEV_READ_IOPS_SEC_MAX' type='macro'/>
+     <exports symbol='VIR_DOMAIN_TUNABLE_BLKDEV_READ_IOPS_SEC_MAX_LENGTH' type='macro'/>
      <exports symbol='VIR_DOMAIN_TUNABLE_BLKDEV_SIZE_IOPS_SEC' type='macro'/>
      <exports symbol='VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_BYTES_SEC' type='macro'/>
      <exports symbol='VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_BYTES_SEC_MAX' type='macro'/>
+     <exports symbol='VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_BYTES_SEC_MAX_LENGTH' type='macro'/>
      <exports symbol='VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_IOPS_SEC' type='macro'/>
      <exports symbol='VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_IOPS_SEC_MAX' type='macro'/>
+     <exports symbol='VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_IOPS_SEC_MAX_LENGTH' type='macro'/>
      <exports symbol='VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_BYTES_SEC' type='macro'/>
      <exports symbol='VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_BYTES_SEC_MAX' type='macro'/>
+     <exports symbol='VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_BYTES_SEC_MAX_LENGTH' type='macro'/>
      <exports symbol='VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_IOPS_SEC' type='macro'/>
      <exports symbol='VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_IOPS_SEC_MAX' type='macro'/>
+     <exports symbol='VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_IOPS_SEC_MAX_LENGTH' type='macro'/>
      <exports symbol='VIR_DOMAIN_TUNABLE_CPU_CPU_SHARES' type='macro'/>
      <exports symbol='VIR_DOMAIN_TUNABLE_CPU_EMULATORPIN' type='macro'/>
      <exports symbol='VIR_DOMAIN_TUNABLE_CPU_EMULATOR_PERIOD' type='macro'/>
@@ -681,6 +693,7 @@
      <exports symbol='VIR_DOMAIN_VCPU_CONFIG' type='enum'/>
      <exports symbol='VIR_DOMAIN_VCPU_CURRENT' type='enum'/>
      <exports symbol='VIR_DOMAIN_VCPU_GUEST' type='enum'/>
+     <exports symbol='VIR_DOMAIN_VCPU_HOTPLUGGABLE' type='enum'/>
      <exports symbol='VIR_DOMAIN_VCPU_LIVE' type='enum'/>
      <exports symbol='VIR_DOMAIN_VCPU_MAXIMUM' type='enum'/>
      <exports symbol='VIR_DOMAIN_XML_INACTIVE' type='enum'/>
@@ -1913,12 +1926,18 @@
     <macro name='VIR_DOMAIN_BLOCK_IOTUNE_READ_BYTES_SEC_MAX' file='libvirt-domain' string='read_bytes_sec_max'>
       <info><![CDATA[Macro for the BlockIoTune tunable weight: it represents the maximum read bytes per second permitted through a block device, as a ullong.]]></info>
     </macro>
+    <macro name='VIR_DOMAIN_BLOCK_IOTUNE_READ_BYTES_SEC_MAX_LENGTH' file='libvirt-domain' string='read_bytes_sec_max_length'>
+      <info><![CDATA[Macro for the BlockIoTune tunable weight: it represents the duration in seconds for the burst allowed by read_bytes_sec_max, as a ullong.]]></info>
+    </macro>
     <macro name='VIR_DOMAIN_BLOCK_IOTUNE_READ_IOPS_SEC' file='libvirt-domain' string='read_iops_sec'>
       <info><![CDATA[Macro for the BlockIoTune tunable weight: it represents the read I/O operations per second permitted through a block device, as a ullong.]]></info>
     </macro>
     <macro name='VIR_DOMAIN_BLOCK_IOTUNE_READ_IOPS_SEC_MAX' file='libvirt-domain' string='read_iops_sec_max'>
       <info><![CDATA[Macro for the BlockIoTune tunable weight: it represents the maximum read I/O operations per second permitted through a block device, as a ullong.]]></info>
     </macro>
+    <macro name='VIR_DOMAIN_BLOCK_IOTUNE_READ_IOPS_SEC_MAX_LENGTH' file='libvirt-domain' string='read_iops_sec_max_length'>
+      <info><![CDATA[Macro for the BlockIoTune tunable weight: it represents the duration in seconds for the burst allowed by read_iops_sec_max, as a ullong.]]></info>
+    </macro>
     <macro name='VIR_DOMAIN_BLOCK_IOTUNE_SIZE_IOPS_SEC' file='libvirt-domain' string='size_iops_sec'>
       <info><![CDATA[Macro for the BlockIoTune tunable weight: it represents the size I/O operations per second permitted through a block device, as a ullong.]]></info>
     </macro>
@@ -1928,24 +1947,36 @@
     <macro name='VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_BYTES_SEC_MAX' file='libvirt-domain' string='total_bytes_sec_max'>
       <info><![CDATA[Macro for the BlockIoTune tunable weight: it represents the maximum total bytes per second permitted through a block device, as a ullong.]]></info>
     </macro>
+    <macro name='VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_BYTES_SEC_MAX_LENGTH' file='libvirt-domain' string='total_bytes_sec_max_length'>
+      <info><![CDATA[Macro for the BlockIoTune tunable weight: it represents the duration in seconds for the burst allowed by total_bytes_sec_max, as a ullong.]]></info>
+    </macro>
     <macro name='VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_IOPS_SEC' file='libvirt-domain' string='total_iops_sec'>
       <info><![CDATA[Macro for the BlockIoTune tunable weight: it represents the total I/O operations per second permitted through a block device, as a ullong.]]></info>
     </macro>
     <macro name='VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_IOPS_SEC_MAX' file='libvirt-domain' string='total_iops_sec_max'>
       <info><![CDATA[Macro for the BlockIoTune tunable weight: it represents the maximum I/O operations per second permitted through a block device, as a ullong.]]></info>
     </macro>
+    <macro name='VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_IOPS_SEC_MAX_LENGTH' file='libvirt-domain' string='total_iops_sec_max_length'>
+      <info><![CDATA[Macro for the BlockIoTune tunable weight: it represents the duration in seconds for the burst allowed by total_iops_sec_max, as a ullong.]]></info>
+    </macro>
     <macro name='VIR_DOMAIN_BLOCK_IOTUNE_WRITE_BYTES_SEC' file='libvirt-domain' string='write_bytes_sec'>
       <info><![CDATA[Macro for the BlockIoTune tunable weight: it represents the write bytes per second permitted through a block device, as a ullong.]]></info>
     </macro>
     <macro name='VIR_DOMAIN_BLOCK_IOTUNE_WRITE_BYTES_SEC_MAX' file='libvirt-domain' string='write_bytes_sec_max'>
       <info><![CDATA[Macro for the BlockIoTune tunable weight: it represents the maximum write bytes per second permitted through a block device, as a ullong.]]></info>
     </macro>
+    <macro name='VIR_DOMAIN_BLOCK_IOTUNE_WRITE_BYTES_SEC_MAX_LENGTH' file='libvirt-domain' string='write_bytes_sec_max_length'>
+      <info><![CDATA[Macro for the BlockIoTune tunable weight: it represents the duration in seconds for the burst allowed by write_bytes_sec_max, as a ullong.]]></info>
+    </macro>
     <macro name='VIR_DOMAIN_BLOCK_IOTUNE_WRITE_IOPS_SEC' file='libvirt-domain' string='write_iops_sec'>
       <info><![CDATA[Macro for the BlockIoTune tunable weight: it represents the write I/O operations per second permitted through a block device, as a ullong.]]></info>
     </macro>
     <macro name='VIR_DOMAIN_BLOCK_IOTUNE_WRITE_IOPS_SEC_MAX' file='libvirt-domain' string='write_iops_sec_max'>
       <info><![CDATA[Macro for the BlockIoTune tunable weight: it represents the maximum write I/O operations per second permitted through a block device, as a ullong.]]></info>
     </macro>
+    <macro name='VIR_DOMAIN_BLOCK_IOTUNE_WRITE_IOPS_SEC_MAX_LENGTH' file='libvirt-domain' string='write_iops_sec_max_length'>
+      <info><![CDATA[Macro for the BlockIoTune tunable weight: it represents the duration in seconds for the burst allowed by write_iops_sec_max, as a ullong.]]></info>
+    </macro>
     <macro name='VIR_DOMAIN_BLOCK_STATS_ERRS' file='libvirt-domain' string='errs'>
       <info><![CDATA[In Xen this returns the mysterious 'oo_req', as an llong.]]></info>
     </macro>
@@ -2151,43 +2182,61 @@
       <info><![CDATA[Macro represents the name of guest disk for which the values are updated, as VIR_TYPED_PARAM_STRING.]]></info>
     </macro>
     <macro name='VIR_DOMAIN_TUNABLE_BLKDEV_READ_BYTES_SEC' file='libvirt-domain' string='blkdeviotune.read_bytes_sec'>
-      <info><![CDATA[Marco represents the read throughput limit in bytes per second, as VIR_TYPED_PARAM_ULLONG.]]></info>
+      <info><![CDATA[Macro represents the read throughput limit in bytes per second, as VIR_TYPED_PARAM_ULLONG.]]></info>
     </macro>
     <macro name='VIR_DOMAIN_TUNABLE_BLKDEV_READ_BYTES_SEC_MAX' file='libvirt-domain' string='blkdeviotune.read_bytes_sec_max'>
-      <info><![CDATA[Marco represents the read throughput limit in maximum bytes per second, as VIR_TYPED_PARAM_ULLONG.]]></info>
+      <info><![CDATA[Macro represents the read throughput limit during bursts in maximum bytes per second, as VIR_TYPED_PARAM_ULLONG.]]></info>
+    </macro>
+    <macro name='VIR_DOMAIN_TUNABLE_BLKDEV_READ_BYTES_SEC_MAX_LENGTH' file='libvirt-domain' string='blkdeviotune.read_bytes_sec_max_length'>
+      <info><![CDATA[Macro represents the length in seconds allowed for a burst period for the blkdeviotune.read_bytes_sec_max as VIR_TYPED_PARAM_ULLONG.]]></info>
     </macro>
     <macro name='VIR_DOMAIN_TUNABLE_BLKDEV_READ_IOPS_SEC' file='libvirt-domain' string='blkdeviotune.read_iops_sec'>
       <info><![CDATA[Macro represents the read I/O operations per second, as VIR_TYPED_PARAM_ULLONG.]]></info>
     </macro>
     <macro name='VIR_DOMAIN_TUNABLE_BLKDEV_READ_IOPS_SEC_MAX' file='libvirt-domain' string='blkdeviotune.read_iops_sec_max'>
-      <info><![CDATA[Macro represents the read maximum I/O operations per second, as VIR_TYPED_PARAM_ULLONG.]]></info>
+      <info><![CDATA[Macro represents the read maximum I/O operations per second during bursts, as VIR_TYPED_PARAM_ULLONG.]]></info>
+    </macro>
+    <macro name='VIR_DOMAIN_TUNABLE_BLKDEV_READ_IOPS_SEC_MAX_LENGTH' file='libvirt-domain' string='blkdeviotune.read_iops_sec_max_length'>
+      <info><![CDATA[Macro represents the length in seconds allowed for a burst period for the blkdeviotune.read_iops_sec_max as VIR_TYPED_PARAM_ULLONG.]]></info>
     </macro>
     <macro name='VIR_DOMAIN_TUNABLE_BLKDEV_SIZE_IOPS_SEC' file='libvirt-domain' string='blkdeviotune.size_iops_sec'>
       <info><![CDATA[Macro represents the size maximum I/O operations per second, as VIR_TYPED_PARAM_ULLONG.]]></info>
     </macro>
     <macro name='VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_BYTES_SEC' file='libvirt-domain' string='blkdeviotune.total_bytes_sec'>
-      <info><![CDATA[Marco represents the total throughput limit in bytes per second, as VIR_TYPED_PARAM_ULLONG.]]></info>
+      <info><![CDATA[Macro represents the total throughput limit in bytes per second, as VIR_TYPED_PARAM_ULLONG.]]></info>
     </macro>
     <macro name='VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_BYTES_SEC_MAX' file='libvirt-domain' string='blkdeviotune.total_bytes_sec_max'>
-      <info><![CDATA[Marco represents the total throughput limit in maximum bytes per second, as VIR_TYPED_PARAM_ULLONG.]]></info>
+      <info><![CDATA[Macro represents the total throughput limit during bursts in maximum bytes per second, as VIR_TYPED_PARAM_ULLONG.]]></info>
+    </macro>
+    <macro name='VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_BYTES_SEC_MAX_LENGTH' file='libvirt-domain' string='blkdeviotune.total_bytes_sec_max_length'>
+      <info><![CDATA[Macro represents the length in seconds allowed for a burst period for the blkdeviotune.total_bytes_sec_max, as VIR_TYPED_PARAM_ULLONG.]]></info>
     </macro>
     <macro name='VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_IOPS_SEC' file='libvirt-domain' string='blkdeviotune.total_iops_sec'>
       <info><![CDATA[Macro represents the total I/O operations per second, as VIR_TYPED_PARAM_ULLONG.]]></info>
     </macro>
     <macro name='VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_IOPS_SEC_MAX' file='libvirt-domain' string='blkdeviotune.total_iops_sec_max'>
-      <info><![CDATA[Macro represents the total maximum I/O operations per second, as VIR_TYPED_PARAM_ULLONG.]]></info>
+      <info><![CDATA[Macro represents the total maximum I/O operations per second during bursts, as VIR_TYPED_PARAM_ULLONG.]]></info>
+    </macro>
+    <macro name='VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_IOPS_SEC_MAX_LENGTH' file='libvirt-domain' string='blkdeviotune.total_iops_sec_max_length'>
+      <info><![CDATA[Macro represents the length in seconds allowed for a burst period for the blkdeviotune.total_iops_sec_max as VIR_TYPED_PARAM_ULLONG.]]></info>
     </macro>
     <macro name='VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_BYTES_SEC' file='libvirt-domain' string='blkdeviotune.write_bytes_sec'>
       <info><![CDATA[Macro represents the write throughput limit in bytes per second, as VIR_TYPED_PARAM_ULLONG.]]></info>
     </macro>
     <macro name='VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_BYTES_SEC_MAX' file='libvirt-domain' string='blkdeviotune.write_bytes_sec_max'>
-      <info><![CDATA[Macro represents the write throughput limit in maximum bytes per second, as VIR_TYPED_PARAM_ULLONG.]]></info>
+      <info><![CDATA[Macro represents the write throughput limit during bursts in maximum bytes per second, as VIR_TYPED_PARAM_ULLONG.]]></info>
+    </macro>
+    <macro name='VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_BYTES_SEC_MAX_LENGTH' file='libvirt-domain' string='blkdeviotune.write_bytes_sec_max_length'>
+      <info><![CDATA[Macro represents the length in seconds allowed for a burst period for the blkdeviotune.write_bytes_sec_max as VIR_TYPED_PARAM_ULLONG.]]></info>
     </macro>
     <macro name='VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_IOPS_SEC' file='libvirt-domain' string='blkdeviotune.write_iops_sec'>
       <info><![CDATA[Macro represents the write I/O operations per second, as VIR_TYPED_PARAM_ULLONG.]]></info>
     </macro>
     <macro name='VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_IOPS_SEC_MAX' file='libvirt-domain' string='blkdeviotune.write_iops_sec_max'>
-      <info><![CDATA[Macro represents the write maximum I/O operations per second, as VIR_TYPED_PARAM_ULLONG.]]></info>
+      <info><![CDATA[Macro represents the write maximum I/O operations per second during bursts, as VIR_TYPED_PARAM_ULLONG.]]></info>
+    </macro>
+    <macro name='VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_IOPS_SEC_MAX_LENGTH' file='libvirt-domain' string='blkdeviotune.write_iops_sec_max_length'>
+      <info><![CDATA[Macro represents the length in seconds allowed for a burst period for the blkdeviotune.write_iops_sec_max as VIR_TYPED_PARAM_ULLONG.]]></info>
     </macro>
     <macro name='VIR_DOMAIN_TUNABLE_CPU_CPU_SHARES' file='libvirt-domain' string='cputune.cpu_shares'>
       <info><![CDATA[Macro represents proportional weight of the scheduler used on the host cpu, when using the posix scheduler, as VIR_TYPED_PARAM_ULLONG.]]></info>
@@ -2359,7 +2408,7 @@
       <info><![CDATA[Macro for typed parameter name that represents CMT perf event which can be used to measure the usage of cache (bytes) by applications running on the platform. It corresponds to the "perf.cmt" field in the *Stats APIs.]]></info>
     </macro>
     <macro name='VIR_PERF_PARAM_CPU_CYCLES' file='libvirt-domain' string='cpu_cycles'>
-      <info><![CDATA[Macro for typed parameter name that represents cpu_cycles perf event which can be used to measure how many cpu cycles one instruction needs. It corresponds to the "perf.cpu_cycles" field in the *Stats APIs.]]></info>
+      <info><![CDATA[Macro for typed parameter name that represents cpu_cycles perf event describing the total/elapsed cpu cycles. This can be used to measure how many cpu cycles one instruction needs. It corresponds to the "perf.cpu_cycles" field in the *Stats APIs.]]></info>
     </macro>
     <macro name='VIR_PERF_PARAM_INSTRUCTIONS' file='libvirt-domain' string='instructions'>
       <info><![CDATA[Macro for typed parameter name that represents instructions perf event which can be used to measure the count of instructions by applications running on the platform. It corresponds to the "perf.instructions" field in the *Stats APIs.]]></info>
@@ -3017,6 +3066,7 @@ snapshot metadata'/>
     <enum name='VIR_DOMAIN_VCPU_CONFIG' file='libvirt-domain' value='VIR_DOMAIN_AFFECT_CONFIG' type='virDomainVcpuFlags' info='Additionally, these flags may be bitwise-OR&apos;d in.'/>
     <enum name='VIR_DOMAIN_VCPU_CURRENT' file='libvirt-domain' value='VIR_DOMAIN_AFFECT_CURRENT' type='virDomainVcpuFlags'/>
     <enum name='VIR_DOMAIN_VCPU_GUEST' file='libvirt-domain' value='8' type='virDomainVcpuFlags' info='Modify state of the cpu in the guest'/>
+    <enum name='VIR_DOMAIN_VCPU_HOTPLUGGABLE' file='libvirt-domain' value='16' type='virDomainVcpuFlags' info='Make vcpus added hot(un)pluggable'/>
     <enum name='VIR_DOMAIN_VCPU_LIVE' file='libvirt-domain' value='VIR_DOMAIN_AFFECT_LIVE' type='virDomainVcpuFlags'/>
     <enum name='VIR_DOMAIN_VCPU_MAXIMUM' file='libvirt-domain' value='4' type='virDomainVcpuFlags' info='Max rather than current count'/>
     <enum name='VIR_DOMAIN_XML_INACTIVE' file='libvirt-domain' value='2' type='virDomainXMLFlags' info='dump inactive domain information'/>
@@ -4521,7 +4571,7 @@ The typed parameter keys are in this format:
                           It is produced by cache_references perf event.
 "perf.instructions"     - The count of instructions as unsigned long long.
                           It is produced by instructions perf event.
-"perf.cpu_cycles"       - The number of cpu cycles one instruction needs as
+"perf.cpu_cycles"       - The count of cpu cycles (total/elapsed) as an
                           unsigned long long. It is produced by cpu_cycles
                           perf event.
 
diff --git a/docs/libvirt-refs.xml b/docs/libvirt-refs.xml
index d3ce660ee..519dad6d2 100644
--- a/docs/libvirt-refs.xml
+++ b/docs/libvirt-refs.xml
@@ -143,17 +143,23 @@
     <reference name='VIR_DOMAIN_BLOCK_COPY_SHALLOW' href='html/libvirt-libvirt-domain.html#VIR_DOMAIN_BLOCK_COPY_SHALLOW'/>
     <reference name='VIR_DOMAIN_BLOCK_IOTUNE_READ_BYTES_SEC' href='html/libvirt-libvirt-domain.html#VIR_DOMAIN_BLOCK_IOTUNE_READ_BYTES_SEC'/>
     <reference name='VIR_DOMAIN_BLOCK_IOTUNE_READ_BYTES_SEC_MAX' href='html/libvirt-libvirt-domain.html#VIR_DOMAIN_BLOCK_IOTUNE_READ_BYTES_SEC_MAX'/>
+    <reference name='VIR_DOMAIN_BLOCK_IOTUNE_READ_BYTES_SEC_MAX_LENGTH' href='html/libvirt-libvirt-domain.html#VIR_DOMAIN_BLOCK_IOTUNE_READ_BYTES_SEC_MAX_LENGTH'/>
     <reference name='VIR_DOMAIN_BLOCK_IOTUNE_READ_IOPS_SEC' href='html/libvirt-libvirt-domain.html#VIR_DOMAIN_BLOCK_IOTUNE_READ_IOPS_SEC'/>
     <reference name='VIR_DOMAIN_BLOCK_IOTUNE_READ_IOPS_SEC_MAX' href='html/libvirt-libvirt-domain.html#VIR_DOMAIN_BLOCK_IOTUNE_READ_IOPS_SEC_MAX'/>
+    <reference name='VIR_DOMAIN_BLOCK_IOTUNE_READ_IOPS_SEC_MAX_LENGTH' href='html/libvirt-libvirt-domain.html#VIR_DOMAIN_BLOCK_IOTUNE_READ_IOPS_SEC_MAX_LENGTH'/>
     <reference name='VIR_DOMAIN_BLOCK_IOTUNE_SIZE_IOPS_SEC' href='html/libvirt-libvirt-domain.html#VIR_DOMAIN_BLOCK_IOTUNE_SIZE_IOPS_SEC'/>
     <reference name='VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_BYTES_SEC' href='html/libvirt-libvirt-domain.html#VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_BYTES_SEC'/>
     <reference name='VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_BYTES_SEC_MAX' href='html/libvirt-libvirt-domain.html#VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_BYTES_SEC_MAX'/>
+    <reference name='VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_BYTES_SEC_MAX_LENGTH' href='html/libvirt-libvirt-domain.html#VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_BYTES_SEC_MAX_LENGTH'/>
     <reference name='VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_IOPS_SEC' href='html/libvirt-libvirt-domain.html#VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_IOPS_SEC'/>
     <reference name='VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_IOPS_SEC_MAX' href='html/libvirt-libvirt-domain.html#VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_IOPS_SEC_MAX'/>
+    <reference name='VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_IOPS_SEC_MAX_LENGTH' href='html/libvirt-libvirt-domain.html#VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_IOPS_SEC_MAX_LENGTH'/>
     <reference name='VIR_DOMAIN_BLOCK_IOTUNE_WRITE_BYTES_SEC' href='html/libvirt-libvirt-domain.html#VIR_DOMAIN_BLOCK_IOTUNE_WRITE_BYTES_SEC'/>
     <reference name='VIR_DOMAIN_BLOCK_IOTUNE_WRITE_BYTES_SEC_MAX' href='html/libvirt-libvirt-domain.html#VIR_DOMAIN_BLOCK_IOTUNE_WRITE_BYTES_SEC_MAX'/>
+    <reference name='VIR_DOMAIN_BLOCK_IOTUNE_WRITE_BYTES_SEC_MAX_LENGTH' href='html/libvirt-libvirt-domain.html#VIR_DOMAIN_BLOCK_IOTUNE_WRITE_BYTES_SEC_MAX_LENGTH'/>
     <reference name='VIR_DOMAIN_BLOCK_IOTUNE_WRITE_IOPS_SEC' href='html/libvirt-libvirt-domain.html#VIR_DOMAIN_BLOCK_IOTUNE_WRITE_IOPS_SEC'/>
     <reference name='VIR_DOMAIN_BLOCK_IOTUNE_WRITE_IOPS_SEC_MAX' href='html/libvirt-libvirt-domain.html#VIR_DOMAIN_BLOCK_IOTUNE_WRITE_IOPS_SEC_MAX'/>
+    <reference name='VIR_DOMAIN_BLOCK_IOTUNE_WRITE_IOPS_SEC_MAX_LENGTH' href='html/libvirt-libvirt-domain.html#VIR_DOMAIN_BLOCK_IOTUNE_WRITE_IOPS_SEC_MAX_LENGTH'/>
     <reference name='VIR_DOMAIN_BLOCK_JOB_ABORT_ASYNC' href='html/libvirt-libvirt-domain.html#VIR_DOMAIN_BLOCK_JOB_ABORT_ASYNC'/>
     <reference name='VIR_DOMAIN_BLOCK_JOB_ABORT_PIVOT' href='html/libvirt-libvirt-domain.html#VIR_DOMAIN_BLOCK_JOB_ABORT_PIVOT'/>
     <reference name='VIR_DOMAIN_BLOCK_JOB_CANCELED' href='html/libvirt-libvirt-domain.html#VIR_DOMAIN_BLOCK_JOB_CANCELED'/>
@@ -607,17 +613,23 @@
     <reference name='VIR_DOMAIN_TUNABLE_BLKDEV_DISK' href='html/libvirt-libvirt-domain.html#VIR_DOMAIN_TUNABLE_BLKDEV_DISK'/>
     <reference name='VIR_DOMAIN_TUNABLE_BLKDEV_READ_BYTES_SEC' href='html/libvirt-libvirt-domain.html#VIR_DOMAIN_TUNABLE_BLKDEV_READ_BYTES_SEC'/>
     <reference name='VIR_DOMAIN_TUNABLE_BLKDEV_READ_BYTES_SEC_MAX' href='html/libvirt-libvirt-domain.html#VIR_DOMAIN_TUNABLE_BLKDEV_READ_BYTES_SEC_MAX'/>
+    <reference name='VIR_DOMAIN_TUNABLE_BLKDEV_READ_BYTES_SEC_MAX_LENGTH' href='html/libvirt-libvirt-domain.html#VIR_DOMAIN_TUNABLE_BLKDEV_READ_BYTES_SEC_MAX_LENGTH'/>
     <reference name='VIR_DOMAIN_TUNABLE_BLKDEV_READ_IOPS_SEC' href='html/libvirt-libvirt-domain.html#VIR_DOMAIN_TUNABLE_BLKDEV_READ_IOPS_SEC'/>
     <reference name='VIR_DOMAIN_TUNABLE_BLKDEV_READ_IOPS_SEC_MAX' href='html/libvirt-libvirt-domain.html#VIR_DOMAIN_TUNABLE_BLKDEV_READ_IOPS_SEC_MAX'/>
+    <reference name='VIR_DOMAIN_TUNABLE_BLKDEV_READ_IOPS_SEC_MAX_LENGTH' href='html/libvirt-libvirt-domain.html#VIR_DOMAIN_TUNABLE_BLKDEV_READ_IOPS_SEC_MAX_LENGTH'/>
     <reference name='VIR_DOMAIN_TUNABLE_BLKDEV_SIZE_IOPS_SEC' href='html/libvirt-libvirt-domain.html#VIR_DOMAIN_TUNABLE_BLKDEV_SIZE_IOPS_SEC'/>
     <reference name='VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_BYTES_SEC' href='html/libvirt-libvirt-domain.html#VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_BYTES_SEC'/>
     <reference name='VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_BYTES_SEC_MAX' href='html/libvirt-libvirt-domain.html#VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_BYTES_SEC_MAX'/>
+    <reference name='VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_BYTES_SEC_MAX_LENGTH' href='html/libvirt-libvirt-domain.html#VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_BYTES_SEC_MAX_LENGTH'/>
     <reference name='VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_IOPS_SEC' href='html/libvirt-libvirt-domain.html#VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_IOPS_SEC'/>
     <reference name='VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_IOPS_SEC_MAX' href='html/libvirt-libvirt-domain.html#VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_IOPS_SEC_MAX'/>
+    <reference name='VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_IOPS_SEC_MAX_LENGTH' href='html/libvirt-libvirt-domain.html#VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_IOPS_SEC_MAX_LENGTH'/>
     <reference name='VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_BYTES_SEC' href='html/libvirt-libvirt-domain.html#VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_BYTES_SEC'/>
     <reference name='VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_BYTES_SEC_MAX' href='html/libvirt-libvirt-domain.html#VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_BYTES_SEC_MAX'/>
+    <reference name='VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_BYTES_SEC_MAX_LENGTH' href='html/libvirt-libvirt-domain.html#VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_BYTES_SEC_MAX_LENGTH'/>
     <reference name='VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_IOPS_SEC' href='html/libvirt-libvirt-domain.html#VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_IOPS_SEC'/>
     <reference name='VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_IOPS_SEC_MAX' href='html/libvirt-libvirt-domain.html#VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_IOPS_SEC_MAX'/>
+    <reference name='VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_IOPS_SEC_MAX_LENGTH' href='html/libvirt-libvirt-domain.html#VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_IOPS_SEC_MAX_LENGTH'/>
     <reference name='VIR_DOMAIN_TUNABLE_CPU_CPU_SHARES' href='html/libvirt-libvirt-domain.html#VIR_DOMAIN_TUNABLE_CPU_CPU_SHARES'/>
     <reference name='VIR_DOMAIN_TUNABLE_CPU_EMULATORPIN' href='html/libvirt-libvirt-domain.html#VIR_DOMAIN_TUNABLE_CPU_EMULATORPIN'/>
     <reference name='VIR_DOMAIN_TUNABLE_CPU_EMULATOR_PERIOD' href='html/libvirt-libvirt-domain.html#VIR_DOMAIN_TUNABLE_CPU_EMULATOR_PERIOD'/>
@@ -637,6 +649,7 @@
     <reference name='VIR_DOMAIN_VCPU_CONFIG' href='html/libvirt-libvirt-domain.html#VIR_DOMAIN_VCPU_CONFIG'/>
     <reference name='VIR_DOMAIN_VCPU_CURRENT' href='html/libvirt-libvirt-domain.html#VIR_DOMAIN_VCPU_CURRENT'/>
     <reference name='VIR_DOMAIN_VCPU_GUEST' href='html/libvirt-libvirt-domain.html#VIR_DOMAIN_VCPU_GUEST'/>
+    <reference name='VIR_DOMAIN_VCPU_HOTPLUGGABLE' href='html/libvirt-libvirt-domain.html#VIR_DOMAIN_VCPU_HOTPLUGGABLE'/>
     <reference name='VIR_DOMAIN_VCPU_LIVE' href='html/libvirt-libvirt-domain.html#VIR_DOMAIN_VCPU_LIVE'/>
     <reference name='VIR_DOMAIN_VCPU_MAXIMUM' href='html/libvirt-libvirt-domain.html#VIR_DOMAIN_VCPU_MAXIMUM'/>
     <reference name='VIR_DOMAIN_XML_INACTIVE' href='html/libvirt-libvirt-domain.html#VIR_DOMAIN_XML_INACTIVE'/>
@@ -1904,17 +1917,23 @@
       <ref name='VIR_DOMAIN_BLOCK_COPY_SHALLOW'/>
       <ref name='VIR_DOMAIN_BLOCK_IOTUNE_READ_BYTES_SEC'/>
       <ref name='VIR_DOMAIN_BLOCK_IOTUNE_READ_BYTES_SEC_MAX'/>
+      <ref name='VIR_DOMAIN_BLOCK_IOTUNE_READ_BYTES_SEC_MAX_LENGTH'/>
       <ref name='VIR_DOMAIN_BLOCK_IOTUNE_READ_IOPS_SEC'/>
       <ref name='VIR_DOMAIN_BLOCK_IOTUNE_READ_IOPS_SEC_MAX'/>
+      <ref name='VIR_DOMAIN_BLOCK_IOTUNE_READ_IOPS_SEC_MAX_LENGTH'/>
       <ref name='VIR_DOMAIN_BLOCK_IOTUNE_SIZE_IOPS_SEC'/>
       <ref name='VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_BYTES_SEC'/>
       <ref name='VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_BYTES_SEC_MAX'/>
+      <ref name='VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_BYTES_SEC_MAX_LENGTH'/>
       <ref name='VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_IOPS_SEC'/>
       <ref name='VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_IOPS_SEC_MAX'/>
+      <ref name='VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_IOPS_SEC_MAX_LENGTH'/>
       <ref name='VIR_DOMAIN_BLOCK_IOTUNE_WRITE_BYTES_SEC'/>
       <ref name='VIR_DOMAIN_BLOCK_IOTUNE_WRITE_BYTES_SEC_MAX'/>
+      <ref name='VIR_DOMAIN_BLOCK_IOTUNE_WRITE_BYTES_SEC_MAX_LENGTH'/>
       <ref name='VIR_DOMAIN_BLOCK_IOTUNE_WRITE_IOPS_SEC'/>
       <ref name='VIR_DOMAIN_BLOCK_IOTUNE_WRITE_IOPS_SEC_MAX'/>
+      <ref name='VIR_DOMAIN_BLOCK_IOTUNE_WRITE_IOPS_SEC_MAX_LENGTH'/>
       <ref name='VIR_DOMAIN_BLOCK_JOB_ABORT_ASYNC'/>
       <ref name='VIR_DOMAIN_BLOCK_JOB_ABORT_PIVOT'/>
       <ref name='VIR_DOMAIN_BLOCK_JOB_CANCELED'/>
@@ -2368,17 +2387,23 @@
       <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_DISK'/>
       <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_READ_BYTES_SEC'/>
       <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_READ_BYTES_SEC_MAX'/>
+      <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_READ_BYTES_SEC_MAX_LENGTH'/>
       <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_READ_IOPS_SEC'/>
       <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_READ_IOPS_SEC_MAX'/>
+      <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_READ_IOPS_SEC_MAX_LENGTH'/>
       <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_SIZE_IOPS_SEC'/>
       <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_BYTES_SEC'/>
       <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_BYTES_SEC_MAX'/>
+      <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_BYTES_SEC_MAX_LENGTH'/>
       <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_IOPS_SEC'/>
       <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_IOPS_SEC_MAX'/>
+      <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_IOPS_SEC_MAX_LENGTH'/>
       <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_BYTES_SEC'/>
       <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_BYTES_SEC_MAX'/>
+      <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_BYTES_SEC_MAX_LENGTH'/>
       <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_IOPS_SEC'/>
       <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_IOPS_SEC_MAX'/>
+      <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_IOPS_SEC_MAX_LENGTH'/>
       <ref name='VIR_DOMAIN_TUNABLE_CPU_CPU_SHARES'/>
       <ref name='VIR_DOMAIN_TUNABLE_CPU_EMULATORPIN'/>
       <ref name='VIR_DOMAIN_TUNABLE_CPU_EMULATOR_PERIOD'/>
@@ -2398,6 +2423,7 @@
       <ref name='VIR_DOMAIN_VCPU_CONFIG'/>
       <ref name='VIR_DOMAIN_VCPU_CURRENT'/>
       <ref name='VIR_DOMAIN_VCPU_GUEST'/>
+      <ref name='VIR_DOMAIN_VCPU_HOTPLUGGABLE'/>
       <ref name='VIR_DOMAIN_VCPU_LIVE'/>
       <ref name='VIR_DOMAIN_VCPU_MAXIMUM'/>
       <ref name='VIR_DOMAIN_XML_INACTIVE'/>
@@ -4951,17 +4977,23 @@
       <ref name='VIR_DOMAIN_BLOCK_COPY_SHALLOW'/>
       <ref name='VIR_DOMAIN_BLOCK_IOTUNE_READ_BYTES_SEC'/>
       <ref name='VIR_DOMAIN_BLOCK_IOTUNE_READ_BYTES_SEC_MAX'/>
+      <ref name='VIR_DOMAIN_BLOCK_IOTUNE_READ_BYTES_SEC_MAX_LENGTH'/>
       <ref name='VIR_DOMAIN_BLOCK_IOTUNE_READ_IOPS_SEC'/>
       <ref name='VIR_DOMAIN_BLOCK_IOTUNE_READ_IOPS_SEC_MAX'/>
+      <ref name='VIR_DOMAIN_BLOCK_IOTUNE_READ_IOPS_SEC_MAX_LENGTH'/>
       <ref name='VIR_DOMAIN_BLOCK_IOTUNE_SIZE_IOPS_SEC'/>
       <ref name='VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_BYTES_SEC'/>
       <ref name='VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_BYTES_SEC_MAX'/>
+      <ref name='VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_BYTES_SEC_MAX_LENGTH'/>
       <ref name='VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_IOPS_SEC'/>
       <ref name='VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_IOPS_SEC_MAX'/>
+      <ref name='VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_IOPS_SEC_MAX_LENGTH'/>
       <ref name='VIR_DOMAIN_BLOCK_IOTUNE_WRITE_BYTES_SEC'/>
       <ref name='VIR_DOMAIN_BLOCK_IOTUNE_WRITE_BYTES_SEC_MAX'/>
+      <ref name='VIR_DOMAIN_BLOCK_IOTUNE_WRITE_BYTES_SEC_MAX_LENGTH'/>
       <ref name='VIR_DOMAIN_BLOCK_IOTUNE_WRITE_IOPS_SEC'/>
       <ref name='VIR_DOMAIN_BLOCK_IOTUNE_WRITE_IOPS_SEC_MAX'/>
+      <ref name='VIR_DOMAIN_BLOCK_IOTUNE_WRITE_IOPS_SEC_MAX_LENGTH'/>
       <ref name='VIR_DOMAIN_BLOCK_JOB_ABORT_ASYNC'/>
       <ref name='VIR_DOMAIN_BLOCK_JOB_ABORT_PIVOT'/>
       <ref name='VIR_DOMAIN_BLOCK_JOB_CANCELED'/>
@@ -5389,17 +5421,23 @@
       <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_DISK'/>
       <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_READ_BYTES_SEC'/>
       <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_READ_BYTES_SEC_MAX'/>
+      <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_READ_BYTES_SEC_MAX_LENGTH'/>
       <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_READ_IOPS_SEC'/>
       <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_READ_IOPS_SEC_MAX'/>
+      <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_READ_IOPS_SEC_MAX_LENGTH'/>
       <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_SIZE_IOPS_SEC'/>
       <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_BYTES_SEC'/>
       <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_BYTES_SEC_MAX'/>
+      <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_BYTES_SEC_MAX_LENGTH'/>
       <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_IOPS_SEC'/>
       <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_IOPS_SEC_MAX'/>
+      <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_IOPS_SEC_MAX_LENGTH'/>
       <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_BYTES_SEC'/>
       <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_BYTES_SEC_MAX'/>
+      <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_BYTES_SEC_MAX_LENGTH'/>
       <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_IOPS_SEC'/>
       <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_IOPS_SEC_MAX'/>
+      <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_IOPS_SEC_MAX_LENGTH'/>
       <ref name='VIR_DOMAIN_TUNABLE_CPU_CPU_SHARES'/>
       <ref name='VIR_DOMAIN_TUNABLE_CPU_EMULATORPIN'/>
       <ref name='VIR_DOMAIN_TUNABLE_CPU_EMULATOR_PERIOD'/>
@@ -5419,6 +5457,7 @@
       <ref name='VIR_DOMAIN_VCPU_CONFIG'/>
       <ref name='VIR_DOMAIN_VCPU_CURRENT'/>
       <ref name='VIR_DOMAIN_VCPU_GUEST'/>
+      <ref name='VIR_DOMAIN_VCPU_HOTPLUGGABLE'/>
       <ref name='VIR_DOMAIN_VCPU_LIVE'/>
       <ref name='VIR_DOMAIN_VCPU_MAXIMUM'/>
       <ref name='VIR_DOMAIN_XML_INACTIVE'/>
@@ -6727,17 +6766,23 @@
         <word name='BlockIoTune'>
           <ref name='VIR_DOMAIN_BLOCK_IOTUNE_READ_BYTES_SEC'/>
           <ref name='VIR_DOMAIN_BLOCK_IOTUNE_READ_BYTES_SEC_MAX'/>
+          <ref name='VIR_DOMAIN_BLOCK_IOTUNE_READ_BYTES_SEC_MAX_LENGTH'/>
           <ref name='VIR_DOMAIN_BLOCK_IOTUNE_READ_IOPS_SEC'/>
           <ref name='VIR_DOMAIN_BLOCK_IOTUNE_READ_IOPS_SEC_MAX'/>
+          <ref name='VIR_DOMAIN_BLOCK_IOTUNE_READ_IOPS_SEC_MAX_LENGTH'/>
           <ref name='VIR_DOMAIN_BLOCK_IOTUNE_SIZE_IOPS_SEC'/>
           <ref name='VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_BYTES_SEC'/>
           <ref name='VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_BYTES_SEC_MAX'/>
+          <ref name='VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_BYTES_SEC_MAX_LENGTH'/>
           <ref name='VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_IOPS_SEC'/>
           <ref name='VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_IOPS_SEC_MAX'/>
+          <ref name='VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_IOPS_SEC_MAX_LENGTH'/>
           <ref name='VIR_DOMAIN_BLOCK_IOTUNE_WRITE_BYTES_SEC'/>
           <ref name='VIR_DOMAIN_BLOCK_IOTUNE_WRITE_BYTES_SEC_MAX'/>
+          <ref name='VIR_DOMAIN_BLOCK_IOTUNE_WRITE_BYTES_SEC_MAX_LENGTH'/>
           <ref name='VIR_DOMAIN_BLOCK_IOTUNE_WRITE_IOPS_SEC'/>
           <ref name='VIR_DOMAIN_BLOCK_IOTUNE_WRITE_IOPS_SEC_MAX'/>
+          <ref name='VIR_DOMAIN_BLOCK_IOTUNE_WRITE_IOPS_SEC_MAX_LENGTH'/>
         </word>
         <word name='BlockJob'>
           <ref name='virDomainBlockJobAbort'/>
@@ -7527,12 +7572,6 @@
         <word name='Management'>
           <ref name='virNodeDeviceReset'/>
         </word>
-        <word name='Marco'>
-          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_READ_BYTES_SEC'/>
-          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_READ_BYTES_SEC_MAX'/>
-          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_BYTES_SEC'/>
-          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_BYTES_SEC_MAX'/>
-        </word>
         <word name='Master'>
           <ref name='virDomainBlockPeek'/>
         </word>
@@ -10198,6 +10237,18 @@
           <ref name='virDomainBlockJobSetSpeed'/>
         </word>
         <word name='allowed'>
+          <ref name='VIR_DOMAIN_BLOCK_IOTUNE_READ_BYTES_SEC_MAX_LENGTH'/>
+          <ref name='VIR_DOMAIN_BLOCK_IOTUNE_READ_IOPS_SEC_MAX_LENGTH'/>
+          <ref name='VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_BYTES_SEC_MAX_LENGTH'/>
+          <ref name='VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_IOPS_SEC_MAX_LENGTH'/>
+          <ref name='VIR_DOMAIN_BLOCK_IOTUNE_WRITE_BYTES_SEC_MAX_LENGTH'/>
+          <ref name='VIR_DOMAIN_BLOCK_IOTUNE_WRITE_IOPS_SEC_MAX_LENGTH'/>
+          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_READ_BYTES_SEC_MAX_LENGTH'/>
+          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_READ_IOPS_SEC_MAX_LENGTH'/>
+          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_BYTES_SEC_MAX_LENGTH'/>
+          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_IOPS_SEC_MAX_LENGTH'/>
+          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_BYTES_SEC_MAX_LENGTH'/>
+          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_IOPS_SEC_MAX_LENGTH'/>
           <ref name='VIR_MIGRATE_PARAM_DEST_NAME'/>
           <ref name='_virDomainInfo'/>
           <ref name='virConnectGetAllDomainStats'/>
@@ -10885,6 +10936,12 @@
           <ref name='virDomainSetSchedulerParametersFlags'/>
         </word>
         <word name='blkdeviotune'>
+          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_READ_BYTES_SEC_MAX_LENGTH'/>
+          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_READ_IOPS_SEC_MAX_LENGTH'/>
+          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_BYTES_SEC_MAX_LENGTH'/>
+          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_IOPS_SEC_MAX_LENGTH'/>
+          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_BYTES_SEC_MAX_LENGTH'/>
+          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_IOPS_SEC_MAX_LENGTH'/>
           <ref name='virConnectDomainEventTunableCallback'/>
         </word>
         <word name='blkio'>
@@ -11048,6 +11105,26 @@
         <word name='burst'>
           <ref name='VIR_DOMAIN_BANDWIDTH_IN_BURST'/>
           <ref name='VIR_DOMAIN_BANDWIDTH_OUT_BURST'/>
+          <ref name='VIR_DOMAIN_BLOCK_IOTUNE_READ_BYTES_SEC_MAX_LENGTH'/>
+          <ref name='VIR_DOMAIN_BLOCK_IOTUNE_READ_IOPS_SEC_MAX_LENGTH'/>
+          <ref name='VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_BYTES_SEC_MAX_LENGTH'/>
+          <ref name='VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_IOPS_SEC_MAX_LENGTH'/>
+          <ref name='VIR_DOMAIN_BLOCK_IOTUNE_WRITE_BYTES_SEC_MAX_LENGTH'/>
+          <ref name='VIR_DOMAIN_BLOCK_IOTUNE_WRITE_IOPS_SEC_MAX_LENGTH'/>
+          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_READ_BYTES_SEC_MAX_LENGTH'/>
+          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_READ_IOPS_SEC_MAX_LENGTH'/>
+          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_BYTES_SEC_MAX_LENGTH'/>
+          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_IOPS_SEC_MAX_LENGTH'/>
+          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_BYTES_SEC_MAX_LENGTH'/>
+          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_IOPS_SEC_MAX_LENGTH'/>
+        </word>
+        <word name='bursts'>
+          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_READ_BYTES_SEC_MAX'/>
+          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_READ_IOPS_SEC_MAX'/>
+          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_BYTES_SEC_MAX'/>
+          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_IOPS_SEC_MAX'/>
+          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_BYTES_SEC_MAX'/>
+          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_IOPS_SEC_MAX'/>
         </word>
         <word name='button'>
           <ref name='virDomainReset'/>
@@ -12578,6 +12655,7 @@
           <ref name='virDomainSnapshotCreateXML'/>
         </word>
         <word name='describing'>
+          <ref name='VIR_PERF_PARAM_CPU_CYCLES'/>
           <ref name='virConnectCompareCPU'/>
           <ref name='virConnectDomainXMLFromNative'/>
           <ref name='virConnectDomainXMLToNative'/>
@@ -13073,6 +13151,12 @@
           <ref name='virGetVersion'/>
         </word>
         <word name='duration'>
+          <ref name='VIR_DOMAIN_BLOCK_IOTUNE_READ_BYTES_SEC_MAX_LENGTH'/>
+          <ref name='VIR_DOMAIN_BLOCK_IOTUNE_READ_IOPS_SEC_MAX_LENGTH'/>
+          <ref name='VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_BYTES_SEC_MAX_LENGTH'/>
+          <ref name='VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_IOPS_SEC_MAX_LENGTH'/>
+          <ref name='VIR_DOMAIN_BLOCK_IOTUNE_WRITE_BYTES_SEC_MAX_LENGTH'/>
+          <ref name='VIR_DOMAIN_BLOCK_IOTUNE_WRITE_IOPS_SEC_MAX_LENGTH'/>
           <ref name='virConnectDomainEventRegister'/>
           <ref name='virConnectDomainEventRegisterAny'/>
           <ref name='virConnectNetworkEventRegisterAny'/>
@@ -13138,6 +13222,10 @@
         <word name='elapse'>
           <ref name='virDomainPMWakeup'/>
         </word>
+        <word name='elapsed'>
+          <ref name='VIR_PERF_PARAM_CPU_CYCLES'/>
+          <ref name='virConnectGetAllDomainStats'/>
+        </word>
         <word name='elements'>
           <ref name='VIR_DOMAIN_BLKIO_DEVICE_READ_BPS'/>
           <ref name='VIR_DOMAIN_BLKIO_DEVICE_READ_IOPS'/>
@@ -15293,7 +15381,6 @@
         </word>
         <word name='instruction'>
           <ref name='VIR_PERF_PARAM_CPU_CYCLES'/>
-          <ref name='virConnectGetAllDomainStats'/>
         </word>
         <word name='instructions'>
           <ref name='VIR_DOMAIN_CPU_STATS_SYSTEMTIME'/>
@@ -15888,6 +15975,12 @@
           <ref name='VIR_DOMAIN_BLOCK_STATS_FIELD_LENGTH'/>
           <ref name='VIR_DOMAIN_MEMORY_FIELD_LENGTH'/>
           <ref name='VIR_DOMAIN_SCHED_FIELD_LENGTH'/>
+          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_READ_BYTES_SEC_MAX_LENGTH'/>
+          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_READ_IOPS_SEC_MAX_LENGTH'/>
+          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_BYTES_SEC_MAX_LENGTH'/>
+          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_IOPS_SEC_MAX_LENGTH'/>
+          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_BYTES_SEC_MAX_LENGTH'/>
+          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_IOPS_SEC_MAX_LENGTH'/>
           <ref name='VIR_NODE_CPU_STATS_FIELD_LENGTH'/>
           <ref name='VIR_NODE_MEMORY_STATS_FIELD_LENGTH'/>
           <ref name='VIR_SECURITY_DOI_BUFLEN'/>
@@ -17022,7 +17115,6 @@
         <word name='needs'>
           <ref name='VIR_MIGRATE_PARAM_GRAPHICS_URI'/>
           <ref name='VIR_PERF_PARAM_CPU_CYCLES'/>
-          <ref name='virConnectGetAllDomainStats'/>
           <ref name='virConnectRef'/>
           <ref name='virDomainRef'/>
           <ref name='virDomainSnapshotRef'/>
@@ -17886,6 +17978,12 @@
           <ref name='VIR_DOMAIN_SCHEDULER_IOTHREAD_QUOTA'/>
           <ref name='VIR_DOMAIN_SCHEDULER_VCPU_PERIOD'/>
           <ref name='VIR_DOMAIN_SCHEDULER_VCPU_QUOTA'/>
+          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_READ_BYTES_SEC_MAX_LENGTH'/>
+          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_READ_IOPS_SEC_MAX_LENGTH'/>
+          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_BYTES_SEC_MAX_LENGTH'/>
+          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_IOPS_SEC_MAX_LENGTH'/>
+          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_BYTES_SEC_MAX_LENGTH'/>
+          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_IOPS_SEC_MAX_LENGTH'/>
           <ref name='VIR_DOMAIN_TUNABLE_CPU_EMULATOR_PERIOD'/>
           <ref name='VIR_DOMAIN_TUNABLE_CPU_EMULATOR_QUOTA'/>
           <ref name='VIR_DOMAIN_TUNABLE_CPU_GLOBAL_PERIOD'/>
@@ -18882,6 +18980,10 @@
         <word name='read_bps'>
           <ref name='VIR_DOMAIN_BLKIO_DEVICE_READ_BPS'/>
         </word>
+        <word name='read_bytes_sec_max'>
+          <ref name='VIR_DOMAIN_BLOCK_IOTUNE_READ_BYTES_SEC_MAX_LENGTH'/>
+          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_READ_BYTES_SEC_MAX_LENGTH'/>
+        </word>
         <word name='read_iops'>
           <ref name='VIR_DOMAIN_BLKIO_DEVICE_READ_IOPS'/>
         </word>
@@ -18890,6 +18992,10 @@
           <ref name='VIR_DOMAIN_BLKIO_DEVICE_READ_IOPS'/>
           <ref name='VIR_DOMAIN_BLKIO_DEVICE_WRITE_BPS'/>
         </word>
+        <word name='read_iops_sec_max'>
+          <ref name='VIR_DOMAIN_BLOCK_IOTUNE_READ_IOPS_SEC_MAX_LENGTH'/>
+          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_READ_IOPS_SEC_MAX_LENGTH'/>
+        </word>
         <word name='readable'>
           <ref name='virStreamEventAddCallback'/>
         </word>
@@ -19987,6 +20093,18 @@
           <ref name='virDomainBlockRebase'/>
         </word>
         <word name='seconds'>
+          <ref name='VIR_DOMAIN_BLOCK_IOTUNE_READ_BYTES_SEC_MAX_LENGTH'/>
+          <ref name='VIR_DOMAIN_BLOCK_IOTUNE_READ_IOPS_SEC_MAX_LENGTH'/>
+          <ref name='VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_BYTES_SEC_MAX_LENGTH'/>
+          <ref name='VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_IOPS_SEC_MAX_LENGTH'/>
+          <ref name='VIR_DOMAIN_BLOCK_IOTUNE_WRITE_BYTES_SEC_MAX_LENGTH'/>
+          <ref name='VIR_DOMAIN_BLOCK_IOTUNE_WRITE_IOPS_SEC_MAX_LENGTH'/>
+          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_READ_BYTES_SEC_MAX_LENGTH'/>
+          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_READ_IOPS_SEC_MAX_LENGTH'/>
+          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_BYTES_SEC_MAX_LENGTH'/>
+          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_IOPS_SEC_MAX_LENGTH'/>
+          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_BYTES_SEC_MAX_LENGTH'/>
+          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_IOPS_SEC_MAX_LENGTH'/>
           <ref name='virConnectDomainEventRTCChangeCallback'/>
           <ref name='virConnectSetKeepAlive'/>
           <ref name='virDomainGetTime'/>
@@ -21576,6 +21694,14 @@
         <word name='topology'>
           <ref name='_virNodeInfo'/>
         </word>
+        <word name='total_bytes_sec_max'>
+          <ref name='VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_BYTES_SEC_MAX_LENGTH'/>
+          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_BYTES_SEC_MAX_LENGTH'/>
+        </word>
+        <word name='total_iops_sec_max'>
+          <ref name='VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_IOPS_SEC_MAX_LENGTH'/>
+          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_IOPS_SEC_MAX_LENGTH'/>
+        </word>
         <word name='track'>
           <ref name='virDomainManagedSave'/>
           <ref name='virDomainSnapshotDelete'/>
@@ -21739,33 +21865,6 @@
           <ref name='virConnectOpen'/>
           <ref name='virNodeAllocPages'/>
         </word>
-        <word name='tunable'>
-          <ref name='VIR_DOMAIN_BLKIO_DEVICE_READ_BPS'/>
-          <ref name='VIR_DOMAIN_BLKIO_DEVICE_READ_IOPS'/>
-          <ref name='VIR_DOMAIN_BLKIO_DEVICE_WEIGHT'/>
-          <ref name='VIR_DOMAIN_BLKIO_DEVICE_WRITE_BPS'/>
-          <ref name='VIR_DOMAIN_BLKIO_DEVICE_WRITE_IOPS'/>
-          <ref name='VIR_DOMAIN_BLKIO_WEIGHT'/>
-          <ref name='VIR_DOMAIN_BLOCK_IOTUNE_READ_BYTES_SEC'/>
-          <ref name='VIR_DOMAIN_BLOCK_IOTUNE_READ_BYTES_SEC_MAX'/>
-          <ref name='VIR_DOMAIN_BLOCK_IOTUNE_READ_IOPS_SEC'/>
-          <ref name='VIR_DOMAIN_BLOCK_IOTUNE_READ_IOPS_SEC_MAX'/>
-          <ref name='VIR_DOMAIN_BLOCK_IOTUNE_SIZE_IOPS_SEC'/>
-          <ref name='VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_BYTES_SEC'/>
-          <ref name='VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_BYTES_SEC_MAX'/>
-          <ref name='VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_IOPS_SEC'/>
-          <ref name='VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_IOPS_SEC_MAX'/>
-          <ref name='VIR_DOMAIN_BLOCK_IOTUNE_WRITE_BYTES_SEC'/>
-          <ref name='VIR_DOMAIN_BLOCK_IOTUNE_WRITE_BYTES_SEC_MAX'/>
-          <ref name='VIR_DOMAIN_BLOCK_IOTUNE_WRITE_IOPS_SEC'/>
-          <ref name='VIR_DOMAIN_BLOCK_IOTUNE_WRITE_IOPS_SEC_MAX'/>
-          <ref name='VIR_DOMAIN_MEMORY_HARD_LIMIT'/>
-          <ref name='VIR_DOMAIN_MEMORY_MIN_GUARANTEE'/>
-          <ref name='VIR_DOMAIN_MEMORY_SOFT_LIMIT'/>
-          <ref name='VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT'/>
-          <ref name='virConnectDomainEventTunableCallback'/>
-          <ref name='virDomainGetBlockIoTune'/>
-        </word>
         <word name='tunable:'>
           <ref name='VIR_DOMAIN_BLOCK_COPY_BANDWIDTH'/>
           <ref name='VIR_DOMAIN_BLOCK_COPY_BUF_SIZE'/>
@@ -21869,35 +21968,6 @@
           <ref name='VIR_DOMAIN_SCHEDULER_CAP'/>
           <ref name='VIR_DOMAIN_SCHEDULER_WEIGHT'/>
         </word>
-        <word name='ullong'>
-          <ref name='VIR_DOMAIN_BLOCK_COPY_BANDWIDTH'/>
-          <ref name='VIR_DOMAIN_BLOCK_IOTUNE_READ_BYTES_SEC'/>
-          <ref name='VIR_DOMAIN_BLOCK_IOTUNE_READ_BYTES_SEC_MAX'/>
-          <ref name='VIR_DOMAIN_BLOCK_IOTUNE_READ_IOPS_SEC'/>
-          <ref name='VIR_DOMAIN_BLOCK_IOTUNE_READ_IOPS_SEC_MAX'/>
-          <ref name='VIR_DOMAIN_BLOCK_IOTUNE_SIZE_IOPS_SEC'/>
-          <ref name='VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_BYTES_SEC'/>
-          <ref name='VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_BYTES_SEC_MAX'/>
-          <ref name='VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_IOPS_SEC'/>
-          <ref name='VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_IOPS_SEC_MAX'/>
-          <ref name='VIR_DOMAIN_BLOCK_IOTUNE_WRITE_BYTES_SEC'/>
-          <ref name='VIR_DOMAIN_BLOCK_IOTUNE_WRITE_BYTES_SEC_MAX'/>
-          <ref name='VIR_DOMAIN_BLOCK_IOTUNE_WRITE_IOPS_SEC'/>
-          <ref name='VIR_DOMAIN_BLOCK_IOTUNE_WRITE_IOPS_SEC_MAX'/>
-          <ref name='VIR_DOMAIN_CPU_STATS_CPUTIME'/>
-          <ref name='VIR_DOMAIN_CPU_STATS_SYSTEMTIME'/>
-          <ref name='VIR_DOMAIN_CPU_STATS_USERTIME'/>
-          <ref name='VIR_DOMAIN_CPU_STATS_VCPUTIME'/>
-          <ref name='VIR_DOMAIN_MEMORY_HARD_LIMIT'/>
-          <ref name='VIR_DOMAIN_MEMORY_MIN_GUARANTEE'/>
-          <ref name='VIR_DOMAIN_MEMORY_SOFT_LIMIT'/>
-          <ref name='VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT'/>
-          <ref name='VIR_DOMAIN_SCHEDULER_CPU_SHARES'/>
-          <ref name='VIR_DOMAIN_SCHEDULER_EMULATOR_PERIOD'/>
-          <ref name='VIR_DOMAIN_SCHEDULER_GLOBAL_PERIOD'/>
-          <ref name='VIR_DOMAIN_SCHEDULER_IOTHREAD_PERIOD'/>
-          <ref name='VIR_DOMAIN_SCHEDULER_VCPU_PERIOD'/>
-        </word>
         <word name='unable'>
           <ref name='virDomainAttachDeviceFlags'/>
           <ref name='virDomainDetachDeviceFlags'/>
@@ -23959,17 +24029,23 @@
           <ref name='VIR_DOMAIN_BLKIO_WEIGHT'/>
           <ref name='VIR_DOMAIN_BLOCK_IOTUNE_READ_BYTES_SEC'/>
           <ref name='VIR_DOMAIN_BLOCK_IOTUNE_READ_BYTES_SEC_MAX'/>
+          <ref name='VIR_DOMAIN_BLOCK_IOTUNE_READ_BYTES_SEC_MAX_LENGTH'/>
           <ref name='VIR_DOMAIN_BLOCK_IOTUNE_READ_IOPS_SEC'/>
           <ref name='VIR_DOMAIN_BLOCK_IOTUNE_READ_IOPS_SEC_MAX'/>
+          <ref name='VIR_DOMAIN_BLOCK_IOTUNE_READ_IOPS_SEC_MAX_LENGTH'/>
           <ref name='VIR_DOMAIN_BLOCK_IOTUNE_SIZE_IOPS_SEC'/>
           <ref name='VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_BYTES_SEC'/>
           <ref name='VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_BYTES_SEC_MAX'/>
+          <ref name='VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_BYTES_SEC_MAX_LENGTH'/>
           <ref name='VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_IOPS_SEC'/>
           <ref name='VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_IOPS_SEC_MAX'/>
+          <ref name='VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_IOPS_SEC_MAX_LENGTH'/>
           <ref name='VIR_DOMAIN_BLOCK_IOTUNE_WRITE_BYTES_SEC'/>
           <ref name='VIR_DOMAIN_BLOCK_IOTUNE_WRITE_BYTES_SEC_MAX'/>
+          <ref name='VIR_DOMAIN_BLOCK_IOTUNE_WRITE_BYTES_SEC_MAX_LENGTH'/>
           <ref name='VIR_DOMAIN_BLOCK_IOTUNE_WRITE_IOPS_SEC'/>
           <ref name='VIR_DOMAIN_BLOCK_IOTUNE_WRITE_IOPS_SEC_MAX'/>
+          <ref name='VIR_DOMAIN_BLOCK_IOTUNE_WRITE_IOPS_SEC_MAX_LENGTH'/>
         </word>
         <word name='weight_device:'>
           <ref name='VIR_DOMAIN_BLKIO_DEVICE_WEIGHT'/>
@@ -24114,12 +24190,20 @@
         <word name='write_bps'>
           <ref name='VIR_DOMAIN_BLKIO_DEVICE_WRITE_BPS'/>
         </word>
+        <word name='write_bytes_sec_max'>
+          <ref name='VIR_DOMAIN_BLOCK_IOTUNE_WRITE_BYTES_SEC_MAX_LENGTH'/>
+          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_BYTES_SEC_MAX_LENGTH'/>
+        </word>
         <word name='write_iops'>
           <ref name='VIR_DOMAIN_BLKIO_DEVICE_WRITE_IOPS'/>
         </word>
         <word name='write_iops_device:'>
           <ref name='VIR_DOMAIN_BLKIO_DEVICE_WRITE_IOPS'/>
         </word>
+        <word name='write_iops_sec_max'>
+          <ref name='VIR_DOMAIN_BLOCK_IOTUNE_WRITE_IOPS_SEC_MAX_LENGTH'/>
+          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_IOPS_SEC_MAX_LENGTH'/>
+        </word>
         <word name='writes'>
           <ref name='VIR_DOMAIN_BLOCK_STATS_WRITE_TOTAL_TIMES'/>
           <ref name='virConnectGetAllDomainStats'/>
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 6eeb4e9e7..dba9187aa 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -3453,6 +3453,11 @@
             <ref name="virOnOff"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="tls">
+            <ref name="virYesNo"/>
+          </attribute>
+        </optional>
         <zeroOrMore>
           <ref name='devSeclabel'/>
         </zeroOrMore>
@@ -4517,9 +4522,7 @@
   </define>
 
   <define name="sysinfo-value">
-    <data type="string">
-      <param name='pattern'>[a-zA-Z0-9/\-_\. \(\)]+</param>
-    </data>
+    <data type="string"/>
   </define>
 
   <define name="acpiTable">
@@ -4960,6 +4963,44 @@
             <data type="unsignedLong"/>
           </element>
         </optional>
+        <choice>
+          <element name="total_bytes_sec_max_length">
+            <data type="unsignedLong"/>
+          </element>
+          <group>
+            <interleave>
+              <optional>
+                <element name="read_bytes_sec_max_length">
+                  <data type="unsignedLong"/>
+                </element>
+              </optional>
+              <optional>
+                <element name="write_bytes_sec_max_length">
+                  <data type="unsignedLong"/>
+                </element>
+              </optional>
+            </interleave>
+          </group>
+        </choice>
+        <choice>
+          <element name="total_iops_sec_max_length">
+            <data type="unsignedLong"/>
+          </element>
+          <group>
+            <interleave>
+              <optional>
+                <element name="read_iops_sec_max_length">
+                  <data type="unsignedLong"/>
+                </element>
+              </optional>
+              <optional>
+                <element name="write_iops_sec_max_length">
+                  <data type="unsignedLong"/>
+                </element>
+              </optional>
+            </interleave>
+          </group>
+        </choice>
       </interleave>
     </element>
   </define>
@@ -5534,6 +5575,9 @@
         </attribute>
       </optional>
       <optional>
+        <ref name="alias"/>
+      </optional>
+      <optional>
         <ref name="address"/>
       </optional>
     </element>