New upstream version 1.2.9~rc2

Makefile.in

@@ -1448,6 +1448,8 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
+PARALLELS_SDK_CFLAGS = @PARALLELS_SDK_CFLAGS@
+PARALLELS_SDK_LIBS = @PARALLELS_SDK_LIBS@
 PARTED = @PARTED@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@

configure

@@ -873,6 +873,8 @@ BHYVECTL
 BHYVE
 WITH_PARALLELS_FALSE
 WITH_PARALLELS_TRUE
+PARALLELS_SDK_LIBS
+PARALLELS_SDK_CFLAGS
 WITH_LXC_FALSE
 WITH_LXC_TRUE
 WITH_XEN_INOTIFY_FALSE
@@ -2501,6 +2503,8 @@ SYSTEMD_DAEMON_CFLAGS
 SYSTEMD_DAEMON_LIBS
 UDEV_CFLAGS
 UDEV_LIBS
+PARALLELS_SDK_CFLAGS
+PARALLELS_SDK_LIBS
 LIBXML_CFLAGS
 LIBXML_LIBS
 GNUTLS_CFLAGS
@@ -3354,6 +3358,10 @@ Some influential environment variables:
               linker flags for SYSTEMD_DAEMON, overriding pkg-config
   UDEV_CFLAGS C compiler flags for UDEV, overriding pkg-config
   UDEV_LIBS   linker flags for UDEV, overriding pkg-config
+  PARALLELS_SDK_CFLAGS
+              C compiler flags for PARALLELS_SDK, overriding pkg-config
+  PARALLELS_SDK_LIBS
+              linker flags for PARALLELS_SDK, overriding pkg-config
   LIBXML_CFLAGS
               C compiler flags for LIBXML, overriding pkg-config
   LIBXML_LIBS linker flags for LIBXML, overriding pkg-config
@@ -62550,23 +62558,93 @@ fi
 
 
 
-if test "$with_parallels" = "check"; then
-    with_parallels=$with_linux
-    if test ! $host_cpu = 'x86_64'; then
-        with_parallels=no
-    fi
+
+if test "$with_parallels" = "yes" ||
+   test "$with_parallels" = "check"; then
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PARALLELS_SDK" >&5
+$as_echo_n "checking for PARALLELS_SDK... " >&6; }
+
+if test -n "$PARALLELS_SDK_CFLAGS"; then
+    pkg_cv_PARALLELS_SDK_CFLAGS="$PARALLELS_SDK_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"parallels-sdk\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "parallels-sdk") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_PARALLELS_SDK_CFLAGS=`$PKG_CONFIG --cflags "parallels-sdk" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
 fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$PARALLELS_SDK_LIBS"; then
+    pkg_cv_PARALLELS_SDK_LIBS="$PARALLELS_SDK_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"parallels-sdk\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "parallels-sdk") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_PARALLELS_SDK_LIBS=`$PKG_CONFIG --libs "parallels-sdk" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        PARALLELS_SDK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "parallels-sdk" 2>&1`
+        else
+	        PARALLELS_SDK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "parallels-sdk" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$PARALLELS_SDK_PKG_ERRORS" >&5
 
-if test "$with_parallels" = "yes" && test "$with_linux" = "no"; then
-    as_fn_error $? "The Parallels driver can be enabled on Linux only." "$LINENO" 5
+	PARALLELS_SDK_FOUND=no
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	PARALLELS_SDK_FOUND=no
+else
+	PARALLELS_SDK_CFLAGS=$pkg_cv_PARALLELS_SDK_CFLAGS
+	PARALLELS_SDK_LIBS=$pkg_cv_PARALLELS_SDK_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	PARALLELS_SDK_FOUND=yes
 fi
 
-if test "$with_parallels" = "yes"; then
+    if test "$with_parallels" = "yes" && test "$PARALLELS_SDK_FOUND" = "no"; then
+        as_fn_error $? "Parallels Virtualization SDK is needed to build the Parallels driver." "$LINENO" 5
+    fi
+
+    with_parallels=$PARALLELS_SDK_FOUND
+    if test "$with_parallels" = "yes"; then
 
 cat >>confdefs.h <<_ACEOF
 #define WITH_PARALLELS 1
 _ACEOF
 
+    fi
 fi
  if test "$with_parallels" = "yes"; then
   WITH_PARALLELS_TRUE=

configure.ac

@@ -1046,19 +1046,21 @@ dnl
 dnl Checks for the Parallels driver
 dnl
 
-if test "$with_parallels" = "check"; then
-    with_parallels=$with_linux
-    if test ! $host_cpu = 'x86_64'; then
-        with_parallels=no
-    fi
-fi
 
-if test "$with_parallels" = "yes" && test "$with_linux" = "no"; then
-    AC_MSG_ERROR([The Parallels driver can be enabled on Linux only.])
-fi
+if test "$with_parallels" = "yes" ||
+   test "$with_parallels" = "check"; then
+    PKG_CHECK_MODULES([PARALLELS_SDK], [parallels-sdk],
+                      [PARALLELS_SDK_FOUND=yes], [PARALLELS_SDK_FOUND=no])
 
-if test "$with_parallels" = "yes"; then
-    AC_DEFINE_UNQUOTED([WITH_PARALLELS], 1, [whether Parallels driver is enabled])
+    if test "$with_parallels" = "yes" && test "$PARALLELS_SDK_FOUND" = "no"; then
+        AC_MSG_ERROR([Parallels Virtualization SDK is needed to build the Parallels driver.])
+    fi
+
+    with_parallels=$PARALLELS_SDK_FOUND
+    if test "$with_parallels" = "yes"; then
+        AC_DEFINE_UNQUOTED([WITH_PARALLELS], 1,
+                           [whether Parallels driver is enabled])
+    fi
 fi
 AM_CONDITIONAL([WITH_PARALLELS], [test "$with_parallels" = "yes"])
 

daemon/Makefile.in

@@ -1466,6 +1466,8 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
+PARALLELS_SDK_CFLAGS = @PARALLELS_SDK_CFLAGS@
+PARALLELS_SDK_LIBS = @PARALLELS_SDK_LIBS@
 PARTED = @PARTED@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@

docs/Makefile.in

@@ -1411,6 +1411,8 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
+PARALLELS_SDK_CFLAGS = @PARALLELS_SDK_CFLAGS@
+PARALLELS_SDK_LIBS = @PARALLELS_SDK_LIBS@
 PARTED = @PARTED@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@

docs/libvirt-api.xml

@@ -48,13 +48,6 @@
      <exports symbol='VIR_DOMAIN_CPU_STATS_USERTIME' type='macro'/>
      <exports symbol='VIR_DOMAIN_CPU_STATS_VCPUTIME' type='macro'/>
      <exports symbol='VIR_DOMAIN_EVENT_CALLBACK' type='macro'/>
-     <exports symbol='VIR_DOMAIN_EVENT_CPUTUNE_CPU_SHARES' type='macro'/>
-     <exports symbol='VIR_DOMAIN_EVENT_CPUTUNE_EMULATORIN' type='macro'/>
-     <exports symbol='VIR_DOMAIN_EVENT_CPUTUNE_EMULATOR_PERIOD' type='macro'/>
-     <exports symbol='VIR_DOMAIN_EVENT_CPUTUNE_EMULATOR_QUOTA' type='macro'/>
-     <exports symbol='VIR_DOMAIN_EVENT_CPUTUNE_VCPUPIN' type='macro'/>
-     <exports symbol='VIR_DOMAIN_EVENT_CPUTUNE_VCPU_PERIOD' type='macro'/>
-     <exports symbol='VIR_DOMAIN_EVENT_CPUTUNE_VCPU_QUOTA' type='macro'/>
      <exports symbol='VIR_DOMAIN_JOB_COMPRESSION_BYTES' type='macro'/>
      <exports symbol='VIR_DOMAIN_JOB_COMPRESSION_CACHE' type='macro'/>
      <exports symbol='VIR_DOMAIN_JOB_COMPRESSION_CACHE_MISSES' type='macro'/>
@@ -98,6 +91,20 @@
      <exports symbol='VIR_DOMAIN_SCHEDULER_WEIGHT' type='macro'/>
      <exports symbol='VIR_DOMAIN_SCHED_FIELD_LENGTH' type='macro'/>
      <exports symbol='VIR_DOMAIN_SEND_KEY_MAX_KEYS' type='macro'/>
+     <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_IOPS_SEC' type='macro'/>
+     <exports symbol='VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_BYTES_SEC' type='macro'/>
+     <exports symbol='VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_IOPS_SEC' type='macro'/>
+     <exports symbol='VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_BYTES_SEC' type='macro'/>
+     <exports symbol='VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_IOPS_SEC' 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'/>
+     <exports symbol='VIR_DOMAIN_TUNABLE_CPU_EMULATOR_QUOTA' type='macro'/>
+     <exports symbol='VIR_DOMAIN_TUNABLE_CPU_VCPUPIN' type='macro'/>
+     <exports symbol='VIR_DOMAIN_TUNABLE_CPU_VCPU_PERIOD' type='macro'/>
+     <exports symbol='VIR_DOMAIN_TUNABLE_CPU_VCPU_QUOTA' type='macro'/>
      <exports symbol='VIR_GET_CPUMAP' type='macro'/>
      <exports symbol='VIR_MIGRATE_PARAM_BANDWIDTH' type='macro'/>
      <exports symbol='VIR_MIGRATE_PARAM_DEST_NAME' type='macro'/>
@@ -1720,27 +1727,6 @@
     <macro name='VIR_DOMAIN_EVENT_CALLBACK' file='libvirt'>
       <info><![CDATA[Used to cast the event specific callback into the generic one for use for virConnectDomainEventRegisterAny()]]></info>
     </macro>
-    <macro name='VIR_DOMAIN_EVENT_CPUTUNE_CPU_SHARES' file='libvirt'>
-      <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>
-    </macro>
-    <macro name='VIR_DOMAIN_EVENT_CPUTUNE_EMULATORIN' file='libvirt'>
-      <info><![CDATA[Macro represents formatted pinning for emulator process, as VIR_TYPED_PARAM_STRING.]]></info>
-    </macro>
-    <macro name='VIR_DOMAIN_EVENT_CPUTUNE_EMULATOR_PERIOD' file='libvirt'>
-      <info><![CDATA[Macro represents the enforcement period for a quota in microseconds, when using the posix scheduler, for all emulator activity not tied to vcpus, as VIR_TYPED_PARAM_ULLONG.]]></info>
-    </macro>
-    <macro name='VIR_DOMAIN_EVENT_CPUTUNE_EMULATOR_QUOTA' file='libvirt'>
-      <info><![CDATA[Macro represents the maximum bandwidth to be used within a period for all emulator activity not tied to vcpus, when using the posix scheduler, as an VIR_TYPED_PARAM_LLONG.]]></info>
-    </macro>
-    <macro name='VIR_DOMAIN_EVENT_CPUTUNE_VCPUPIN' file='libvirt'>
-      <info><![CDATA[Macro represents formatted pinning for one vcpu specified by id which is appended to the parameter name, for example "cputune.vcpupin1", as VIR_TYPED_PARAM_STRING.]]></info>
-    </macro>
-    <macro name='VIR_DOMAIN_EVENT_CPUTUNE_VCPU_PERIOD' file='libvirt'>
-      <info><![CDATA[Macro represents the enforcement period for a quota, in microseconds, for vcpus only, when using the posix scheduler, as VIR_TYPED_PARAM_ULLONG.]]></info>
-    </macro>
-    <macro name='VIR_DOMAIN_EVENT_CPUTUNE_VCPU_QUOTA' file='libvirt'>
-      <info><![CDATA[Macro represents the maximum bandwidth to be used within a period for vcpus only, when using the posix scheduler, as VIR_TYPED_PARAM_LLONG.]]></info>
-    </macro>
     <macro name='VIR_DOMAIN_JOB_COMPRESSION_BYTES' file='libvirt'>
       <info><![CDATA[virDomainGetJobStats field: number of compressed bytes transferred since the beginning of migration, as VIR_TYPED_PARAM_ULLONG.]]></info>
     </macro>
@@ -1870,6 +1856,48 @@
     <macro name='VIR_DOMAIN_SEND_KEY_MAX_KEYS' file='libvirt'>
       <info><![CDATA[Maximum number of keycodes that can be sent in one virDomainSendKey() call.]]></info>
     </macro>
+    <macro name='VIR_DOMAIN_TUNABLE_BLKDEV_DISK' file='libvirt'>
+      <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'>
+      <info><![CDATA[Marco represents the read throughput limit in bytes per second, as VIR_TYPED_PARAM_ULLONG.]]></info>
+    </macro>
+    <macro name='VIR_DOMAIN_TUNABLE_BLKDEV_READ_IOPS_SEC' file='libvirt'>
+      <info><![CDATA[Macro represents the read I/O operations per second, as VIR_TYPED_PARAM_ULLONG.]]></info>
+    </macro>
+    <macro name='VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_BYTES_SEC' file='libvirt'>
+      <info><![CDATA[Marco represents the total throughput limit in bytes per second, as VIR_TYPED_PARAM_ULLONG.]]></info>
+    </macro>
+    <macro name='VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_IOPS_SEC' file='libvirt'>
+      <info><![CDATA[Macro represents the total I/O operations per second, as VIR_TYPED_PARAM_ULLONG.]]></info>
+    </macro>
+    <macro name='VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_BYTES_SEC' file='libvirt'>
+      <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_IOPS_SEC' file='libvirt'>
+      <info><![CDATA[Macro represents the write I/O operations per second, as VIR_TYPED_PARAM_ULLONG.]]></info>
+    </macro>
+    <macro name='VIR_DOMAIN_TUNABLE_CPU_CPU_SHARES' file='libvirt'>
+      <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>
+    </macro>
+    <macro name='VIR_DOMAIN_TUNABLE_CPU_EMULATORPIN' file='libvirt'>
+      <info><![CDATA[Macro represents formatted pinning for emulator process, as VIR_TYPED_PARAM_STRING.]]></info>
+    </macro>
+    <macro name='VIR_DOMAIN_TUNABLE_CPU_EMULATOR_PERIOD' file='libvirt'>
+      <info><![CDATA[Macro represents the enforcement period for a quota in microseconds, when using the posix scheduler, for all emulator activity not tied to vcpus, as VIR_TYPED_PARAM_ULLONG.]]></info>
+    </macro>
+    <macro name='VIR_DOMAIN_TUNABLE_CPU_EMULATOR_QUOTA' file='libvirt'>
+      <info><![CDATA[Macro represents the maximum bandwidth to be used within a period for all emulator activity not tied to vcpus, when using the posix scheduler, as an VIR_TYPED_PARAM_LLONG.]]></info>
+    </macro>
+    <macro name='VIR_DOMAIN_TUNABLE_CPU_VCPUPIN' file='libvirt'>
+      <info><![CDATA[Macro represents formatted pinning for one vcpu specified by id which is appended to the parameter name, for example "cputune.vcpupin1", as VIR_TYPED_PARAM_STRING.]]></info>
+    </macro>
+    <macro name='VIR_DOMAIN_TUNABLE_CPU_VCPU_PERIOD' file='libvirt'>
+      <info><![CDATA[Macro represents the enforcement period for a quota, in microseconds, for vcpus only, when using the posix scheduler, as VIR_TYPED_PARAM_ULLONG.]]></info>
+    </macro>
+    <macro name='VIR_DOMAIN_TUNABLE_CPU_VCPU_QUOTA' file='libvirt'>
+      <info><![CDATA[Macro represents the maximum bandwidth to be used within a period for vcpus only, when using the posix scheduler, as VIR_TYPED_PARAM_LLONG.]]></info>
+    </macro>
     <macro name='VIR_GET_CPUMAP' file='libvirt'>
       <info><![CDATA[This macro is to be used in conjunction with virDomainGetVcpus() and virDomainPinVcpu() APIs. VIR_GET_CPUMAP macro returns a pointer to the cpumap of the specified vcpu from cpumaps array.]]></info>
       <arg name='cpumaps' info='pointer to an array of cpumap (in 8-bit bytes) (IN)'/>
@@ -3689,6 +3717,7 @@ handler is executed.
 
 Currently supported name spaces:
  "cputune.*"
+ "blkdeviotune.*"
 
 The callback signature to use when registering for an event of type
 VIR_DOMAIN_EVENT_ID_TUNABLE with virConnectDomainEventRegisterAny()]]></info>

docs/libvirt-refs.xml

@@ -203,13 +203,6 @@
     <reference name='VIR_DOMAIN_DISK_ERROR_NO_SPACE' href='html/libvirt-libvirt.html#VIR_DOMAIN_DISK_ERROR_NO_SPACE'/>
     <reference name='VIR_DOMAIN_DISK_ERROR_UNSPEC' href='html/libvirt-libvirt.html#VIR_DOMAIN_DISK_ERROR_UNSPEC'/>
     <reference name='VIR_DOMAIN_EVENT_CALLBACK' href='html/libvirt-libvirt.html#VIR_DOMAIN_EVENT_CALLBACK'/>
-    <reference name='VIR_DOMAIN_EVENT_CPUTUNE_CPU_SHARES' href='html/libvirt-libvirt.html#VIR_DOMAIN_EVENT_CPUTUNE_CPU_SHARES'/>
-    <reference name='VIR_DOMAIN_EVENT_CPUTUNE_EMULATORIN' href='html/libvirt-libvirt.html#VIR_DOMAIN_EVENT_CPUTUNE_EMULATORIN'/>
-    <reference name='VIR_DOMAIN_EVENT_CPUTUNE_EMULATOR_PERIOD' href='html/libvirt-libvirt.html#VIR_DOMAIN_EVENT_CPUTUNE_EMULATOR_PERIOD'/>
-    <reference name='VIR_DOMAIN_EVENT_CPUTUNE_EMULATOR_QUOTA' href='html/libvirt-libvirt.html#VIR_DOMAIN_EVENT_CPUTUNE_EMULATOR_QUOTA'/>
-    <reference name='VIR_DOMAIN_EVENT_CPUTUNE_VCPUPIN' href='html/libvirt-libvirt.html#VIR_DOMAIN_EVENT_CPUTUNE_VCPUPIN'/>
-    <reference name='VIR_DOMAIN_EVENT_CPUTUNE_VCPU_PERIOD' href='html/libvirt-libvirt.html#VIR_DOMAIN_EVENT_CPUTUNE_VCPU_PERIOD'/>
-    <reference name='VIR_DOMAIN_EVENT_CPUTUNE_VCPU_QUOTA' href='html/libvirt-libvirt.html#VIR_DOMAIN_EVENT_CPUTUNE_VCPU_QUOTA'/>
     <reference name='VIR_DOMAIN_EVENT_CRASHED' href='html/libvirt-libvirt.html#VIR_DOMAIN_EVENT_CRASHED'/>
     <reference name='VIR_DOMAIN_EVENT_CRASHED_LAST' href='html/libvirt-libvirt.html#VIR_DOMAIN_EVENT_CRASHED_LAST'/>
     <reference name='VIR_DOMAIN_EVENT_CRASHED_PANICKED' href='html/libvirt-libvirt.html#VIR_DOMAIN_EVENT_CRASHED_PANICKED'/>
@@ -555,6 +548,20 @@
     <reference name='VIR_DOMAIN_STATS_STATE' href='html/libvirt-libvirt.html#VIR_DOMAIN_STATS_STATE'/>
     <reference name='VIR_DOMAIN_STATS_VCPU' href='html/libvirt-libvirt.html#VIR_DOMAIN_STATS_VCPU'/>
     <reference name='VIR_DOMAIN_TIME_SYNC' href='html/libvirt-libvirt.html#VIR_DOMAIN_TIME_SYNC'/>
+    <reference name='VIR_DOMAIN_TUNABLE_BLKDEV_DISK' href='html/libvirt-libvirt.html#VIR_DOMAIN_TUNABLE_BLKDEV_DISK'/>
+    <reference name='VIR_DOMAIN_TUNABLE_BLKDEV_READ_BYTES_SEC' href='html/libvirt-libvirt.html#VIR_DOMAIN_TUNABLE_BLKDEV_READ_BYTES_SEC'/>
+    <reference name='VIR_DOMAIN_TUNABLE_BLKDEV_READ_IOPS_SEC' href='html/libvirt-libvirt.html#VIR_DOMAIN_TUNABLE_BLKDEV_READ_IOPS_SEC'/>
+    <reference name='VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_BYTES_SEC' href='html/libvirt-libvirt.html#VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_BYTES_SEC'/>
+    <reference name='VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_IOPS_SEC' href='html/libvirt-libvirt.html#VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_IOPS_SEC'/>
+    <reference name='VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_BYTES_SEC' href='html/libvirt-libvirt.html#VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_BYTES_SEC'/>
+    <reference name='VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_IOPS_SEC' href='html/libvirt-libvirt.html#VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_IOPS_SEC'/>
+    <reference name='VIR_DOMAIN_TUNABLE_CPU_CPU_SHARES' href='html/libvirt-libvirt.html#VIR_DOMAIN_TUNABLE_CPU_CPU_SHARES'/>
+    <reference name='VIR_DOMAIN_TUNABLE_CPU_EMULATORPIN' href='html/libvirt-libvirt.html#VIR_DOMAIN_TUNABLE_CPU_EMULATORPIN'/>
+    <reference name='VIR_DOMAIN_TUNABLE_CPU_EMULATOR_PERIOD' href='html/libvirt-libvirt.html#VIR_DOMAIN_TUNABLE_CPU_EMULATOR_PERIOD'/>
+    <reference name='VIR_DOMAIN_TUNABLE_CPU_EMULATOR_QUOTA' href='html/libvirt-libvirt.html#VIR_DOMAIN_TUNABLE_CPU_EMULATOR_QUOTA'/>
+    <reference name='VIR_DOMAIN_TUNABLE_CPU_VCPUPIN' href='html/libvirt-libvirt.html#VIR_DOMAIN_TUNABLE_CPU_VCPUPIN'/>
+    <reference name='VIR_DOMAIN_TUNABLE_CPU_VCPU_PERIOD' href='html/libvirt-libvirt.html#VIR_DOMAIN_TUNABLE_CPU_VCPU_PERIOD'/>
+    <reference name='VIR_DOMAIN_TUNABLE_CPU_VCPU_QUOTA' href='html/libvirt-libvirt.html#VIR_DOMAIN_TUNABLE_CPU_VCPU_QUOTA'/>
     <reference name='VIR_DOMAIN_UNDEFINE_MANAGED_SAVE' href='html/libvirt-libvirt.html#VIR_DOMAIN_UNDEFINE_MANAGED_SAVE'/>
     <reference name='VIR_DOMAIN_UNDEFINE_NVRAM' href='html/libvirt-libvirt.html#VIR_DOMAIN_UNDEFINE_NVRAM'/>
     <reference name='VIR_DOMAIN_UNDEFINE_SNAPSHOTS_METADATA' href='html/libvirt-libvirt.html#VIR_DOMAIN_UNDEFINE_SNAPSHOTS_METADATA'/>
@@ -1772,13 +1779,6 @@
       <ref name='VIR_DOMAIN_DISK_ERROR_NO_SPACE'/>
       <ref name='VIR_DOMAIN_DISK_ERROR_UNSPEC'/>
       <ref name='VIR_DOMAIN_EVENT_CALLBACK'/>
-      <ref name='VIR_DOMAIN_EVENT_CPUTUNE_CPU_SHARES'/>
-      <ref name='VIR_DOMAIN_EVENT_CPUTUNE_EMULATORIN'/>
-      <ref name='VIR_DOMAIN_EVENT_CPUTUNE_EMULATOR_PERIOD'/>
-      <ref name='VIR_DOMAIN_EVENT_CPUTUNE_EMULATOR_QUOTA'/>
-      <ref name='VIR_DOMAIN_EVENT_CPUTUNE_VCPUPIN'/>
-      <ref name='VIR_DOMAIN_EVENT_CPUTUNE_VCPU_PERIOD'/>
-      <ref name='VIR_DOMAIN_EVENT_CPUTUNE_VCPU_QUOTA'/>
       <ref name='VIR_DOMAIN_EVENT_CRASHED'/>
       <ref name='VIR_DOMAIN_EVENT_CRASHED_LAST'/>
       <ref name='VIR_DOMAIN_EVENT_CRASHED_PANICKED'/>
@@ -2124,6 +2124,20 @@
       <ref name='VIR_DOMAIN_STATS_STATE'/>
       <ref name='VIR_DOMAIN_STATS_VCPU'/>
       <ref name='VIR_DOMAIN_TIME_SYNC'/>
+      <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_DISK'/>
+      <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_READ_BYTES_SEC'/>
+      <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_READ_IOPS_SEC'/>
+      <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_BYTES_SEC'/>
+      <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_IOPS_SEC'/>
+      <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_BYTES_SEC'/>
+      <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_IOPS_SEC'/>
+      <ref name='VIR_DOMAIN_TUNABLE_CPU_CPU_SHARES'/>
+      <ref name='VIR_DOMAIN_TUNABLE_CPU_EMULATORPIN'/>
+      <ref name='VIR_DOMAIN_TUNABLE_CPU_EMULATOR_PERIOD'/>
+      <ref name='VIR_DOMAIN_TUNABLE_CPU_EMULATOR_QUOTA'/>
+      <ref name='VIR_DOMAIN_TUNABLE_CPU_VCPUPIN'/>
+      <ref name='VIR_DOMAIN_TUNABLE_CPU_VCPU_PERIOD'/>
+      <ref name='VIR_DOMAIN_TUNABLE_CPU_VCPU_QUOTA'/>
       <ref name='VIR_DOMAIN_UNDEFINE_MANAGED_SAVE'/>
       <ref name='VIR_DOMAIN_UNDEFINE_NVRAM'/>
       <ref name='VIR_DOMAIN_UNDEFINE_SNAPSHOTS_METADATA'/>
@@ -4496,13 +4510,6 @@
       <ref name='VIR_DOMAIN_DISK_ERROR_NO_SPACE'/>
       <ref name='VIR_DOMAIN_DISK_ERROR_UNSPEC'/>
       <ref name='VIR_DOMAIN_EVENT_CALLBACK'/>
-      <ref name='VIR_DOMAIN_EVENT_CPUTUNE_CPU_SHARES'/>
-      <ref name='VIR_DOMAIN_EVENT_CPUTUNE_EMULATORIN'/>
-      <ref name='VIR_DOMAIN_EVENT_CPUTUNE_EMULATOR_PERIOD'/>
-      <ref name='VIR_DOMAIN_EVENT_CPUTUNE_EMULATOR_QUOTA'/>
-      <ref name='VIR_DOMAIN_EVENT_CPUTUNE_VCPUPIN'/>
-      <ref name='VIR_DOMAIN_EVENT_CPUTUNE_VCPU_PERIOD'/>
-      <ref name='VIR_DOMAIN_EVENT_CPUTUNE_VCPU_QUOTA'/>
       <ref name='VIR_DOMAIN_EVENT_CRASHED'/>
       <ref name='VIR_DOMAIN_EVENT_CRASHED_LAST'/>
       <ref name='VIR_DOMAIN_EVENT_CRASHED_PANICKED'/>
@@ -4848,6 +4855,20 @@
       <ref name='VIR_DOMAIN_STATS_STATE'/>
       <ref name='VIR_DOMAIN_STATS_VCPU'/>
       <ref name='VIR_DOMAIN_TIME_SYNC'/>
+      <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_DISK'/>
+      <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_READ_BYTES_SEC'/>
+      <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_READ_IOPS_SEC'/>
+      <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_BYTES_SEC'/>
+      <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_IOPS_SEC'/>
+      <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_BYTES_SEC'/>
+      <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_IOPS_SEC'/>
+      <ref name='VIR_DOMAIN_TUNABLE_CPU_CPU_SHARES'/>
+      <ref name='VIR_DOMAIN_TUNABLE_CPU_EMULATORPIN'/>
+      <ref name='VIR_DOMAIN_TUNABLE_CPU_EMULATOR_PERIOD'/>
+      <ref name='VIR_DOMAIN_TUNABLE_CPU_EMULATOR_QUOTA'/>
+      <ref name='VIR_DOMAIN_TUNABLE_CPU_VCPUPIN'/>
+      <ref name='VIR_DOMAIN_TUNABLE_CPU_VCPU_PERIOD'/>
+      <ref name='VIR_DOMAIN_TUNABLE_CPU_VCPU_QUOTA'/>
       <ref name='VIR_DOMAIN_UNDEFINE_MANAGED_SAVE'/>
       <ref name='VIR_DOMAIN_UNDEFINE_NVRAM'/>
       <ref name='VIR_DOMAIN_UNDEFINE_SNAPSHOTS_METADATA'/>
@@ -6724,6 +6745,10 @@
         <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_TOTAL_BYTES_SEC'/>
+        </word>
         <word name='Master'>
           <ref name='virDomainBlockPeek'/>
         </word>
@@ -8578,46 +8603,18 @@
           <ref name='VIR_DOMAIN_SCHED_FIELD_LENGTH'/>
         </word>
         <word name='VIR_TYPED_PARAM_LLONG'>
-          <ref name='VIR_DOMAIN_EVENT_CPUTUNE_EMULATOR_QUOTA'/>
-          <ref name='VIR_DOMAIN_EVENT_CPUTUNE_VCPU_QUOTA'/>
+          <ref name='VIR_DOMAIN_TUNABLE_CPU_EMULATOR_QUOTA'/>
+          <ref name='VIR_DOMAIN_TUNABLE_CPU_VCPU_QUOTA'/>
         </word>
         <word name='VIR_TYPED_PARAM_STRING'>
-          <ref name='VIR_DOMAIN_EVENT_CPUTUNE_EMULATORIN'/>
-          <ref name='VIR_DOMAIN_EVENT_CPUTUNE_VCPUPIN'/>
+          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_DISK'/>
+          <ref name='VIR_DOMAIN_TUNABLE_CPU_EMULATORPIN'/>
+          <ref name='VIR_DOMAIN_TUNABLE_CPU_VCPUPIN'/>
           <ref name='VIR_MIGRATE_PARAM_DEST_NAME'/>
           <ref name='VIR_MIGRATE_PARAM_DEST_XML'/>
           <ref name='VIR_MIGRATE_PARAM_GRAPHICS_URI'/>
           <ref name='VIR_MIGRATE_PARAM_URI'/>
         </word>
-        <word name='VIR_TYPED_PARAM_ULLONG'>
-          <ref name='VIR_DOMAIN_EVENT_CPUTUNE_CPU_SHARES'/>
-          <ref name='VIR_DOMAIN_EVENT_CPUTUNE_EMULATOR_PERIOD'/>
-          <ref name='VIR_DOMAIN_EVENT_CPUTUNE_VCPU_PERIOD'/>
-          <ref name='VIR_DOMAIN_JOB_COMPRESSION_BYTES'/>
-          <ref name='VIR_DOMAIN_JOB_COMPRESSION_CACHE'/>
-          <ref name='VIR_DOMAIN_JOB_COMPRESSION_CACHE_MISSES'/>
-          <ref name='VIR_DOMAIN_JOB_COMPRESSION_OVERFLOW'/>
-          <ref name='VIR_DOMAIN_JOB_COMPRESSION_PAGES'/>
-          <ref name='VIR_DOMAIN_JOB_DATA_PROCESSED'/>
-          <ref name='VIR_DOMAIN_JOB_DATA_REMAINING'/>
-          <ref name='VIR_DOMAIN_JOB_DATA_TOTAL'/>
-          <ref name='VIR_DOMAIN_JOB_DISK_BPS'/>
-          <ref name='VIR_DOMAIN_JOB_DISK_PROCESSED'/>
-          <ref name='VIR_DOMAIN_JOB_DISK_REMAINING'/>
-          <ref name='VIR_DOMAIN_JOB_DISK_TOTAL'/>
-          <ref name='VIR_DOMAIN_JOB_DOWNTIME'/>
-          <ref name='VIR_DOMAIN_JOB_MEMORY_BPS'/>
-          <ref name='VIR_DOMAIN_JOB_MEMORY_CONSTANT'/>
-          <ref name='VIR_DOMAIN_JOB_MEMORY_NORMAL'/>
-          <ref name='VIR_DOMAIN_JOB_MEMORY_NORMAL_BYTES'/>
-          <ref name='VIR_DOMAIN_JOB_MEMORY_PROCESSED'/>
-          <ref name='VIR_DOMAIN_JOB_MEMORY_REMAINING'/>
-          <ref name='VIR_DOMAIN_JOB_MEMORY_TOTAL'/>
-          <ref name='VIR_DOMAIN_JOB_SETUP_TIME'/>
-          <ref name='VIR_DOMAIN_JOB_TIME_ELAPSED'/>
-          <ref name='VIR_DOMAIN_JOB_TIME_REMAINING'/>
-          <ref name='VIR_MIGRATE_PARAM_BANDWIDTH'/>
-        </word>
         <word name='VIR_UUID_BUFLEN'>
           <ref name='virDomainGetUUID'/>
           <ref name='virNWFilterGetUUID'/>
@@ -8863,10 +8860,10 @@
           <ref name='virNodeGetSecurityModel'/>
         </word>
         <word name='activity'>
-          <ref name='VIR_DOMAIN_EVENT_CPUTUNE_EMULATOR_PERIOD'/>
-          <ref name='VIR_DOMAIN_EVENT_CPUTUNE_EMULATOR_QUOTA'/>
           <ref name='VIR_DOMAIN_SCHEDULER_EMULATOR_PERIOD'/>
           <ref name='VIR_DOMAIN_SCHEDULER_EMULATOR_QUOTA'/>
+          <ref name='VIR_DOMAIN_TUNABLE_CPU_EMULATOR_PERIOD'/>
+          <ref name='VIR_DOMAIN_TUNABLE_CPU_EMULATOR_QUOTA'/>
         </word>
         <word name='actual'>
           <ref name='VIR_DOMAIN_BLOCK_COPY_BANDWIDTH'/>
@@ -9257,7 +9254,7 @@
           <ref name='virDomainSnapshotCreateXML'/>
         </word>
         <word name='appended'>
-          <ref name='VIR_DOMAIN_EVENT_CPUTUNE_VCPUPIN'/>
+          <ref name='VIR_DOMAIN_TUNABLE_CPU_VCPUPIN'/>
         </word>
         <word name='applicable'>
           <ref name='virConnectGetAllDomainStats'/>
@@ -9796,6 +9793,9 @@
           <ref name='virDomainSetInterfaceParameters'/>
           <ref name='virDomainSetSchedulerParametersFlags'/>
         </word>
+        <word name='blkdeviotune'>
+          <ref name='virConnectDomainEventTunableCallback'/>
+        </word>
         <word name='blkio'>
           <ref name='VIR_DOMAIN_BLKIO_DEVICE_READ_BPS'/>
           <ref name='VIR_DOMAIN_BLKIO_DEVICE_READ_IOPS'/>
@@ -11058,7 +11058,7 @@
           <ref name='virDomainGetCPUStats'/>
         </word>
         <word name='cputune'>
-          <ref name='VIR_DOMAIN_EVENT_CPUTUNE_VCPUPIN'/>
+          <ref name='VIR_DOMAIN_TUNABLE_CPU_VCPUPIN'/>
           <ref name='virConnectDomainEventTunableCallback'/>
         </word>
         <word name='crashed'>
@@ -11925,11 +11925,11 @@
           <ref name='virDomainReset'/>
         </word>
         <word name='emulator'>
-          <ref name='VIR_DOMAIN_EVENT_CPUTUNE_EMULATORIN'/>
-          <ref name='VIR_DOMAIN_EVENT_CPUTUNE_EMULATOR_PERIOD'/>
-          <ref name='VIR_DOMAIN_EVENT_CPUTUNE_EMULATOR_QUOTA'/>
           <ref name='VIR_DOMAIN_SCHEDULER_EMULATOR_PERIOD'/>
           <ref name='VIR_DOMAIN_SCHEDULER_EMULATOR_QUOTA'/>
+          <ref name='VIR_DOMAIN_TUNABLE_CPU_EMULATORPIN'/>
+          <ref name='VIR_DOMAIN_TUNABLE_CPU_EMULATOR_PERIOD'/>
+          <ref name='VIR_DOMAIN_TUNABLE_CPU_EMULATOR_QUOTA'/>
           <ref name='virConnectGetDomainCapabilities'/>
           <ref name='virDomainGetEmulatorPinInfo'/>
           <ref name='virDomainPinEmulator'/>
@@ -12003,10 +12003,10 @@
           <ref name='virDomainSetMetadata'/>
         </word>
         <word name='enforcement'>
-          <ref name='VIR_DOMAIN_EVENT_CPUTUNE_EMULATOR_PERIOD'/>
-          <ref name='VIR_DOMAIN_EVENT_CPUTUNE_VCPU_PERIOD'/>
           <ref name='VIR_DOMAIN_SCHEDULER_EMULATOR_PERIOD'/>
           <ref name='VIR_DOMAIN_SCHEDULER_VCPU_PERIOD'/>
+          <ref name='VIR_DOMAIN_TUNABLE_CPU_EMULATOR_PERIOD'/>
+          <ref name='VIR_DOMAIN_TUNABLE_CPU_VCPU_PERIOD'/>
         </word>
         <word name='enlarge'>
           <ref name='virStorageVolResize'/>
@@ -12763,8 +12763,8 @@
           <ref name='virDomainCoreDumpWithFormat'/>
         </word>
         <word name='formatted'>
-          <ref name='VIR_DOMAIN_EVENT_CPUTUNE_EMULATORIN'/>
-          <ref name='VIR_DOMAIN_EVENT_CPUTUNE_VCPUPIN'/>
+          <ref name='VIR_DOMAIN_TUNABLE_CPU_EMULATORPIN'/>
+          <ref name='VIR_DOMAIN_TUNABLE_CPU_VCPUPIN'/>
           <ref name='virNetworkGetDHCPLeases'/>
         </word>
         <word name='formed'>
@@ -15070,10 +15070,10 @@
           <ref name='micro'/>
         </word>
         <word name='microseconds'>
-          <ref name='VIR_DOMAIN_EVENT_CPUTUNE_EMULATOR_PERIOD'/>
-          <ref name='VIR_DOMAIN_EVENT_CPUTUNE_VCPU_PERIOD'/>
           <ref name='VIR_DOMAIN_SCHEDULER_EMULATOR_PERIOD'/>
           <ref name='VIR_DOMAIN_SCHEDULER_VCPU_PERIOD'/>
+          <ref name='VIR_DOMAIN_TUNABLE_CPU_EMULATOR_PERIOD'/>
+          <ref name='VIR_DOMAIN_TUNABLE_CPU_VCPU_PERIOD'/>
         </word>
         <word name='migrate'>
           <ref name='virDomainMigrate'/>
@@ -15938,6 +15938,9 @@
           <ref name='VIR_DOMAIN_BLOCK_IOTUNE_READ_IOPS_SEC'/>
           <ref name='VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_IOPS_SEC'/>
           <ref name='VIR_DOMAIN_BLOCK_IOTUNE_WRITE_IOPS_SEC'/>
+          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_READ_IOPS_SEC'/>
+          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_IOPS_SEC'/>
+          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_IOPS_SEC'/>
           <ref name='virDomainBlockJobAbort'/>
           <ref name='virDomainDetachDeviceFlags'/>
           <ref name='virDomainGetDiskErrors'/>
@@ -16231,6 +16234,12 @@
           <ref name='VIR_DOMAIN_BLOCK_IOTUNE_WRITE_IOPS_SEC'/>
           <ref name='VIR_DOMAIN_JOB_DISK_BPS'/>
           <ref name='VIR_DOMAIN_JOB_MEMORY_BPS'/>
+          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_READ_BYTES_SEC'/>
+          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_READ_IOPS_SEC'/>
+          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_BYTES_SEC'/>
+          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_IOPS_SEC'/>
+          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_BYTES_SEC'/>
+          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_IOPS_SEC'/>
           <ref name='_virNodeInfo'/>
           <ref name='virDomainGetCPUStats'/>
           <ref name='virDomainScreenshot'/>
@@ -16269,14 +16278,14 @@
           <ref name='virDomainBlockJobAbort'/>
         </word>
         <word name='period'>
-          <ref name='VIR_DOMAIN_EVENT_CPUTUNE_EMULATOR_PERIOD'/>
-          <ref name='VIR_DOMAIN_EVENT_CPUTUNE_EMULATOR_QUOTA'/>
-          <ref name='VIR_DOMAIN_EVENT_CPUTUNE_VCPU_PERIOD'/>
-          <ref name='VIR_DOMAIN_EVENT_CPUTUNE_VCPU_QUOTA'/>
           <ref name='VIR_DOMAIN_SCHEDULER_EMULATOR_PERIOD'/>
           <ref name='VIR_DOMAIN_SCHEDULER_EMULATOR_QUOTA'/>
           <ref name='VIR_DOMAIN_SCHEDULER_VCPU_PERIOD'/>
           <ref name='VIR_DOMAIN_SCHEDULER_VCPU_QUOTA'/>
+          <ref name='VIR_DOMAIN_TUNABLE_CPU_EMULATOR_PERIOD'/>
+          <ref name='VIR_DOMAIN_TUNABLE_CPU_EMULATOR_QUOTA'/>
+          <ref name='VIR_DOMAIN_TUNABLE_CPU_VCPU_PERIOD'/>
+          <ref name='VIR_DOMAIN_TUNABLE_CPU_VCPU_QUOTA'/>
           <ref name='virDomainSetMemoryStatsPeriod'/>
         </word>
         <word name='permanent'>
@@ -16360,8 +16369,8 @@
           <ref name='virDomainGetEmulatorPinInfo'/>
         </word>
         <word name='pinning'>
-          <ref name='VIR_DOMAIN_EVENT_CPUTUNE_EMULATORIN'/>
-          <ref name='VIR_DOMAIN_EVENT_CPUTUNE_VCPUPIN'/>
+          <ref name='VIR_DOMAIN_TUNABLE_CPU_EMULATORPIN'/>
+          <ref name='VIR_DOMAIN_TUNABLE_CPU_VCPUPIN'/>
           <ref name='virDomainGetCPUStats'/>
         </word>
         <word name='pipe'>
@@ -16489,16 +16498,16 @@
           <ref name='virSecretGetUsageType'/>
         </word>
         <word name='posix'>
-          <ref name='VIR_DOMAIN_EVENT_CPUTUNE_CPU_SHARES'/>
-          <ref name='VIR_DOMAIN_EVENT_CPUTUNE_EMULATOR_PERIOD'/>
-          <ref name='VIR_DOMAIN_EVENT_CPUTUNE_EMULATOR_QUOTA'/>
-          <ref name='VIR_DOMAIN_EVENT_CPUTUNE_VCPU_PERIOD'/>
-          <ref name='VIR_DOMAIN_EVENT_CPUTUNE_VCPU_QUOTA'/>
           <ref name='VIR_DOMAIN_SCHEDULER_CPU_SHARES'/>
           <ref name='VIR_DOMAIN_SCHEDULER_EMULATOR_PERIOD'/>
           <ref name='VIR_DOMAIN_SCHEDULER_EMULATOR_QUOTA'/>
           <ref name='VIR_DOMAIN_SCHEDULER_VCPU_PERIOD'/>
           <ref name='VIR_DOMAIN_SCHEDULER_VCPU_QUOTA'/>
+          <ref name='VIR_DOMAIN_TUNABLE_CPU_CPU_SHARES'/>
+          <ref name='VIR_DOMAIN_TUNABLE_CPU_EMULATOR_PERIOD'/>
+          <ref name='VIR_DOMAIN_TUNABLE_CPU_EMULATOR_QUOTA'/>
+          <ref name='VIR_DOMAIN_TUNABLE_CPU_VCPU_PERIOD'/>
+          <ref name='VIR_DOMAIN_TUNABLE_CPU_VCPU_QUOTA'/>
         </word>
         <word name='possibility'>
           <ref name='virConnectListAllDomains'/>
@@ -16747,7 +16756,7 @@
           <ref name='virDomainBlockRebase'/>
         </word>
         <word name='process'>
-          <ref name='VIR_DOMAIN_EVENT_CPUTUNE_EMULATORIN'/>
+          <ref name='VIR_DOMAIN_TUNABLE_CPU_EMULATORPIN'/>
           <ref name='virDomainCreateWithFiles'/>
           <ref name='virDomainCreateXMLWithFiles'/>
           <ref name='virDomainGetCPUStats'/>
@@ -16826,8 +16835,8 @@
           <ref name='virDomainBlockRebase'/>
         </word>
         <word name='proportional'>
-          <ref name='VIR_DOMAIN_EVENT_CPUTUNE_CPU_SHARES'/>
           <ref name='VIR_DOMAIN_SCHEDULER_CPU_SHARES'/>
+          <ref name='VIR_DOMAIN_TUNABLE_CPU_CPU_SHARES'/>
         </word>
         <word name='proportionally'>
           <ref name='virNodeAllocPages'/>
@@ -17022,10 +17031,10 @@
           <ref name='virDomainShutdownFlags'/>
         </word>
         <word name='quota'>
-          <ref name='VIR_DOMAIN_EVENT_CPUTUNE_EMULATOR_PERIOD'/>
-          <ref name='VIR_DOMAIN_EVENT_CPUTUNE_VCPU_PERIOD'/>
           <ref name='VIR_DOMAIN_SCHEDULER_EMULATOR_PERIOD'/>
           <ref name='VIR_DOMAIN_SCHEDULER_VCPU_PERIOD'/>
+          <ref name='VIR_DOMAIN_TUNABLE_CPU_EMULATOR_PERIOD'/>
+          <ref name='VIR_DOMAIN_TUNABLE_CPU_VCPU_PERIOD'/>
         </word>
       </letter>
       <letter name='r'>
@@ -17152,6 +17161,8 @@
           <ref name='VIR_DOMAIN_BLOCK_IOTUNE_READ_IOPS_SEC'/>
           <ref name='VIR_DOMAIN_BLOCK_STATS_READ_BYTES'/>
           <ref name='VIR_DOMAIN_BLOCK_STATS_READ_REQ'/>
+          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_READ_BYTES_SEC'/>
+          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_READ_IOPS_SEC'/>
           <ref name='_virDomainBlockStats'/>
           <ref name='virConnectGetAllDomainStats'/>
           <ref name='virDomainBlockPeek'/>
@@ -19552,6 +19563,9 @@
         <word name='throughput'>
           <ref name='VIR_DOMAIN_JOB_DISK_BPS'/>
           <ref name='VIR_DOMAIN_JOB_MEMORY_BPS'/>
+          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_READ_BYTES_SEC'/>
+          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_BYTES_SEC'/>
+          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_BYTES_SEC'/>
         </word>
         <word name='thrown'>
           <ref name='virDomainSnapshotCreateXML'/>
@@ -19562,10 +19576,10 @@
           <ref name='virConnectNetworkEventRegisterAny'/>
         </word>
         <word name='tied'>
-          <ref name='VIR_DOMAIN_EVENT_CPUTUNE_EMULATOR_PERIOD'/>
-          <ref name='VIR_DOMAIN_EVENT_CPUTUNE_EMULATOR_QUOTA'/>
           <ref name='VIR_DOMAIN_SCHEDULER_EMULATOR_PERIOD'/>
           <ref name='VIR_DOMAIN_SCHEDULER_EMULATOR_QUOTA'/>
+          <ref name='VIR_DOMAIN_TUNABLE_CPU_EMULATOR_PERIOD'/>
+          <ref name='VIR_DOMAIN_TUNABLE_CPU_EMULATOR_QUOTA'/>
           <ref name='virNetworkGetXMLDesc'/>
         </word>
         <word name='till'>
@@ -20171,6 +20185,7 @@
           <ref name='virNetworkUpdate'/>
         </word>
         <word name='updated'>
+          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_DISK'/>
           <ref name='virConnectDomainEventTunableCallback'/>
           <ref name='virDomainGetBlockJobInfo'/>
           <ref name='virDomainIsUpdated'/>
@@ -20337,6 +20352,7 @@
         </word>
         <word name='values'>
           <ref name='VIR_DOMAIN_BLOCK_COPY_BANDWIDTH'/>
+          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_DISK'/>
           <ref name='_virConnectAuth'/>
           <ref name='virConnectDomainEventTunableCallback'/>
           <ref name='virConnectGetLibVersion'/>
@@ -20388,23 +20404,23 @@
           <ref name='VIR_CPU_USABLE'/>
           <ref name='VIR_DOMAIN_CPU_STATS_CPUTIME'/>
           <ref name='VIR_DOMAIN_CPU_STATS_VCPUTIME'/>
-          <ref name='VIR_DOMAIN_EVENT_CPUTUNE_VCPUPIN'/>
+          <ref name='VIR_DOMAIN_TUNABLE_CPU_VCPUPIN'/>
           <ref name='VIR_GET_CPUMAP'/>
           <ref name='virConnectGetAllDomainStats'/>
           <ref name='virDomainGetCPUStats'/>
         </word>
         <word name='vcpupin1'>
-          <ref name='VIR_DOMAIN_EVENT_CPUTUNE_VCPUPIN'/>
+          <ref name='VIR_DOMAIN_TUNABLE_CPU_VCPUPIN'/>
         </word>
         <word name='vcpus'>
-          <ref name='VIR_DOMAIN_EVENT_CPUTUNE_EMULATOR_PERIOD'/>
-          <ref name='VIR_DOMAIN_EVENT_CPUTUNE_EMULATOR_QUOTA'/>
-          <ref name='VIR_DOMAIN_EVENT_CPUTUNE_VCPU_PERIOD'/>
-          <ref name='VIR_DOMAIN_EVENT_CPUTUNE_VCPU_QUOTA'/>
           <ref name='VIR_DOMAIN_SCHEDULER_EMULATOR_PERIOD'/>
           <ref name='VIR_DOMAIN_SCHEDULER_EMULATOR_QUOTA'/>
           <ref name='VIR_DOMAIN_SCHEDULER_VCPU_PERIOD'/>
           <ref name='VIR_DOMAIN_SCHEDULER_VCPU_QUOTA'/>
+          <ref name='VIR_DOMAIN_TUNABLE_CPU_EMULATOR_PERIOD'/>
+          <ref name='VIR_DOMAIN_TUNABLE_CPU_EMULATOR_QUOTA'/>
+          <ref name='VIR_DOMAIN_TUNABLE_CPU_VCPU_PERIOD'/>
+          <ref name='VIR_DOMAIN_TUNABLE_CPU_VCPU_QUOTA'/>
           <ref name='virDomainGetVcpuPinInfo'/>
           <ref name='virDomainGetVcpus'/>
         </word>
@@ -21856,9 +21872,9 @@
         <word name='weight'>
           <ref name='VIR_DOMAIN_BLKIO_DEVICE_WEIGHT'/>
           <ref name='VIR_DOMAIN_BLKIO_WEIGHT'/>
-          <ref name='VIR_DOMAIN_EVENT_CPUTUNE_CPU_SHARES'/>
           <ref name='VIR_DOMAIN_SCHEDULER_CPU_SHARES'/>
           <ref name='VIR_DOMAIN_SCHEDULER_WEIGHT'/>
+          <ref name='VIR_DOMAIN_TUNABLE_CPU_CPU_SHARES'/>
         </word>
         <word name='weight:'>
           <ref name='VIR_DOMAIN_BLKIO_WEIGHT'/>
@@ -21981,6 +21997,8 @@
           <ref name='VIR_DOMAIN_BLOCK_IOTUNE_WRITE_IOPS_SEC'/>
           <ref name='VIR_DOMAIN_BLOCK_STATS_WRITE_BYTES'/>
           <ref name='VIR_DOMAIN_BLOCK_STATS_WRITE_REQ'/>
+          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_BYTES_SEC'/>
+          <ref name='VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_IOPS_SEC'/>
           <ref name='_virDomainBlockStats'/>
           <ref name='virConnectGetAllDomainStats'/>
           <ref name='virStreamRecv'/>

docs/schemas/Makefile.in

@@ -1351,6 +1351,8 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
+PARALLELS_SDK_CFLAGS = @PARALLELS_SDK_CFLAGS@
+PARALLELS_SDK_LIBS = @PARALLELS_SDK_LIBS@
 PARTED = @PARTED@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@

docs/schemas/storagepool.rng

@@ -465,7 +465,7 @@
       <element name='format'>
         <attribute name='type'>
           <choice>
-            <value>auto</value>
+            <value>unknown</value> <!-- back-compat requires keeping 'unknown' not 'auto' -->
             <value>lvm2</value>
           </choice>
         </attribute>

docs/storage.html

@@ -458,11 +458,10 @@
       &lt;/pool&gt;</pre>
         <h3>Valid pool format types</h3>
         <p>
-      The logical volume pool supports the following formats:
+      The logical volume pool supports only the <code>lvm2</code> format,
+      although not supplying a format value will result in automatic
+      selection of the<code>lvm2</code> format.
     </p>
-        <ul><li><code>auto</code> - automatically determine format</li><li>
-        <code>lvm2</code>
-      </li></ul>
         <h3>Valid volume format types</h3>
         <p>
       The logical volume pool does not use the volume format type element.

docs/storage.html.in

@@ -328,14 +328,10 @@
 
     <h3>Valid pool format types</h3>
     <p>
-      The logical volume pool supports the following formats:
+      The logical volume pool supports only the <code>lvm2</code> format,
+      although not supplying a format value will result in automatic
+      selection of the<code>lvm2</code> format.
     </p>
-    <ul>
-      <li><code>auto</code> - automatically determine format</li>
-      <li>
-        <code>lvm2</code>
-      </li>
-    </ul>
 
     <h3>Valid volume format types</h3>
     <p>

examples/apparmor/Makefile.in

@@ -1352,6 +1352,8 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
+PARALLELS_SDK_CFLAGS = @PARALLELS_SDK_CFLAGS@
+PARALLELS_SDK_LIBS = @PARALLELS_SDK_LIBS@
 PARTED = @PARTED@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@

examples/dominfo/Makefile.in

@@ -1378,6 +1378,8 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
+PARALLELS_SDK_CFLAGS = @PARALLELS_SDK_CFLAGS@
+PARALLELS_SDK_LIBS = @PARALLELS_SDK_LIBS@
 PARTED = @PARTED@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@

examples/dommigrate/Makefile.in

@@ -1375,6 +1375,8 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
+PARALLELS_SDK_CFLAGS = @PARALLELS_SDK_CFLAGS@
+PARALLELS_SDK_LIBS = @PARALLELS_SDK_LIBS@
 PARTED = @PARTED@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@

examples/domsuspend/Makefile.in

@@ -1378,6 +1378,8 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
+PARALLELS_SDK_CFLAGS = @PARALLELS_SDK_CFLAGS@
+PARALLELS_SDK_LIBS = @PARALLELS_SDK_LIBS@
 PARTED = @PARTED@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@

examples/domtop/Makefile.in

@@ -1379,6 +1379,8 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
+PARALLELS_SDK_CFLAGS = @PARALLELS_SDK_CFLAGS@
+PARALLELS_SDK_LIBS = @PARALLELS_SDK_LIBS@
 PARTED = @PARTED@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@

examples/hellolibvirt/Makefile.in

@@ -1375,6 +1375,8 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
+PARALLELS_SDK_CFLAGS = @PARALLELS_SDK_CFLAGS@
+PARALLELS_SDK_LIBS = @PARALLELS_SDK_LIBS@
 PARTED = @PARTED@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@

examples/lxcconvert/Makefile.in

@@ -1321,6 +1321,8 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
+PARALLELS_SDK_CFLAGS = @PARALLELS_SDK_CFLAGS@
+PARALLELS_SDK_LIBS = @PARALLELS_SDK_LIBS@
 PARTED = @PARTED@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@

examples/object-events/Makefile.in

@@ -1376,6 +1376,8 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
+PARALLELS_SDK_CFLAGS = @PARALLELS_SDK_CFLAGS@
+PARALLELS_SDK_LIBS = @PARALLELS_SDK_LIBS@
 PARTED = @PARTED@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@

examples/object-events/event-test.c

@@ -476,15 +476,6 @@ myDomainEventTunableCallback(virConnectPtr conn ATTRIBUTE_UNUSED,
     printf("%s EVENT: Domain %s(%d) tunable updated:\n",
            __func__, virDomainGetName(dom), virDomainGetID(dom));
 
-#ifdef WIN32
-/* MinGW doesn't know the lld/llu so we have to use I64f/I64u instead. */
-# define LLD_FORMAT "%I64d"
-# define LLU_FORMAT "%I64u"
-#else /* WIN32 */
-# define LLD_FORMAT "%lld"
-# define LLU_FORMAT "%llu"
-#endif /* WIN32 */
-
     for (i = 0; i < nparams; i++) {
         switch (params[i].type) {
         case VIR_TYPED_PARAM_INT:
@@ -494,10 +485,12 @@ myDomainEventTunableCallback(virConnectPtr conn ATTRIBUTE_UNUSED,
             printf("\t%s: %u\n", params[i].field, params[i].value.ui);
             break;
         case VIR_TYPED_PARAM_LLONG:
-            printf("\t%s: " LLD_FORMAT "\n", params[i].field, params[i].value.l);
+            printf("\t%s: %" PRId64 "\n", params[i].field,
+                   (int64_t) params[i].value.l);
             break;
         case VIR_TYPED_PARAM_ULLONG:
-            printf("\t%s: " LLU_FORMAT "\n", params[i].field, params[i].value.ul);
+            printf("\t%s: %" PRIu64 "\n", params[i].field,
+                   (uint64_t) params[i].value.ul);
             break;
         case VIR_TYPED_PARAM_DOUBLE:
             printf("\t%s: %g\n", params[i].field, params[i].value.d);

examples/openauth/Makefile.in

@@ -1375,6 +1375,8 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
+PARALLELS_SDK_CFLAGS = @PARALLELS_SDK_CFLAGS@
+PARALLELS_SDK_LIBS = @PARALLELS_SDK_LIBS@
 PARTED = @PARTED@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@

examples/systemtap/Makefile.in

@@ -1321,6 +1321,8 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
+PARALLELS_SDK_CFLAGS = @PARALLELS_SDK_CFLAGS@
+PARALLELS_SDK_LIBS = @PARALLELS_SDK_LIBS@
 PARTED = @PARTED@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@

examples/xml/nwfilter/Makefile.in

@@ -1321,6 +1321,8 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
+PARALLELS_SDK_CFLAGS = @PARALLELS_SDK_CFLAGS@
+PARALLELS_SDK_LIBS = @PARALLELS_SDK_LIBS@
 PARTED = @PARTED@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@

gnulib/lib/Makefile.in

@@ -1407,6 +1407,8 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
+PARALLELS_SDK_CFLAGS = @PARALLELS_SDK_CFLAGS@
+PARALLELS_SDK_LIBS = @PARALLELS_SDK_LIBS@
 PARTED = @PARTED@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@

gnulib/tests/Makefile.in

@@ -2854,6 +2854,8 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
+PARALLELS_SDK_CFLAGS = @PARALLELS_SDK_CFLAGS@
+PARALLELS_SDK_LIBS = @PARALLELS_SDK_LIBS@
 PARTED = @PARTED@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@

include/Makefile.in

@@ -1381,6 +1381,8 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
+PARALLELS_SDK_CFLAGS = @PARALLELS_SDK_CFLAGS@
+PARALLELS_SDK_LIBS = @PARALLELS_SDK_LIBS@
 PARTED = @PARTED@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@

include/libvirt/Makefile.in

@@ -1370,6 +1370,8 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
+PARALLELS_SDK_CFLAGS = @PARALLELS_SDK_CFLAGS@
+PARALLELS_SDK_LIBS = @PARALLELS_SDK_LIBS@
 PARTED = @PARTED@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@

include/libvirt/libvirt.h

@@ -5204,64 +5204,119 @@ typedef void (*virConnectDomainEventDeviceRemovedCallback)(virConnectPtr conn,
                                                            void *opaque);
 
 /**
- * VIR_DOMAIN_EVENT_CPUTUNE_VCPUPIN:
+ * VIR_DOMAIN_TUNABLE_CPU_VCPUPIN:
  *
  * Macro represents formatted pinning for one vcpu specified by id which is
  * appended to the parameter name, for example "cputune.vcpupin1",
  * as VIR_TYPED_PARAM_STRING.
  */
-#define VIR_DOMAIN_EVENT_CPUTUNE_VCPUPIN "cputune.vcpupin%u"
+#define VIR_DOMAIN_TUNABLE_CPU_VCPUPIN "cputune.vcpupin%u"
 
 /**
- * VIR_DOMAIN_EVENT_CPUTUNE_EMULATORIN:
+ * VIR_DOMAIN_TUNABLE_CPU_EMULATORPIN:
  *
  * Macro represents formatted pinning for emulator process,
  * as VIR_TYPED_PARAM_STRING.
  */
-#define VIR_DOMAIN_EVENT_CPUTUNE_EMULATORIN "cputune.emulatorpin"
+#define VIR_DOMAIN_TUNABLE_CPU_EMULATORPIN "cputune.emulatorpin"
 
 /**
- * VIR_DOMAIN_EVENT_CPUTUNE_CPU_SHARES:
+ * VIR_DOMAIN_TUNABLE_CPU_CPU_SHARES:
  *
  * Macro represents proportional weight of the scheduler used on the
  * host cpu, when using the posix scheduler, as VIR_TYPED_PARAM_ULLONG.
  */
-#define VIR_DOMAIN_EVENT_CPUTUNE_CPU_SHARES "cputune.cpu_shares"
+#define VIR_DOMAIN_TUNABLE_CPU_CPU_SHARES "cputune.cpu_shares"
 
 /**
- * VIR_DOMAIN_EVENT_CPUTUNE_VCPU_PERIOD:
+ * VIR_DOMAIN_TUNABLE_CPU_VCPU_PERIOD:
  *
  * Macro represents the enforcement period for a quota, in microseconds,
  * for vcpus only, when using the posix scheduler, as VIR_TYPED_PARAM_ULLONG.
  */
-#define VIR_DOMAIN_EVENT_CPUTUNE_VCPU_PERIOD "cputune.vcpu_period"
+#define VIR_DOMAIN_TUNABLE_CPU_VCPU_PERIOD "cputune.vcpu_period"
 
 /**
- * VIR_DOMAIN_EVENT_CPUTUNE_VCPU_QUOTA:
+ * VIR_DOMAIN_TUNABLE_CPU_VCPU_QUOTA:
  *
  * Macro represents the maximum bandwidth to be used within a period for
  * vcpus only, when using the posix scheduler, as VIR_TYPED_PARAM_LLONG.
  */
-#define VIR_DOMAIN_EVENT_CPUTUNE_VCPU_QUOTA "cputune.vcpu_quota"
+#define VIR_DOMAIN_TUNABLE_CPU_VCPU_QUOTA "cputune.vcpu_quota"
 
 /**
- * VIR_DOMAIN_EVENT_CPUTUNE_EMULATOR_PERIOD:
+ * VIR_DOMAIN_TUNABLE_CPU_EMULATOR_PERIOD:
  *
  * Macro represents the enforcement period for a quota in microseconds,
  * when using the posix scheduler, for all emulator activity not tied to
  * vcpus, as VIR_TYPED_PARAM_ULLONG.
  */
-#define VIR_DOMAIN_EVENT_CPUTUNE_EMULATOR_PERIOD "cputune.emulator_period"
+#define VIR_DOMAIN_TUNABLE_CPU_EMULATOR_PERIOD "cputune.emulator_period"
 
 /**
- * VIR_DOMAIN_EVENT_CPUTUNE_EMULATOR_QUOTA:
+ * VIR_DOMAIN_TUNABLE_CPU_EMULATOR_QUOTA:
  *
  * Macro represents the maximum bandwidth to be used within a period for
  * all emulator activity not tied to vcpus, when using the posix scheduler,
  * as an VIR_TYPED_PARAM_LLONG.
  */
-#define VIR_DOMAIN_EVENT_CPUTUNE_EMULATOR_QUOTA "cputune.emulator_quota"
+#define VIR_DOMAIN_TUNABLE_CPU_EMULATOR_QUOTA "cputune.emulator_quota"
 
+/**
+ * VIR_DOMAIN_TUNABLE_BLKDEV_DISK:
+ *
+ * Macro represents the name of guest disk for which the values are updated,
+ * as VIR_TYPED_PARAM_STRING.
+ */
+#define VIR_DOMAIN_TUNABLE_BLKDEV_DISK "blkdeviotune.disk"
+
+/**
+ * VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_BYTES_SEC:
+ *
+ * Marco represents the total throughput limit in bytes per second,
+ * as VIR_TYPED_PARAM_ULLONG.
+ */
+#define VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_BYTES_SEC "blkdeviotune.total_bytes_sec"
+
+/**
+ * VIR_DOMAIN_TUNABLE_BLKDEV_READ_BYTES_SEC:
+ *
+ * Marco represents the read throughput limit in bytes per second,
+ * as VIR_TYPED_PARAM_ULLONG.
+ */
+#define VIR_DOMAIN_TUNABLE_BLKDEV_READ_BYTES_SEC "blkdeviotune.read_bytes_sec"
+
+/**
+ * VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_BYTES_SEC:
+ *
+ * Macro represents the write throughput limit in bytes per second,
+ * as VIR_TYPED_PARAM_ULLONG.
+ */
+#define VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_BYTES_SEC "blkdeviotune.write_bytes_sec"
+
+/**
+ * VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_IOPS_SEC:
+ *
+ * Macro represents the total I/O operations per second,
+ * as VIR_TYPED_PARAM_ULLONG.
+ */
+#define VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_IOPS_SEC "blkdeviotune.total_iops_sec"
+
+/**
+ * VIR_DOMAIN_TUNABLE_BLKDEV_READ_IOPS_SEC:
+ *
+ * Macro represents the read I/O operations per second,
+ * as VIR_TYPED_PARAM_ULLONG.
+ */
+#define VIR_DOMAIN_TUNABLE_BLKDEV_READ_IOPS_SEC "blkdeviotune.read_iops_sec"
+
+/**
+ * VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_IOPS_SEC:
+ *
+ * Macro represents the write I/O operations per second,
+ * as VIR_TYPED_PARAM_ULLONG.
+ */
+#define VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_IOPS_SEC "blkdeviotune.write_iops_sec"
 
 /**
  * virConnectDomainEventTunableCallback:
@@ -5277,6 +5332,7 @@ typedef void (*virConnectDomainEventDeviceRemovedCallback)(virConnectPtr conn,
  *
  * Currently supported name spaces:
  *  "cputune.*"
+ *  "blkdeviotune.*"
  *
  * The callback signature to use when registering for an event of type
  * VIR_DOMAIN_EVENT_ID_TUNABLE with virConnectDomainEventRegisterAny()

include/libvirt/libvirt.h.in

@@ -5204,64 +5204,119 @@ typedef void (*virConnectDomainEventDeviceRemovedCallback)(virConnectPtr conn,
                                                            void *opaque);
 
 /**
- * VIR_DOMAIN_EVENT_CPUTUNE_VCPUPIN:
+ * VIR_DOMAIN_TUNABLE_CPU_VCPUPIN:
  *
  * Macro represents formatted pinning for one vcpu specified by id which is
  * appended to the parameter name, for example "cputune.vcpupin1",
  * as VIR_TYPED_PARAM_STRING.
  */
-#define VIR_DOMAIN_EVENT_CPUTUNE_VCPUPIN "cputune.vcpupin%u"
+#define VIR_DOMAIN_TUNABLE_CPU_VCPUPIN "cputune.vcpupin%u"
 
 /**
- * VIR_DOMAIN_EVENT_CPUTUNE_EMULATORIN:
+ * VIR_DOMAIN_TUNABLE_CPU_EMULATORPIN:
  *
  * Macro represents formatted pinning for emulator process,
  * as VIR_TYPED_PARAM_STRING.
  */
-#define VIR_DOMAIN_EVENT_CPUTUNE_EMULATORIN "cputune.emulatorpin"
+#define VIR_DOMAIN_TUNABLE_CPU_EMULATORPIN "cputune.emulatorpin"
 
 /**
- * VIR_DOMAIN_EVENT_CPUTUNE_CPU_SHARES:
+ * VIR_DOMAIN_TUNABLE_CPU_CPU_SHARES:
  *
  * Macro represents proportional weight of the scheduler used on the
  * host cpu, when using the posix scheduler, as VIR_TYPED_PARAM_ULLONG.
  */
-#define VIR_DOMAIN_EVENT_CPUTUNE_CPU_SHARES "cputune.cpu_shares"
+#define VIR_DOMAIN_TUNABLE_CPU_CPU_SHARES "cputune.cpu_shares"
 
 /**
- * VIR_DOMAIN_EVENT_CPUTUNE_VCPU_PERIOD:
+ * VIR_DOMAIN_TUNABLE_CPU_VCPU_PERIOD:
  *
  * Macro represents the enforcement period for a quota, in microseconds,
  * for vcpus only, when using the posix scheduler, as VIR_TYPED_PARAM_ULLONG.
  */
-#define VIR_DOMAIN_EVENT_CPUTUNE_VCPU_PERIOD "cputune.vcpu_period"
+#define VIR_DOMAIN_TUNABLE_CPU_VCPU_PERIOD "cputune.vcpu_period"
 
 /**
- * VIR_DOMAIN_EVENT_CPUTUNE_VCPU_QUOTA:
+ * VIR_DOMAIN_TUNABLE_CPU_VCPU_QUOTA:
  *
  * Macro represents the maximum bandwidth to be used within a period for
  * vcpus only, when using the posix scheduler, as VIR_TYPED_PARAM_LLONG.
  */
-#define VIR_DOMAIN_EVENT_CPUTUNE_VCPU_QUOTA "cputune.vcpu_quota"
+#define VIR_DOMAIN_TUNABLE_CPU_VCPU_QUOTA "cputune.vcpu_quota"
 
 /**
- * VIR_DOMAIN_EVENT_CPUTUNE_EMULATOR_PERIOD:
+ * VIR_DOMAIN_TUNABLE_CPU_EMULATOR_PERIOD:
  *
  * Macro represents the enforcement period for a quota in microseconds,
  * when using the posix scheduler, for all emulator activity not tied to
  * vcpus, as VIR_TYPED_PARAM_ULLONG.
  */
-#define VIR_DOMAIN_EVENT_CPUTUNE_EMULATOR_PERIOD "cputune.emulator_period"
+#define VIR_DOMAIN_TUNABLE_CPU_EMULATOR_PERIOD "cputune.emulator_period"
 
 /**
- * VIR_DOMAIN_EVENT_CPUTUNE_EMULATOR_QUOTA:
+ * VIR_DOMAIN_TUNABLE_CPU_EMULATOR_QUOTA:
  *
  * Macro represents the maximum bandwidth to be used within a period for
  * all emulator activity not tied to vcpus, when using the posix scheduler,
  * as an VIR_TYPED_PARAM_LLONG.
  */
-#define VIR_DOMAIN_EVENT_CPUTUNE_EMULATOR_QUOTA "cputune.emulator_quota"
+#define VIR_DOMAIN_TUNABLE_CPU_EMULATOR_QUOTA "cputune.emulator_quota"
 
+/**
+ * VIR_DOMAIN_TUNABLE_BLKDEV_DISK:
+ *
+ * Macro represents the name of guest disk for which the values are updated,
+ * as VIR_TYPED_PARAM_STRING.
+ */
+#define VIR_DOMAIN_TUNABLE_BLKDEV_DISK "blkdeviotune.disk"
+
+/**
+ * VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_BYTES_SEC:
+ *
+ * Marco represents the total throughput limit in bytes per second,
+ * as VIR_TYPED_PARAM_ULLONG.
+ */
+#define VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_BYTES_SEC "blkdeviotune.total_bytes_sec"
+
+/**
+ * VIR_DOMAIN_TUNABLE_BLKDEV_READ_BYTES_SEC:
+ *
+ * Marco represents the read throughput limit in bytes per second,
+ * as VIR_TYPED_PARAM_ULLONG.
+ */
+#define VIR_DOMAIN_TUNABLE_BLKDEV_READ_BYTES_SEC "blkdeviotune.read_bytes_sec"
+
+/**
+ * VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_BYTES_SEC:
+ *
+ * Macro represents the write throughput limit in bytes per second,
+ * as VIR_TYPED_PARAM_ULLONG.
+ */
+#define VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_BYTES_SEC "blkdeviotune.write_bytes_sec"
+
+/**
+ * VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_IOPS_SEC:
+ *
+ * Macro represents the total I/O operations per second,
+ * as VIR_TYPED_PARAM_ULLONG.
+ */
+#define VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_IOPS_SEC "blkdeviotune.total_iops_sec"
+
+/**
+ * VIR_DOMAIN_TUNABLE_BLKDEV_READ_IOPS_SEC:
+ *
+ * Macro represents the read I/O operations per second,
+ * as VIR_TYPED_PARAM_ULLONG.
+ */
+#define VIR_DOMAIN_TUNABLE_BLKDEV_READ_IOPS_SEC "blkdeviotune.read_iops_sec"
+
+/**
+ * VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_IOPS_SEC:
+ *
+ * Macro represents the write I/O operations per second,
+ * as VIR_TYPED_PARAM_ULLONG.
+ */
+#define VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_IOPS_SEC "blkdeviotune.write_iops_sec"
 
 /**
  * virConnectDomainEventTunableCallback:
@@ -5277,6 +5332,7 @@ typedef void (*virConnectDomainEventDeviceRemovedCallback)(virConnectPtr conn,
  *
  * Currently supported name spaces:
  *  "cputune.*"
+ *  "blkdeviotune.*"
  *
  * The callback signature to use when registering for an event of type
  * VIR_DOMAIN_EVENT_ID_TUNABLE with virConnectDomainEventRegisterAny()