api: disallow virConnect*HypervisorCPU on read-only connections

These APIs can be used to execute arbitrary emulators.
Forbid them on read-only connections.

Fixes: CVE-2019-10168
Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
(cherry picked from commit bf6c2830b6)
Signed-off-by: Ján Tomko <jtomko@redhat.com>

.ctags

@@ -3,3 +3,4 @@
 --exclude=*.html
 --exclude=*.html.in
 --langmap=c:+.h.in
+--c-kinds=+p

.mailmap

@@ -20,7 +20,6 @@
 <jfehlig@suse.com> <jfehlig@novell.com>
 <jfehlig@suse.com> <jfehlig@linux-ypgk.site>
 <jclift@redhat.com> <justin@salasaga.org>
-<berrange@redhat.com> <dan@berrange.com>
 <soren@linux2go.dk> <soren@canonical.com>
 <cfergeau@redhat.com> <teuf@gnome.org>
 <wency@cn.fujitsu.com> <wency cn fujitsu com>
@@ -39,6 +38,11 @@
 <zhlcindy@linux.vnet.ibm.com> <zhlcindy@gmail.com>
 <serge.hallyn@canonical.com> <serue@us.ibm.com>
 <pritesh.kothari@sun.com> <Pritesh.Kothari@Sun.COM>
+<cbosdonnat@suse.com> <cedric.bosdonnat@free.fr>
+<mnestratov@virtuozzo.com> <mnestratov@parallels.com>
+<nshirokovskiy@virtuozzo.com> <nshirokovskiy@parallels.com>
+<jyang@redhat.com> <osier@yunify.com>
+<kkoukiou@redhat.com> <k.koukiou@googlemail.com>
 
 # Name consolidation:
 # Preferred author spelling <preferred email>
@@ -56,9 +60,16 @@ Aurelien Rougemont <beorn@binaries.fr>
 Serge E. Hallyn <serge.hallyn@canonical.com>
 Henrik Persson E <henrik.e.persson@ericsson.com>
 Philipp Hahn <hahn@univention.de>
-Marco Bozzolan <bozzolan@gmail.com>
-Marco Bozzolan <redshift@gmx.com>
 Pritesh Kothari <pritesh.kothari@sun.com>
 Wang Yufei (James) <james.wangyufei@huawei.com>
 Deepak C Shetty <dpkshetty@gmail.com>
+Dave Allan <dallan@redhat.com>
+Richard W.M. Jones <rjones@redhat.com>
+
+# Non-trivial consolidation:
+# see git documentation for information about the format
 Daniel P. Berrangé <berrange@redhat.com>
+Daniel P. Berrangé <berrange@redhat.com> <dan@berrange.com>
+Michal Prívozník <mprivozn@redhat.com>
+Michal Prívozník <mprivozn@redhat.com> <miso.privoznik@gmail.com>
+Marco Bozzolan <bozzolan@gmail.com> <redshift@gmx.com>

.travis.yml

@@ -46,7 +46,7 @@ script:
       -e VIR_TEST_DEBUG="$VIR_TEST_DEBUG"
       -e MINGW="$MINGW"
       -e DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS"
-      "libvirt/buildenv-$IMAGE"
+      "quay.io/libvirt/buildenv-$IMAGE:master"
       /bin/sh -xc "$DOCKER_CMD"
 
 git:

AUTHORS.in

@@ -14,7 +14,7 @@ Christian Ehrhardt <christian.ehrhardt@canonical.com>
 Christophe Fergeau <cfergeau@redhat.com>
 Claudio Bley <claudio.bley@gmail.com>
 Cole Robinson <crobinso@redhat.com>
-Daniel Berrange <berrange@redhat.com>
+Daniel P. Berrangé <berrange@redhat.com>
 Daniel Veillard <veillard@redhat.com>
 Doug Goldstein <cardoe@gentoo.org>
 Eric Blake <eblake@redhat.com>
@@ -25,6 +25,7 @@ Ján Tomko <jtomko@redhat.com>
 Jim Fehlig <jfehlig@suse.com>
 Jiří Denemark <jdenemar@redhat.com>
 John Ferlan <jferlan@redhat.com>
+Katerina Koukiou <kkoukiou@redhat.com>
 Laine Stump <laine@redhat.com>
 Mark McLoughlin <markmc@redhat.com>
 Martin Kletzander <mkletzan@redhat.com>
@@ -90,9 +91,7 @@ Stefan de Konink <dekonink@kinkrsoftware.nl>
 Takahashi Tomohiro <takatom@jp.fujitsu.com>
 Tatsuro Enokura <fj7716hz@aa.jp.fujitsu.com>
 
-#authorslist#
-
-[....send patches to get your name here....]
+#contributorslist#
 
 The libvirt logo was designed by Diana Fong
 

Makefile.am

@@ -80,7 +80,7 @@ check-access:
 cov: clean-cov
 	$(MKDIR_P) $(top_builddir)/coverage
 	$(LCOV) -c -o $(top_builddir)/coverage/libvirt.info.tmp \
-	  -d $(top_builddir)/src  -d $(top_builddir)/daemon \
+	  -d $(top_builddir)/src \
 	  -d $(top_builddir)/tests
 	$(LCOV) -r $(top_builddir)/coverage/libvirt.info.tmp \
 	  -o $(top_builddir)/coverage/libvirt.info
@@ -109,9 +109,17 @@ gen-ChangeLog:
 
 .PHONY: gen-AUTHORS
 gen-AUTHORS:
-	$(AM_V_GEN)if test -d $(srcdir)/.git; then \
-	    out="`cd $(srcdir) && git log --pretty=format:'%aN <%aE>' | sort -u`" && \
-	    perl -p -e "s/#authorslist#// and print '$$out'" \
-	      < $(srcdir)/AUTHORS.in > $(distdir)/AUTHORS-tmp && \
-	    mv -f $(distdir)/AUTHORS-tmp $(distdir)/AUTHORS ; \
+	$(AM_V_GEN)\
+	if test -d $(srcdir)/.git; then \
+	  ( \
+	    cd $(srcdir) && \
+	    git log --pretty=format:'%aN <%aE>' | sort -u \
+	  ) > all.list && \
+	  sort -u $(srcdir)/AUTHORS.in > maint.list && \
+	  comm -23 all.list maint.list > contrib.list && \
+	  contrib="`cat contrib.list`" && \
+	  perl -p -e "s/#contributorslist#// and print '$$contrib'" \
+	    < $(srcdir)/AUTHORS.in > $(distdir)/AUTHORS-tmp && \
+	  mv -f $(distdir)/AUTHORS-tmp $(distdir)/AUTHORS && \
+	  rm -f all.list maint.list contrib.list; \
 	fi

bootstrap

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Print a version string.
-scriptversion=2018-03-07.03; # UTC
+scriptversion=2018-07-01.02; # UTC
 
 # Bootstrap this package from checked-out sources.
 
@@ -47,6 +47,8 @@ PERL="${PERL-perl}"
 
 me=$0
 
+default_gnulib_url=git://git.sv.gnu.org/gnulib
+
 usage() {
   cat <<EOF
 Usage: $me [OPTION]...
@@ -76,6 +78,37 @@ contents are read as shell variables to configure the bootstrap.
 For build prerequisites, environment variables like \$AUTOCONF and \$AMTAR
 are honored.
 
+Gnulib sources can be fetched in various ways:
+
+ * If this package is in a git repository with a 'gnulib' submodule
+   configured, then that submodule is initialized and updated and sources
+   are fetched from there.  If \$GNULIB_SRCDIR is set (directly or via
+   --gnulib-srcdir) and is a git repository, then it is used as a reference.
+
+ * Otherwise, if \$GNULIB_SRCDIR is set (directly or via --gnulib-srcdir),
+   then sources are fetched from that local directory.  If it is a git
+   repository and \$GNULIB_REVISION is set, then that revision is checked
+   out.
+
+ * Otherwise, if this package is in a git repository with a 'gnulib'
+   submodule configured, then that submodule is initialized and updated and
+   sources are fetched from there.
+
+ * Otherwise, if the 'gnulib' directory does not exist, Gnulib sources are
+   cloned into that directory using git from \$GNULIB_URL, defaulting to
+   $default_gnulib_url.
+   If \$GNULIB_REVISION is set, then that revision is checked out.
+
+ * Otherwise, the existing Gnulib sources in the 'gnulib' directory are
+   used.  If it is a git repository and \$GNULIB_REVISION is set, then that
+   revision is checked out.
+
+If you maintain a package and want to pin a particular revision of the
+Gnulib sources that has been tested with your package, then there are two
+possible approaches: either configure a 'gnulib' submodule with the
+appropriate revision, or set \$GNULIB_REVISION (and if necessary
+\$GNULIB_URL) in $me.conf.
+
 Running without arguments will suffice in most cases.
 EOF
 }
@@ -109,9 +142,6 @@ die() { warn_ "$@"; exit 1; }
 
 # Configuration.
 
-# Name of the Makefile.am
-gnulib_mk=gnulib.mk
-
 # List of gnulib modules needed.
 gnulib_modules=
 
@@ -170,7 +200,15 @@ source_base=lib
 m4_base=m4
 doc_base=doc
 tests_base=tests
-gnulib_extra_files=''
+gnulib_extra_files="
+        build-aux/install-sh
+        build-aux/mdate-sh
+        build-aux/texinfo.tex
+        build-aux/depcomp
+        build-aux/config.guess
+        build-aux/config.sub
+        doc/INSTALL
+"
 
 # Additional gnulib-tool options to use.  Use "\newline" to break lines.
 gnulib_tool_option_extras=
@@ -264,24 +302,18 @@ case "$0" in
   *) test -r "$0.conf" && . ./"$0.conf" ;;
 esac
 
-# Extra files from gnulib, which override files from other sources.
-test -z "${gnulib_extra_files}" && \
-  gnulib_extra_files="
-        build-aux/install-sh
-        build-aux/mdate-sh
-        build-aux/texinfo.tex
-        build-aux/depcomp
-        build-aux/config.guess
-        build-aux/config.sub
-        doc/INSTALL
-"
-
 if test "$vc_ignore" = auto; then
   vc_ignore=
   test -d .git && vc_ignore=.gitignore
   test -d CVS && vc_ignore="$vc_ignore .cvsignore"
 fi
 
+if test x"$gnulib_modules$gnulib_files$gnulib_extra_files" = x; then
+  use_gnulib=false
+else
+  use_gnulib=true
+fi
+
 # Translate configuration into internal form.
 
 # Parse options.
@@ -612,85 +644,94 @@ git_modules_config () {
   test -f .gitmodules && git config --file .gitmodules "$@"
 }
 
-if $use_git; then
-  gnulib_path=$(git_modules_config submodule.gnulib.path)
-  test -z "$gnulib_path" && gnulib_path=gnulib
-fi
-
-# Get gnulib files.  Populate $GNULIB_SRCDIR, possibly updating a
-# submodule, for use in the rest of the script.
-
-case ${GNULIB_SRCDIR--} in
--)
-  # Note that $use_git is necessarily true in this case.
-  if git_modules_config submodule.gnulib.url >/dev/null; then
-    echo "$0: getting gnulib files..."
-    git submodule init -- "$gnulib_path" || exit $?
-    git submodule update -- "$gnulib_path" || exit $?
-
-  elif [ ! -d "$gnulib_path" ]; then
-    echo "$0: getting gnulib files..."
-
-    trap cleanup_gnulib 1 2 13 15
-
-    shallow=
-    git clone -h 2>&1 | grep -- --depth > /dev/null && shallow='--depth 2'
-    git clone $shallow git://git.sv.gnu.org/gnulib "$gnulib_path" ||
-      cleanup_gnulib
-
-    trap - 1 2 13 15
+if $use_gnulib; then
+  if $use_git; then
+    gnulib_path=$(git_modules_config submodule.gnulib.path)
+    test -z "$gnulib_path" && gnulib_path=gnulib
   fi
-  GNULIB_SRCDIR=$gnulib_path
-  ;;
-*)
-  # Use GNULIB_SRCDIR directly or as a reference.
-  if $use_git && test -d "$GNULIB_SRCDIR"/.git && \
-        git_modules_config submodule.gnulib.url >/dev/null; then
-    echo "$0: getting gnulib files..."
-    if git submodule -h|grep -- --reference > /dev/null; then
-      # Prefer the one-liner available in git 1.6.4 or newer.
-      git submodule update --init --reference "$GNULIB_SRCDIR" \
-        "$gnulib_path" || exit $?
-    else
-      # This fallback allows at least git 1.5.5.
-      if test -f "$gnulib_path"/gnulib-tool; then
-        # Since file already exists, assume submodule init already complete.
-        git submodule update -- "$gnulib_path" || exit $?
-      else
-        # Older git can't clone into an empty directory.
-        rmdir "$gnulib_path" 2>/dev/null
-        git clone --reference "$GNULIB_SRCDIR" \
-          "$(git_modules_config submodule.gnulib.url)" "$gnulib_path" \
-          && git submodule init -- "$gnulib_path" \
-          && git submodule update -- "$gnulib_path" \
-          || exit $?
+
+  # Get gnulib files.  Populate $GNULIB_SRCDIR, possibly updating a
+  # submodule, for use in the rest of the script.
+
+  case ${GNULIB_SRCDIR--} in
+  -)
+    # Note that $use_git is necessarily true in this case.
+    if git_modules_config submodule.gnulib.url >/dev/null; then
+      echo "$0: getting gnulib files..."
+      git submodule init -- "$gnulib_path" || exit $?
+      git submodule update -- "$gnulib_path" || exit $?
+
+    elif [ ! -d "$gnulib_path" ]; then
+      echo "$0: getting gnulib files..."
+
+      trap cleanup_gnulib 1 2 13 15
+
+      shallow=
+      if test -z "$GNULIB_REVISION"; then
+        git clone -h 2>&1 | grep -- --depth > /dev/null && shallow='--depth 2'
       fi
+      git clone $shallow ${GNULIB_URL:-$default_gnulib_url} "$gnulib_path" \
+        || cleanup_gnulib
+
+      trap - 1 2 13 15
     fi
     GNULIB_SRCDIR=$gnulib_path
+    ;;
+  *)
+    # Use GNULIB_SRCDIR directly or as a reference.
+    if $use_git && test -d "$GNULIB_SRCDIR"/.git && \
+          git_modules_config submodule.gnulib.url >/dev/null; then
+      echo "$0: getting gnulib files..."
+      if git submodule -h|grep -- --reference > /dev/null; then
+        # Prefer the one-liner available in git 1.6.4 or newer.
+        git submodule update --init --reference "$GNULIB_SRCDIR" \
+          "$gnulib_path" || exit $?
+      else
+        # This fallback allows at least git 1.5.5.
+        if test -f "$gnulib_path"/gnulib-tool; then
+          # Since file already exists, assume submodule init already complete.
+          git submodule update -- "$gnulib_path" || exit $?
+        else
+          # Older git can't clone into an empty directory.
+          rmdir "$gnulib_path" 2>/dev/null
+          git clone --reference "$GNULIB_SRCDIR" \
+            "$(git_modules_config submodule.gnulib.url)" "$gnulib_path" \
+            && git submodule init -- "$gnulib_path" \
+            && git submodule update -- "$gnulib_path" \
+            || exit $?
+        fi
+      fi
+      GNULIB_SRCDIR=$gnulib_path
+    fi
+    ;;
+  esac
+
+  if test -d "$GNULIB_SRCDIR"/.git && test -n "$GNULIB_REVISION" \
+     && ! git_modules_config submodule.gnulib.url >/dev/null; then
+    (cd "$GNULIB_SRCDIR" && git checkout "$GNULIB_REVISION") || cleanup_gnulib
   fi
-  ;;
-esac
 
-# $GNULIB_SRCDIR now points to the version of gnulib to use, and
-# we no longer need to use git or $gnulib_path below here.
+  # $GNULIB_SRCDIR now points to the version of gnulib to use, and
+  # we no longer need to use git or $gnulib_path below here.
 
-if $bootstrap_sync; then
-  cmp -s "$0" "$GNULIB_SRCDIR/build-aux/bootstrap" || {
-    echo "$0: updating bootstrap and restarting..."
-    case $(sh -c 'echo "$1"' -- a) in
-      a) ignored=--;;
-      *) ignored=ignored;;
-    esac
-    exec sh -c \
-      'cp "$1" "$2" && shift && exec "${CONFIG_SHELL-/bin/sh}" "$@"' \
-      $ignored "$GNULIB_SRCDIR/build-aux/bootstrap" \
-      "$0" "$@" --no-bootstrap-sync
-  }
+  if $bootstrap_sync; then
+    cmp -s "$0" "$GNULIB_SRCDIR/build-aux/bootstrap" || {
+      echo "$0: updating bootstrap and restarting..."
+      case $(sh -c 'echo "$1"' -- a) in
+        a) ignored=--;;
+        *) ignored=ignored;;
+      esac
+      exec sh -c \
+        'cp "$1" "$2" && shift && exec "${CONFIG_SHELL-/bin/sh}" "$@"' \
+        $ignored "$GNULIB_SRCDIR/build-aux/bootstrap" \
+        "$0" "$@" --no-bootstrap-sync
+    }
+  fi
+
+  gnulib_tool=$GNULIB_SRCDIR/gnulib-tool
+  <$gnulib_tool || exit $?
 fi
 
-gnulib_tool=$GNULIB_SRCDIR/gnulib-tool
-<$gnulib_tool || exit $?
-
 # Get translations.
 
 download_po_files() {
@@ -898,32 +939,33 @@ fi
 
 # Import from gnulib.
 
-gnulib_tool_options="\
- --import\
- --no-changelog\
- --aux-dir $build_aux\
- --doc-base $doc_base\
- --lib $gnulib_name\
- --m4-base $m4_base/\
- --source-base $source_base/\
- --tests-base $tests_base\
- --local-dir $local_gl_dir\
- $gnulib_tool_option_extras\
-"
-if test $use_libtool = 1; then
-  case "$gnulib_tool_options " in
-    *' --libtool '*) ;;
-    *) gnulib_tool_options="$gnulib_tool_options --libtool" ;;
-  esac
-fi
-echo "$0: $gnulib_tool $gnulib_tool_options --import ..."
-$gnulib_tool $gnulib_tool_options --import $gnulib_modules \
-  || die "gnulib-tool failed"
+if $use_gnulib; then
+  gnulib_tool_options="\
+   --no-changelog\
+   --aux-dir=$build_aux\
+   --doc-base=$doc_base\
+   --lib=$gnulib_name\
+   --m4-base=$m4_base/\
+   --source-base=$source_base/\
+   --tests-base=$tests_base\
+   --local-dir=$local_gl_dir\
+   $gnulib_tool_option_extras\
+  "
+  if test $use_libtool = 1; then
+    case "$gnulib_tool_options " in
+      *' --libtool '*) ;;
+      *) gnulib_tool_options="$gnulib_tool_options --libtool" ;;
+    esac
+  fi
+  echo "$0: $gnulib_tool $gnulib_tool_options --import ..."
+  $gnulib_tool $gnulib_tool_options --import $gnulib_modules \
+    || die "gnulib-tool failed"
 
-for file in $gnulib_files; do
-  symlink_to_dir "$GNULIB_SRCDIR" $file \
-    || die "failed to symlink $file"
-done
+  for file in $gnulib_files; do
+    symlink_to_dir "$GNULIB_SRCDIR" $file \
+      || die "failed to symlink $file"
+  done
+fi
 
 bootstrap_post_import_hook \
   || die "bootstrap_post_import_hook failed"

bootstrap.conf

@@ -126,6 +126,7 @@ vc-list-files
 vsnprintf
 waitpid
 warnings
+wcwidth
 '
 
 SKIP_PO=true

build-aux/check-spacing.pl

@@ -45,9 +45,6 @@ foreach my $file (@ARGV) {
         # Kill any quoted strings
         $data =~ s,"(?:[^\\\"]|\\.)*","XXX",g;
 
-        # Kill any C++ style comments
-        $data =~ s,//.*$,//,;
-
         next if $data =~ /^#/;
 
         # Kill contents of multi-line comments

cfg.mk

@@ -472,6 +472,7 @@ sc_prohibit_canonicalize_file_name:
 # Insist on correct types for [pug]id.
 sc_correct_id_types:
 	@prohibit='\<(int|long) *[pug]id\>' \
+	exclude='exempt from syntax-check' \
 	halt='use pid_t for pid, uid_t for uid, gid_t for gid' \
 	  $(_sc_search_regexp)
 
@@ -1057,6 +1058,17 @@ sc_prohibit_backslash_alignment:
 	halt='Do not attempt to right-align backslashes' \
 	  $(_sc_search_regexp)
 
+# Some syntax rules pertaining to the usage of cleanup macros
+# implementing GNU C's cleanup attribute
+
+# Rule to ensure that varibales declared using a cleanup macro are
+# always initialized.
+sc_require_attribute_cleanup_initialization:
+	@prohibit='VIR_AUTO((FREE|PTR)\(.+\)|CLOSE) *[^=]+;' \
+	in_vc_files='\.[chx]$$' \
+	halt='variable declared with a cleanup macro must be initialized' \
+	  $(_sc_search_regexp)
+
 # We don't use this feature of maint.mk.
 prev_version_file = /dev/null
 
@@ -1216,7 +1228,7 @@ exclude_file_name_regexp--sc_prohibit_select = \
 	^cfg\.mk$$
 
 exclude_file_name_regexp--sc_prohibit_canonicalize_file_name = \
-  ^cfg\.mk$$
+  ^(cfg\.mk|tests/virfilemock\.c)$$
 
 exclude_file_name_regexp--sc_prohibit_raw_allocation = \
   ^(docs/hacking\.html\.in|src/util/viralloc\.[ch]|examples/.*|tests/(securityselinuxhelper|(vircgroup|nss)mock|commandhelper)\.c|tools/wireshark/src/packet-libvirt\.c)$$

configure.ac

@@ -16,7 +16,7 @@ dnl You should have received a copy of the GNU Lesser General Public
 dnl License along with this library.  If not, see
 dnl <http://www.gnu.org/licenses/>.
 
-AC_INIT([libvirt], [4.5.0], [libvir-list@redhat.com], [], [https://libvirt.org])
+AC_INIT([libvirt], [4.10.0], [libvir-list@redhat.com], [], [https://libvirt.org])
 AC_CONFIG_SRCDIR([src/libvirt.c])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_HEADERS([config.h])
@@ -250,6 +250,7 @@ LIBVIRT_ARG_FIREWALLD
 LIBVIRT_ARG_FUSE
 LIBVIRT_ARG_GLUSTER
 LIBVIRT_ARG_HAL
+LIBVIRT_ARG_LIBISCSI
 LIBVIRT_ARG_LIBPCAP
 LIBVIRT_ARG_LIBSSH
 LIBVIRT_ARG_LIBXML
@@ -290,6 +291,7 @@ LIBVIRT_CHECK_FUSE
 LIBVIRT_CHECK_GLUSTER
 LIBVIRT_CHECK_GNUTLS
 LIBVIRT_CHECK_HAL
+LIBVIRT_CHECK_LIBISCSI
 LIBVIRT_CHECK_LIBNL
 LIBVIRT_CHECK_LIBPARTED
 LIBVIRT_CHECK_LIBPCAP
@@ -320,17 +322,49 @@ AC_CHECK_SIZEOF([long])
 
 dnl Availability of various common functions (non-fatal if missing),
 dnl and various less common threadsafe functions
-AC_CHECK_FUNCS_ONCE([cfmakeraw fallocate geteuid getgid getgrnam_r \
-  getmntent_r getpwuid_r getrlimit getuid if_indextoname kill mmap \
-  newlocale posix_fallocate posix_memalign prlimit regexec \
-  sched_getaffinity setgroups setns setrlimit symlink sysctlbyname \
-  getifaddrs sched_setscheduler unshare])
+AC_CHECK_FUNCS_ONCE([\
+  cfmakeraw \
+  fallocate \
+  geteuid \
+  getgid \
+  getifaddrs \
+  getmntent_r \
+  getpwuid_r \
+  getrlimit \
+  getuid \
+  if_indextoname \
+  mmap \
+  newlocale \
+  posix_fallocate \
+  posix_memalign \
+  prlimit \
+  sched_getaffinity \
+  sched_setscheduler \
+  setgroups \
+  setns \
+  setrlimit \
+  symlink \
+  sysctlbyname \
+  unshare \
+  ])
 
 dnl Availability of various common headers (non-fatal if missing).
-AC_CHECK_HEADERS([pwd.h regex.h sys/un.h \
-  sys/poll.h syslog.h mntent.h net/ethernet.h linux/magic.h \
-  sys/un.h sys/syscall.h sys/sysctl.h netinet/tcp.h ifaddrs.h \
-  libtasn1.h sys/ucred.h sys/mount.h stdarg.h])
+AC_CHECK_HEADERS([\
+  ifaddrs.h \
+  libtasn1.h \
+  linux/magic.h \
+  mntent.h \
+  net/ethernet.h \
+  netinet/tcp.h \
+  pwd.h \
+  stdarg.h \
+  syslog.h \
+  sys/mount.h \
+  sys/syscall.h \
+  sys/sysctl.h \
+  sys/ucred.h \
+  sys/un.h \
+  ])
 dnl Check whether endian provides handy macros.
 AC_CHECK_DECLS([htole64], [], [], [[#include <endian.h>]])
 AC_CHECK_FUNCS([stat stat64 __xstat __xstat64 lstat lstat64 __lxstat __lxstat64])
@@ -562,6 +596,7 @@ LIBVIRT_STORAGE_ARG_DIR
 LIBVIRT_STORAGE_ARG_FS
 LIBVIRT_STORAGE_ARG_LVM
 LIBVIRT_STORAGE_ARG_ISCSI
+LIBVIRT_STORAGE_ARG_ISCSI_DIRECT
 LIBVIRT_STORAGE_ARG_SCSI
 LIBVIRT_STORAGE_ARG_MPATH
 LIBVIRT_STORAGE_ARG_DISK
@@ -576,6 +611,7 @@ if test "$with_libvirtd" = "no"; then
   with_storage_fs=no
   with_storage_lvm=no
   with_storage_iscsi=no
+  with_storage_iscsi_direct=no
   with_storage_scsi=no
   with_storage_mpath=no
   with_storage_disk=no
@@ -596,6 +632,7 @@ LIBVIRT_STORAGE_CHECK_DIR
 LIBVIRT_STORAGE_CHECK_FS
 LIBVIRT_STORAGE_CHECK_LVM
 LIBVIRT_STORAGE_CHECK_ISCSI
+LIBVIRT_STORAGE_CHECK_ISCSI_DIRECT
 LIBVIRT_STORAGE_CHECK_SCSI
 LIBVIRT_STORAGE_CHECK_MPATH
 LIBVIRT_STORAGE_CHECK_DISK
@@ -606,7 +643,7 @@ LIBVIRT_STORAGE_CHECK_ZFS
 LIBVIRT_STORAGE_CHECK_VSTORAGE
 
 with_storage=no
-for backend in dir fs lvm iscsi scsi mpath rbd disk; do
+for backend in dir fs lvm iscsi iscsi_direct scsi mpath rbd disk; do
     if eval test \$with_storage_$backend = yes; then
         with_storage=yes
         break
@@ -625,6 +662,13 @@ if test "$with_linux" = "yes"; then
     AC_CHECK_HEADERS([linux/btrfs.h])
 fi
 
+dnl
+dnl check for xfs dev headers required by xfs ioctl
+dnl
+if test "$with_linux" = "yes"; then
+    AC_CHECK_HEADERS([xfs/xfs.h])
+fi
+
 dnl
 dnl check for DEVLINK_CMD_ESWITCH_GET
 dnl
@@ -927,6 +971,7 @@ LIBVIRT_STORAGE_RESULT_DIR
 LIBVIRT_STORAGE_RESULT_FS
 LIBVIRT_STORAGE_RESULT_LVM
 LIBVIRT_STORAGE_RESULT_ISCSI
+LIBVIRT_STORAGE_RESULT_ISCSI_DIRECT
 LIBVIRT_STORAGE_RESULT_SCSI
 LIBVIRT_STORAGE_RESULT_MPATH
 LIBVIRT_STORAGE_RESULT_DISK
@@ -963,6 +1008,7 @@ LIBVIRT_RESULT_FUSE
 LIBVIRT_RESULT_GLUSTER
 LIBVIRT_RESULT_GNUTLS
 LIBVIRT_RESULT_HAL
+LIBVIRT_RESULT_LIBISCSI
 LIBVIRT_RESULT_LIBNL
 LIBVIRT_RESULT_LIBPCAP
 LIBVIRT_RESULT_LIBSSH

docs/Makefile.am

@@ -132,8 +132,6 @@ dot_php_in = $(notdir $(wildcard $(srcdir)/*.php.in))
 dot_php_code_in = $(dot_php_in:%.php.in=%.php.code.in)
 dot_php = $(dot_php_in:%.php.in=%.php)
 
-patches = $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/api_extension/*.patch))
-
 xml = \
   libvirt-api.xml \
   libvirt-refs.xml
@@ -177,7 +175,7 @@ EXTRA_DIST= \
   $(dot_html) $(dot_html_in) $(gif) $(apihtml) $(apipng) \
   $(devhelphtml) $(devhelppng) $(devhelpcss) $(devhelpxsl) \
   $(xml) $(qemu_xml) $(lxc_xml) $(admin_xml) $(fig) $(png) $(css) \
-  $(logofiles) $(patches) $(dot_php_in) $(dot_php_code_in) $(dot_php)\
+  $(logofiles) $(dot_php_in) $(dot_php_code_in) $(dot_php)\
   $(internals_html_in) $(internals_html) $(fonts) \
   aclperms.htmlinc \
   hvsupport.pl \

docs/aclpolkit.html.in

@@ -287,6 +287,123 @@
       </tbody>
     </table>
 
+    <h2><a id="connect_driver">Hypervisor Driver connect_driver</a></h2>
+    <p>
+      The <code>connect_driver</code> parameter describes the
+      client's <a href="remote.html">remote Connection Driver</a>
+      name based on the <a href="uri.html">URI</a> used for the
+      connection.
+    </p>
+    <p>
+      <span class="since">Since 4.1.0</span>, when calling an API
+      outside the scope of the primary connection driver, the
+      primary driver will attempt to open a secondary connection
+      to the specific API driver in order to process the API. For
+      example, when hypervisor domain processing needs to make an
+      API call within the storage driver or the network filter driver
+      an attempt to open a connection to the "storage" or "nwfilter"
+      driver will be made. Similarly, a "storage" primary connection
+      may need to create a connection to the "secret" driver in order
+      to process secrets for the API. If successful, then calls to
+      those API's will occur in the <code>connect_driver</code> context
+      of the secondary connection driver rather than in the context of
+      the primary driver. This affects the <code>connect_driver</code>
+      returned from rule generation from the <code>action.loookup</code>
+      function. The following table provides a list of the various
+      connection drivers and the <code>connect_driver</code> name
+      used by each regardless of primary or secondary connection.
+      The access denied error message from libvirt will list the
+      connection driver by name that denied the access.
+    </p>
+
+    <h3><a id="object_connect_driver">Connection Driver Name</a></h3>
+    <table class="acl">
+      <thead>
+        <tr>
+          <th>Connection Driver</th>
+          <th><code>connect_driver</code> name</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td>bhyve</td>
+          <td>bhyve</td>
+        </tr>
+        <tr>
+          <td>esx</td>
+          <td>ESX</td>
+        </tr>
+        <tr>
+          <td>hyperv</td>
+          <td>Hyper-V</td>
+        </tr>
+        <tr>
+          <td>interface</td>
+          <td>interface</td>
+        </tr>
+        <tr>
+          <td>libxl</td>
+          <td>xenlight</td>
+        </tr>
+        <tr>
+          <td>lxc</td>
+          <td>LXC</td>
+        </tr>
+        <tr>
+          <td>network</td>
+          <td>network</td>
+        </tr>
+        <tr>
+          <td>nodedev</td>
+          <td>nodedev</td>
+        </tr>
+        <tr>
+          <td>nwfilter</td>
+          <td>NWFilter</td>
+        </tr>
+        <tr>
+          <td>openvz</td>
+          <td>OPENVZ</td>
+        </tr>
+        <tr>
+          <td>phyp</td>
+          <td>PHYP</td>
+        </tr>
+        <tr>
+          <td>qemu</td>
+          <td>QEMU</td>
+        </tr>
+        <tr>
+          <td>secret</td>
+          <td>secret</td>
+        </tr>
+        <tr>
+          <td>storage</td>
+          <td>storage</td>
+        </tr>
+        <tr>
+          <td>uml</td>
+          <td>UML</td>
+        </tr>
+        <tr>
+          <td>vbox</td>
+          <td>VBOX</td>
+        </tr>
+        <tr>
+          <td>vmware</td>
+          <td>VMWARE</td>
+        </tr>
+        <tr>
+          <td>vz</td>
+          <td>vz</td>
+        </tr>
+        <tr>
+          <td>xenapi</td>
+          <td>XenAPI</td>
+        </tr>
+      </tbody>
+    </table>
+
 
     <h2><a id="user">User identity attributes</a></h2>
 

docs/api_extension.html.in

@@ -8,14 +8,9 @@
 
     <p>
       This document walks you through the process of implementing a new
-      API in libvirt.  It uses as an example the addition of an API for
-      separating maximum from current vcpu usage of a domain, over
-      the course of a fifteen-patch series.
-      Remember that new API consists of any new public functions, as
-      well as the addition of flags or extensions of XML used by
-      existing functions.  The example in this document adds both new
-      functions and an XML extension.  Not all libvirt API additions
-      require quite as many patches.
+      API in libvirt.  Remember that new API consists of any new public
+      functions, as well as the addition of flags or extensions of XML used by
+      existing functions.
     </p>
 
     <p>
@@ -27,12 +22,7 @@
       added to libvirt.  Someone may already be working on the feature you
       want.  Also, recognize that everything you write is likely to undergo
       significant rework as you discuss it with the other developers, so
-      don't wait too long before getting feedback.  In the vcpu example
-      below, list feedback was first requested
-      <a href="https://www.redhat.com/archives/libvir-list/2010-September/msg00423.html">here</a>
-      and resulted in several rounds of improvements before coding
-      began.  In turn, this example is slightly rearranged from the actual
-      order of the commits.
+      don't wait too long before getting feedback.
     </p>
 
     <p>
@@ -81,14 +71,12 @@
     </p>
 
     <p>
-      Submit new code in the form shown in the example code: one patch
-      per step.  That's not to say submit patches before you have working
-      functionality--get the whole thing working and make sure you're happy
-      with it.  Then use git or some other version control system that lets
-      you rewrite your commit history and break patches into pieces so you
-      don't drop a big blob of code on the mailing list in one go.
-      Also, you should follow the upstream tree, and rebase your
-      series to adapt your patches to work with any other changes
+      Submit new code in the form of one patch per step.  That's not to say
+      submit patches before you have working functionality--get the whole thing
+      working and make sure you're happy with it.  Then use git to break the
+      changes into pieces so you don't drop a big blob of code on the
+      mailing list in one go.  Also, you should follow the upstream tree, and
+      rebase your series to adapt your patches to work with any other changes
       that were accepted upstream during your development.
     </p>
 
@@ -101,8 +89,6 @@
       separately.
     </p>
 
-    <p>With that said, let's begin.</p>
-
     <h2><a name='publicapi'>Defining the public API</a></h2>
 
     <p>The first task is to define the public API.  If the new API
@@ -110,7 +96,7 @@
       schema and document the new elements or attributes:</p>
 
     <p><code>
-        docs/schemas/domain.rng<br/>
+        docs/schemas/domaincommon.rng<br/>
         docs/formatdomain.html.in
     </code></p>
 
@@ -120,7 +106,7 @@
       libvirt library and call the new function:</p>
 
     <p><code>
-        include/libvirt/libvirt.h.in
+        include/libvirt/libvirt-$MODULE.h.in
         src/libvirt_public.syms
     </code></p>
 
@@ -133,10 +119,6 @@
       rework it as you go through the process of implementing it.
     </p>
 
-    <p class="example">See <a href="api_extension/0001-add-to-xml.patch">0001-add-to-xml.patch</a>
-    and <a href="api_extension/0002-add-new-public-API.patch">0002-add-new-public-API.patch</a>
-    for example code.</p>
-
     <h2><a name='internalapi'>Defining the internal API</a></h2>
 
     <p>
@@ -155,7 +137,7 @@
 
     <p>The driver structs are defined in:</p>
 
-    <p><code>src/driver.h</code></p>
+    <p><code>src/driver-$MODULE.h</code></p>
 
     <p>
       To define the internal API, first typedef the driver function
@@ -164,8 +146,6 @@
       provide a <code>NULL</code> stub for the new function.
     </p>
 
-    <p class="example">See <a href="api_extension/0003-define-internal-driver-API.patch">0003-define-internal-driver-API.patch</a></p>
-
     <h2><a name='implpublic'>Implementing the public API</a></h2>
 
     <p>
@@ -197,22 +177,16 @@
 
     <p>The public API calls are implemented in:</p>
 
-    <p><code>src/libvirt.c</code></p>
-
-    <p class="example">See <a href="api_extension/0004-implement-the-public-APIs.patch">0004-implement-the-public-APIs.patch</a></p>
+    <p><code>src/libvirt-$MODULE.c</code></p>
 
     <h2><a name='remoteproto'>Implementing the remote protocol</a></h2>
 
     <p>
       Implementing the remote protocol is essentially a
       straightforward exercise which is probably most easily
-      understood by referring to the existing code and the example
-      patch.  It involves several related changes, including the
-      regeneration of derived files, with further details below.
+      understood by referring to the existing code.
     </p>
 
-    <p class="example">See <a href="api_extension/0005-implement-the-remote-protocol.patch">0005-implement-the-remote-protocol.patch</a></p>
-
     <h3><a name='wireproto'>Defining the wire protocol format</a></h3>
 
     <p>
@@ -245,9 +219,9 @@
     </p>
 
     <p><code>
-        daemon/remote_dispatch_args.h
-        daemon/remote_dispatch_prototypes.h
-        daemon/remote_dispatch_table.h
+        src/remote/remote_daemon_dispatch_stubs.h
+        src/remote/remote_daemon_dispatch.h
+        src/remote/remote_daemon_dispatch.c
         src/remote/remote_protocol.c
         src/remote/remote_protocol.h
     </code></p>
@@ -259,7 +233,7 @@
       method calls go in:
     </p>
 
-    <p><code>src/remote/remote_internal.c</code></p>
+    <p><code>src/remote/remote_driver.c</code></p>
 
     <p>Each remote method invocation does the following:</p>
 
@@ -282,7 +256,7 @@
       The server side dispatchers are implemented in:
     </p>
 
-    <p><code>daemon/remote.c</code></p>
+    <p><code>src/remote/daemon_dispatch.c</code></p>
 
     <p>Again, this step uses the .h files generated by make rpcgen.</p>
 
@@ -298,8 +272,6 @@
       existing lines probably imply a backwards-incompatible API change.
     </p>
 
-    <p class="example">See <a href="api_extension/0005-implement-the-remote-protocol.patch">0005-implement-the-remote-protocol.patch</a></p>
-
     <h2><a id="internaluseapi">Use the new API internally</a></h2>
 
     <p>
@@ -312,8 +284,6 @@
       not necessary if the new API has no relation to existing API.
     </p>
 
-    <p class="example">See <a href="api_extension/0006-make-old-API-trivially-wrap-to-new-API.patch">0006-make-old-API-trivially-wrap-to-new-API.patch</a></p>
-
     <h2><a id="virshuseapi">Expose the new API in virsh</a></h2>
 
     <p>
@@ -339,12 +309,10 @@
     </p>
 
     <p><code>
-        tools/virsh.c<br/>
+        tools/virsh-$MODULE.c<br/>
         tools/virsh.pod
     </code></p>
 
-    <p class="example">See <a href="api_extension/0007-add-virsh-support.patch">0007-add-virsh-support.patch</a></p>
-
     <h2><a id="driverimpl">Implement the driver methods</a></h2>
 
     <p>
@@ -371,8 +339,6 @@
       the same way as the older API wrappers.
     </p>
 
-    <p class="example">See <a href="api_extension/0008-support-new-xml.patch">0008-support-new-xml.patch</a></p>
-
     <h3><a id="drivercode">Implement driver handling</a></h3>
 
     <p>
@@ -384,41 +350,14 @@
     </p>
 
     <p>
-      In the example patches, three separate drivers are supported:
-      test, qemu, and xen.  It is always a good idea to patch the test
-      driver in addition to the target driver, to prove that the API
-      can be used for more than one driver.  The example updates the
-      test driver in one patch:
+      It is always a good idea to patch the test driver in addition to the
+      target driver, to prove that the API can be used for more than one
+      driver.
     </p>
 
-    <p class="example">See <a href="api_extension/0009-support-all-flags-in-test-driver.patch">0009-support-all-flags-in-test-driver.patch</a></p>
-
     <p>
-      The qemu changes were easier to split into two phases, one for
-      updating the mapping between the new XML and the hypervisor
-      command line arguments, and one for supporting all possible
-      flags of the new API:
-    </p>
-
-    <p class="example">See <a href="api_extension/0010-improve-vcpu-support-in-qemu-command-line.patch">0010-improve-vcpu-support-in-qemu-command-line.patch</a>
-      and <a href="api_extension/0011-complete-vcpu-support-in-qemu-driver.patch">0011-complete-vcpu-support-in-qemu-driver.patch</a></p>
-
-    <p>
-      Finally, the example breaks the xen driver changes across four
-      patches.  One maps the XML changes to the hypervisor command,
-      the next two are independently implementing the getter and
-      setter APIs, and the last one provides cleanup of code that was
-      rendered dead by the new API.
-    </p>
-
-    <p class="example">See <a href="api_extension/0012-improve-vcpu-support-in-xen-command-line.patch">0012-improve-vcpu-support-in-xen-command-line.patch</a>,
-      <a href="api_extension/0013-improve-getting-xen-vcpu-counts.patch">0013-improve-getting-xen-vcpu-counts.patch</a>,
-      <a href="api_extension/0014-improve-setting-xen-vcpu-counts.patch">0014-improve-setting-xen-vcpu-counts.patch</a>,
-      and <a href="api_extension/0015-remove-dead-xen-code.patch">0015-remove-dead-xen-code.patch</a></p>
-
-    <p>
-      The exact details of the example code are probably uninteresting
-      unless you're concerned with virtual cpu management.
+      Any cleanups resulting from the changes should be added as separate
+      patches at the end of the series.
     </p>
 
     <p>

docs/api_extension/0001-add-to-xml.patch

@@ -1,145 +0,0 @@
-From a74f4e44649906dcd82151f7ef837f66d7fa2ab1 Mon Sep 17 00:00:00 2001
-From: Eric Blake <eblake@redhat.com>
-Date: Mon, 27 Sep 2010 17:36:06 -0600
-Subject: [PATCH 01/15] vcpu: add current attribute to <vcpu> element
-
-Syntax agreed on in
-https://www.redhat.com/archives/libvir-list/2010-September/msg00476.html
-
-<domain ...>
-  <vcpu current='x'>y</vcpu>
-...
-
-can now be used to specify 1 <= x <= y current vcpus, in relation
-to the boot-time max of y vcpus.  If current is omitted, then
-current and max are assumed to be the same value.
-
-* docs/schemas/domain.rng: Add new attribute.
-* docs/formatdomain.html.in: Document it.
-* tests/qemuxml2argvdata/qemuxml2argv-smp.xml: Add to
-domainschematest.
-* tests/xml2sexprdata/xml2sexpr-pv-vcpus.xml: Likewise.
----
- docs/formatdomain.html.in                   |    9 +++++--
- docs/schemas/domain.rng                     |    5 ++++
- tests/qemuxml2argvdata/qemuxml2argv-smp.xml |   28 +++++++++++++++++++++++++++
- tests/xml2sexprdata/xml2sexpr-pv-vcpus.xml  |   22 +++++++++++++++++++++
- 4 files changed, 61 insertions(+), 3 deletions(-)
- create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-smp.xml
- create mode 100644 tests/xml2sexprdata/xml2sexpr-pv-vcpus.xml
-
-diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
-index a8a1fac..96de121 100644
---- a/docs/formatdomain.html.in
-+++ b/docs/formatdomain.html.in
-@@ -200,7 +200,7 @@
-     &lt;swap_hard_limit&gt;2097152&lt;/swap_hard_limit&gt;
-     &lt;min_guarantee&gt;65536&lt;/min_guarantee&gt;
-   &lt;/memtune&gt;
--  &lt;vcpu cpuset="1-4,^3,6"&gt;2&lt;/vcpu&gt;
-+  &lt;vcpu cpuset="1-4,^3,6" current="1"&gt;2&lt;/vcpu&gt;
-   ...</pre>
-
-     <dl>
-@@ -238,7 +238,7 @@
- 	minimum memory allocation for the guest. The units for this value are
- 	kilobytes (i.e. blocks of 1024 bytes)</dd>
-       <dt><code>vcpu</code></dt>
--      <dd>The content of this element defines the number of virtual
-+      <dd>The content of this element defines the maximum number of virtual
-         CPUs allocated for the guest OS, which must be between 1 and
-         the maximum supported by the hypervisor.  <span class="since">Since
-         0.4.4</span>, this element can contain an optional
-@@ -246,7 +246,10 @@
-         list of physical CPU numbers that virtual CPUs can be pinned
-         to.  Each element in that list is either a single CPU number,
-         a range of CPU numbers, or a caret followed by a CPU number to
--        be excluded from a previous range.
-+        be excluded from a previous range.  <span class="since">Since
-+        0.8.5</span>, the optional attribute <code>current</code> can
-+        be used to specify whether fewer than the maximum number of
-+        virtual CPUs should be enabled.
-       </dd>
-     </dl>
-
-diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng
-index f230263..a934a77 100644
---- a/docs/schemas/domain.rng
-+++ b/docs/schemas/domain.rng
-@@ -337,6 +337,11 @@
-               <ref name="cpuset"/>
-             </attribute>
-           </optional>
-+          <optional>
-+            <attribute name="current">
-+              <ref name="countCPU"/>
-+            </attribute>
-+          </optional>
-           <ref name="countCPU"/>
-         </element>
-       </optional>
-diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smp.xml b/tests/qemuxml2argvdata/qemuxml2argv-smp.xml
-new file mode 100644
-index 0000000..975f873
---- /dev/null
-+++ b/tests/qemuxml2argvdata/qemuxml2argv-smp.xml
-@@ -0,0 +1,28 @@
-+<domain type='qemu'>
-+  <name>QEMUGuest1</name>
-+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-+  <memory>219200</memory>
-+  <currentMemory>219200</currentMemory>
-+  <vcpu current='1'>2</vcpu>
-+  <os>
-+    <type arch='i686' machine='pc'>hvm</type>
-+    <boot dev='hd'/>
-+  </os>
-+  <cpu>
-+    <topology sockets='2' cores='1' threads='1'/>
-+  </cpu>
-+  <clock offset='utc'/>
-+  <on_poweroff>destroy</on_poweroff>
-+  <on_reboot>restart</on_reboot>
-+  <on_crash>destroy</on_crash>
-+  <devices>
-+    <emulator>/usr/bin/qemu</emulator>
-+    <disk type='block' device='disk'>
-+      <source dev='/dev/HostVG/QEMUGuest1'/>
-+      <target dev='hda' bus='ide'/>
-+      <address type='drive' controller='0' bus='0' unit='0'/>
-+    </disk>
-+    <controller type='ide' index='0'/>
-+    <memballoon model='virtio'/>
-+  </devices>
-+</domain>
-diff --git a/tests/xml2sexprdata/xml2sexpr-pv-vcpus.xml b/tests/xml2sexprdata/xml2sexpr-pv-vcpus.xml
-new file mode 100644
-index 0000000..d061e11
---- /dev/null
-+++ b/tests/xml2sexprdata/xml2sexpr-pv-vcpus.xml
-@@ -0,0 +1,22 @@
-+<domain type='xen' id='15'>
-+  <name>pvtest</name>
-+  <uuid>596a5d2171f48fb2e068e2386a5c413e</uuid>
-+  <os>
-+    <type>linux</type>
-+    <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
-+    <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
-+    <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
-+  </os>
-+  <memory>430080</memory>
-+  <vcpu current='2'>4</vcpu>
-+  <on_poweroff>destroy</on_poweroff>
-+  <on_reboot>destroy</on_reboot>
-+  <on_crash>destroy</on_crash>
-+  <devices>
-+    <disk type='file' device='disk'>
-+      <source file='/root/some.img'/>
-+      <target dev='xvda'/>
-+    </disk>
-+    <console tty='/dev/pts/4'/>
-+  </devices>
-+</domain>
--- 
-1.7.2.3
-

docs/api_extension/0002-add-new-public-API.patch

@@ -1,62 +0,0 @@
-From ea3f5c68093429c6ad507b45689cdf209c2c257b Mon Sep 17 00:00:00 2001
-From: Eric Blake <eblake@redhat.com>
-Date: Fri, 24 Sep 2010 16:48:45 -0600
-Subject: [PATCH 02/15] vcpu: add new public API
-
-API agreed on in
-https://www.redhat.com/archives/libvir-list/2010-September/msg00456.html,
-but modified for enum names to be consistent with virDomainDeviceModifyFlags.
-
-* include/libvirt/libvirt.h.in (virDomainVcpuFlags)
-(virDomainSetVcpusFlags, virDomainGetVcpusFlags): New
-declarations.
-* src/libvirt_public.syms: Export new symbols.
----
- include/libvirt/libvirt.h.in |   15 +++++++++++++++
- src/libvirt_public.syms      |    2 ++
- 2 files changed, 17 insertions(+), 0 deletions(-)
-
-diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in
-index 2eba61e..d0cc4c0 100644
---- a/include/libvirt/libvirt.h.in
-+++ b/include/libvirt/libvirt.h.in
-@@ -915,8 +915,23 @@ struct _virVcpuInfo {
- };
- typedef virVcpuInfo *virVcpuInfoPtr;
-
-+/* Flags for controlling virtual CPU hot-plugging.  */
-+typedef enum {
-+    /* Must choose at least one of these two bits; SetVcpus can choose both */
-+    VIR_DOMAIN_VCPU_LIVE    = (1 << 0), /* Affect active domain */
-+    VIR_DOMAIN_VCPU_CONFIG  = (1 << 1), /* Affect next boot */
-+
-+    /* Additional flags to be bit-wise OR'd in */
-+    VIR_DOMAIN_VCPU_MAXIMUM = (1 << 2), /* Max rather than current count */
-+} virDomainVcpuFlags;
-+
- int                     virDomainSetVcpus       (virDomainPtr domain,
-                                                  unsigned int nvcpus);
-+int                     virDomainSetVcpusFlags  (virDomainPtr domain,
-+                                                 unsigned int nvcpus,
-+                                                 unsigned int flags);
-+int                     virDomainGetVcpusFlags  (virDomainPtr domain,
-+                                                 unsigned int flags);
-
- int                     virDomainPinVcpu        (virDomainPtr domain,
-                                                  unsigned int vcpu,
-diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms
-index fceb516..a8091b1 100644
---- a/src/libvirt_public.syms
-+++ b/src/libvirt_public.syms
-@@ -409,6 +409,8 @@ LIBVIRT_0.8.5 {
-     global:
-         virDomainSetMemoryParameters;
-         virDomainGetMemoryParameters;
-+        virDomainGetVcpusFlags;
-+        virDomainSetVcpusFlags;
- } LIBVIRT_0.8.2;
-
- # .... define new API here using predicted next version number ....
--- 
-1.7.2.3
-

docs/api_extension/0003-define-internal-driver-API.patch

@@ -1,222 +0,0 @@
-From dd255d64053e9960cd375994ce8f056522e12acc Mon Sep 17 00:00:00 2001
-From: Eric Blake <eblake@redhat.com>
-Date: Mon, 27 Sep 2010 09:18:22 -0600
-Subject: [PATCH 03/15] vcpu: define internal driver API
-
-* src/driver.h (virDrvDomainSetVcpusFlags)
-(virDrvDomainGetVcpusFlags): New typedefs.
-(_virDriver): New callback members.
-* src/esx/esx_driver.c (esxDriver): Add stub for driver.
-* src/lxc/lxc_driver.c (lxcDriver): Likewise.
-* src/opennebula/one_driver.c (oneDriver): Likewise.
-* src/openvz/openvz_driver.c (openvzDriver): Likewise.
-* src/phyp/phyp_driver.c (phypDriver): Likewise.
-* src/qemu/qemu_driver.c (qemuDriver): Likewise.
-* src/remote/remote_driver.c (remote_driver): Likewise.
-* src/test/test_driver.c (testDriver): Likewise.
-* src/uml/uml_driver.c (umlDriver): Likewise.
-* src/vbox/vbox_tmpl.c (Driver): Likewise.
-* src/xen/xen_driver.c (xenUnifiedDriver): Likewise.
-* src/xenapi/xenapi_driver.c (xenapiDriver): Likewise.
----
- src/driver.h                |    9 +++++++++
- src/esx/esx_driver.c        |    2 ++
- src/lxc/lxc_driver.c        |    2 ++
- src/opennebula/one_driver.c |    2 ++
- src/openvz/openvz_driver.c  |    2 ++
- src/phyp/phyp_driver.c      |    2 ++
- src/qemu/qemu_driver.c      |    2 ++
- src/remote/remote_driver.c  |    2 ++
- src/test/test_driver.c      |    2 ++
- src/uml/uml_driver.c        |    2 ++
- src/vbox/vbox_tmpl.c        |    2 ++
- src/xen/xen_driver.c        |    2 ++
- src/xenapi/xenapi_driver.c  |    2 ++
- 13 files changed, 33 insertions(+), 0 deletions(-)
-
-diff --git a/src/driver.h b/src/driver.h
-index 32aeb04..79a96c1 100644
---- a/src/driver.h
-+++ b/src/driver.h
-@@ -185,6 +185,13 @@ typedef int
-         (*virDrvDomainSetVcpus)		(virDomainPtr domain,
-                                          unsigned int nvcpus);
- typedef int
-+        (*virDrvDomainSetVcpusFlags)	(virDomainPtr domain,
-+                                         unsigned int nvcpus,
-+                                         unsigned int flags);
-+typedef int
-+        (*virDrvDomainGetVcpusFlags)	(virDomainPtr domain,
-+                                         unsigned int flags);
-+typedef int
-         (*virDrvDomainPinVcpu)		(virDomainPtr domain,
-                                          unsigned int vcpu,
-                                          unsigned char *cpumap,
-@@ -520,6 +527,8 @@ struct _virDriver {
-     virDrvDomainRestore		domainRestore;
-     virDrvDomainCoreDump		domainCoreDump;
-     virDrvDomainSetVcpus		domainSetVcpus;
-+    virDrvDomainSetVcpusFlags		domainSetVcpusFlags;
-+    virDrvDomainGetVcpusFlags		domainGetVcpusFlags;
-     virDrvDomainPinVcpu		domainPinVcpu;
-     virDrvDomainGetVcpus		domainGetVcpus;
-     virDrvDomainGetMaxVcpus		domainGetMaxVcpus;
-diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c
-index 1b4ee29..2a32374 100644
---- a/src/esx/esx_driver.c
-+++ b/src/esx/esx_driver.c
-@@ -4160,6 +4160,8 @@ static virDriver esxDriver = {
-     NULL,                            /* domainRestore */
-     NULL,                            /* domainCoreDump */
-     esxDomainSetVcpus,               /* domainSetVcpus */
-+    NULL,                            /* domainSetVcpusFlags */
-+    NULL,                            /* domainGetVcpusFlags */
-     NULL,                            /* domainPinVcpu */
-     NULL,                            /* domainGetVcpus */
-     esxDomainGetMaxVcpus,            /* domainGetMaxVcpus */
-diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
-index df814da..7563a8c 100644
---- a/src/lxc/lxc_driver.c
-+++ b/src/lxc/lxc_driver.c
-@@ -2768,6 +2768,8 @@ static virDriver lxcDriver = {
-     NULL, /* domainRestore */
-     NULL, /* domainCoreDump */
-     NULL, /* domainSetVcpus */
-+    NULL, /* domainSetVcpusFlags */
-+    NULL, /* domainGetVcpusFlags */
-     NULL, /* domainPinVcpu */
-     NULL, /* domainGetVcpus */
-     NULL, /* domainGetMaxVcpus */
-diff --git a/src/opennebula/one_driver.c b/src/opennebula/one_driver.c
-index ced9a38..199fca3 100644
---- a/src/opennebula/one_driver.c
-+++ b/src/opennebula/one_driver.c
-@@ -751,6 +751,8 @@ static virDriver oneDriver = {
-     NULL, /* domainRestore */
-     NULL, /* domainCoreDump */
-     NULL, /* domainSetVcpus */
-+    NULL, /* domainSetVcpusFlags */
-+    NULL, /* domainGetVcpusFlags */
-     NULL, /* domainPinVcpu */
-     NULL, /* domainGetVcpus */
-     NULL, /* domainGetMaxVcpus */
-diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c
-index 92cf4a1..9d19aeb 100644
---- a/src/openvz/openvz_driver.c
-+++ b/src/openvz/openvz_driver.c
-@@ -1590,6 +1590,8 @@ static virDriver openvzDriver = {
-     NULL, /* domainRestore */
-     NULL, /* domainCoreDump */
-     openvzDomainSetVcpus, /* domainSetVcpus */
-+    NULL, /* domainSetVcpusFlags */
-+    NULL, /* domainGetVcpusFlags */
-     NULL, /* domainPinVcpu */
-     NULL, /* domainGetVcpus */
-     openvzDomainGetMaxVcpus, /* domainGetMaxVcpus */
-diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c
-index e63d8d9..6e0a5e9 100644
---- a/src/phyp/phyp_driver.c
-+++ b/src/phyp/phyp_driver.c
-@@ -3941,6 +3941,8 @@ static virDriver phypDriver = {
-     NULL,                       /* domainRestore */
-     NULL,                       /* domainCoreDump */
-     phypDomainSetCPU,           /* domainSetVcpus */
-+    NULL,                       /* domainSetVcpusFlags */
-+    NULL,                       /* domainGetVcpusFlags */
-     NULL,                       /* domainPinVcpu */
-     NULL,                       /* domainGetVcpus */
-     phypGetLparCPUMAX,          /* domainGetMaxVcpus */
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index abd8e9d..3d17e04 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -12938,6 +12938,8 @@ static virDriver qemuDriver = {
-     qemudDomainRestore, /* domainRestore */
-     qemudDomainCoreDump, /* domainCoreDump */
-     qemudDomainSetVcpus, /* domainSetVcpus */
-+    NULL, /* domainSetVcpusFlags */
-+    NULL, /* domainGetVcpusFlags */
-     qemudDomainPinVcpu, /* domainPinVcpu */
-     qemudDomainGetVcpus, /* domainGetVcpus */
-     qemudDomainGetMaxVcpus, /* domainGetMaxVcpus */
-diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
-index 0b10406..1a687ad 100644
---- a/src/remote/remote_driver.c
-+++ b/src/remote/remote_driver.c
-@@ -10468,6 +10468,8 @@ static virDriver remote_driver = {
-     remoteDomainRestore, /* domainRestore */
-     remoteDomainCoreDump, /* domainCoreDump */
-     remoteDomainSetVcpus, /* domainSetVcpus */
-+    NULL, /* domainSetVcpusFlags */
-+    NULL, /* domainGetVcpusFlags */
-     remoteDomainPinVcpu, /* domainPinVcpu */
-     remoteDomainGetVcpus, /* domainGetVcpus */
-     remoteDomainGetMaxVcpus, /* domainGetMaxVcpus */
-diff --git a/src/test/test_driver.c b/src/test/test_driver.c
-index 7d4d119..6a00558 100644
---- a/src/test/test_driver.c
-+++ b/src/test/test_driver.c
-@@ -5260,6 +5260,8 @@ static virDriver testDriver = {
-     testDomainRestore, /* domainRestore */
-     testDomainCoreDump, /* domainCoreDump */
-     testSetVcpus, /* domainSetVcpus */
-+    NULL, /* domainSetVcpusFlags */
-+    NULL, /* domainGetVcpusFlags */
-     testDomainPinVcpu, /* domainPinVcpu */
-     testDomainGetVcpus, /* domainGetVcpus */
-     testDomainGetMaxVcpus, /* domainGetMaxVcpus */
-diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c
-index 3dcd321..5161012 100644
---- a/src/uml/uml_driver.c
-+++ b/src/uml/uml_driver.c
-@@ -2129,6 +2129,8 @@ static virDriver umlDriver = {
-     NULL, /* domainRestore */
-     NULL, /* domainCoreDump */
-     NULL, /* domainSetVcpus */
-+    NULL, /* domainSetVcpusFlags */
-+    NULL, /* domainGetVcpusFlags */
-     NULL, /* domainPinVcpu */
-     NULL, /* domainGetVcpus */
-     NULL, /* domainGetMaxVcpus */
-diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c
-index 7e7d8e4..cb9193a 100644
---- a/src/vbox/vbox_tmpl.c
-+++ b/src/vbox/vbox_tmpl.c
-@@ -8267,6 +8267,8 @@ virDriver NAME(Driver) = {
-     NULL, /* domainRestore */
-     NULL, /* domainCoreDump */
-     vboxDomainSetVcpus, /* domainSetVcpus */
-+    NULL, /* domainSetVcpusFlags */
-+    NULL, /* domainGetVcpusFlags */
-     NULL, /* domainPinVcpu */
-     NULL, /* domainGetVcpus */
-     vboxDomainGetMaxVcpus, /* domainGetMaxVcpus */
-diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c
-index c2a4de3..7d67ced 100644
---- a/src/xen/xen_driver.c
-+++ b/src/xen/xen_driver.c
-@@ -1951,6 +1951,8 @@ static virDriver xenUnifiedDriver = {
-     xenUnifiedDomainRestore, /* domainRestore */
-     xenUnifiedDomainCoreDump, /* domainCoreDump */
-     xenUnifiedDomainSetVcpus, /* domainSetVcpus */
-+    NULL, /* domainSetVcpusFlags */
-+    NULL, /* domainGetVcpusFlags */
-     xenUnifiedDomainPinVcpu, /* domainPinVcpu */
-     xenUnifiedDomainGetVcpus, /* domainGetVcpus */
-     xenUnifiedDomainGetMaxVcpus, /* domainGetMaxVcpus */
-diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c
-index e62a139..753169c 100644
---- a/src/xenapi/xenapi_driver.c
-+++ b/src/xenapi/xenapi_driver.c
-@@ -1754,6 +1754,8 @@ static virDriver xenapiDriver = {
-     NULL, /* domainRestore */
-     NULL, /* domainCoreDump */
-     xenapiDomainSetVcpus, /* domainSetVcpus */
-+    NULL, /* domainSetVcpusFlags */
-+    NULL, /* domainGetVcpusFlags */
-     xenapiDomainPinVcpu, /* domainPinVcpu */
-     xenapiDomainGetVcpus, /* domainGetVcpus */
-     xenapiDomainGetMaxVcpus, /* domainGetMaxVcpus */
--- 
-1.7.2.3
-

docs/api_extension/0004-implement-the-public-APIs.patch

@@ -1,188 +0,0 @@
-From 9d2c60799271d605f82dfd4bfa6ed7d14ad87e26 Mon Sep 17 00:00:00 2001
-From: Eric Blake <eblake@redhat.com>
-Date: Mon, 27 Sep 2010 09:37:22 -0600
-Subject: [PATCH 04/15] vcpu: implement the public APIs
-
-Factors common checks (such as nonzero vcpu count) up front, but
-drivers will still need to do additional flag checks.
-
-* src/libvirt.c (virDomainSetVcpusFlags, virDomainGetVcpusFlags):
-New functions.
-(virDomainSetVcpus, virDomainGetMaxVcpus): Refer to new API.
----
- src/libvirt.c |  140 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
- 1 files changed, 134 insertions(+), 6 deletions(-)
-
-diff --git a/src/libvirt.c b/src/libvirt.c
-index 629d97b..1b39210 100644
---- a/src/libvirt.c
-+++ b/src/libvirt.c
-@@ -5192,7 +5192,9 @@ error:
-  * This function requires privileged access to the hypervisor.
-  *
-  * This command only changes the runtime configuration of the domain,
-- * so can only be called on an active domain.
-+ * so can only be called on an active domain.  It is hypervisor-dependent
-+ * whether it also affects persistent configuration; for more control,
-+ * use virDomainSetVcpusFlags().
-  *
-  * Returns 0 in case of success, -1 in case of failure.
-  */
-@@ -5237,13 +5239,139 @@ error:
- }
-
- /**
-+ * virDomainSetVcpusFlags:
-+ * @domain: pointer to domain object, or NULL for Domain0
-+ * @nvcpus: the new number of virtual CPUs for this domain, must be at least 1
-+ * @flags: an OR'ed set of virDomainVcpuFlags
-+ *
-+ * Dynamically change the number of virtual CPUs used by the domain.
-+ * Note that this call may fail if the underlying virtualization hypervisor
-+ * does not support it or if growing the number is arbitrary limited.
-+ * This function requires privileged access to the hypervisor.
-+ *
-+ * @flags must include VIR_DOMAIN_VCPU_LIVE to affect a running
-+ * domain (which may fail if domain is not active), or
-+ * VIR_DOMAIN_VCPU_CONFIG to affect the next boot via the XML
-+ * description of the domain.  Both flags may be set.
-+ *
-+ * If @flags includes VIR_DOMAIN_VCPU_MAXIMUM, then
-+ * VIR_DOMAIN_VCPU_LIVE must be clear, and only the maximum virtual
-+ * CPU limit is altered; generally, this value must be less than or
-+ * equal to virConnectGetMaxVcpus().  Otherwise, this call affects the
-+ * current virtual CPU limit, which must be less than or equal to the
-+ * maximum limit.
-+ *
-+ * Returns 0 in case of success, -1 in case of failure.
-+ */
-+
-+int
-+virDomainSetVcpusFlags(virDomainPtr domain, unsigned int nvcpus,
-+                       unsigned int flags)
-+{
-+    virConnectPtr conn;
-+    VIR_DEBUG("domain=%p, nvcpus=%u, flags=%u", domain, nvcpus, flags);
-+
-+    virResetLastError();
-+
-+    if (!VIR_IS_CONNECTED_DOMAIN(domain)) {
-+        virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__);
-+        virDispatchError(NULL);
-+        return (-1);
-+    }
-+    if (domain->conn->flags & VIR_CONNECT_RO) {
-+        virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
-+        goto error;
-+    }
-+
-+    /* Perform some argument validation common to all implementations.  */
-+    if (nvcpus < 1 || (unsigned short) nvcpus != nvcpus ||
-+        (flags & (VIR_DOMAIN_VCPU_LIVE | VIR_DOMAIN_VCPU_CONFIG)) == 0) {
-+        virLibDomainError(domain, VIR_ERR_INVALID_ARG, __FUNCTION__);
-+        goto error;
-+    }
-+    conn = domain->conn;
-+
-+    if (conn->driver->domainSetVcpusFlags) {
-+        int ret;
-+        ret = conn->driver->domainSetVcpusFlags (domain, nvcpus, flags);
-+        if (ret < 0)
-+            goto error;
-+        return ret;
-+    }
-+
-+    virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__);
-+
-+error:
-+    virDispatchError(domain->conn);
-+    return -1;
-+}
-+
-+/**
-+ * virDomainGetVcpusFlags:
-+ * @domain: pointer to domain object, or NULL for Domain0
-+ * @flags: an OR'ed set of virDomainVcpuFlags
-+ *
-+ * Query the number of virtual CPUs used by the domain.  Note that
-+ * this call may fail if the underlying virtualization hypervisor does
-+ * not support it.  This function requires privileged access to the
-+ * hypervisor.
-+ *
-+ * @flags must include either VIR_DOMAIN_VCPU_ACTIVE to query a
-+ * running domain (which will fail if domain is not active), or
-+ * VIR_DOMAIN_VCPU_PERSISTENT to query the XML description of the
-+ * domain.  It is an error to set both flags.
-+ *
-+ * If @flags includes VIR_DOMAIN_VCPU_MAXIMUM, then the maximum
-+ * virtual CPU limit is queried.  Otherwise, this call queries the
-+ * current virtual CPU limit.
-+ *
-+ * Returns 0 in case of success, -1 in case of failure.
-+ */
-+
-+int
-+virDomainGetVcpusFlags(virDomainPtr domain, unsigned int flags)
-+{
-+    virConnectPtr conn;
-+    VIR_DEBUG("domain=%p, flags=%u", domain, flags);
-+
-+    virResetLastError();
-+
-+    if (!VIR_IS_CONNECTED_DOMAIN(domain)) {
-+        virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__);
-+        virDispatchError(NULL);
-+        return (-1);
-+    }
-+
-+    /* Exactly one of these two flags should be set.  */
-+    if (!(flags & VIR_DOMAIN_VCPU_LIVE) == !(flags & VIR_DOMAIN_VCPU_CONFIG)) {
-+        virLibDomainError(domain, VIR_ERR_INVALID_ARG, __FUNCTION__);
-+        goto error;
-+    }
-+    conn = domain->conn;
-+
-+    if (conn->driver->domainGetVcpusFlags) {
-+        int ret;
-+        ret = conn->driver->domainGetVcpusFlags (domain, flags);
-+        if (ret < 0)
-+            goto error;
-+        return ret;
-+    }
-+
-+    virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__);
-+
-+error:
-+    virDispatchError(domain->conn);
-+    return -1;
-+}
-+
-+/**
-  * virDomainPinVcpu:
-  * @domain: pointer to domain object, or NULL for Domain0
-  * @vcpu: virtual CPU number
-  * @cpumap: pointer to a bit map of real CPUs (in 8-bit bytes) (IN)
-- * 	Each bit set to 1 means that corresponding CPU is usable.
-- * 	Bytes are stored in little-endian order: CPU0-7, 8-15...
-- * 	In each byte, lowest CPU number is least significant bit.
-+ *      Each bit set to 1 means that corresponding CPU is usable.
-+ *      Bytes are stored in little-endian order: CPU0-7, 8-15...
-+ *      In each byte, lowest CPU number is least significant bit.
-  * @maplen: number of bytes in cpumap, from 1 up to size of CPU map in
-  *	underlying virtualization system (Xen...).
-  *	If maplen < size, missing bytes are set to zero.
-@@ -5371,9 +5499,9 @@ error:
-  *
-  * Provides the maximum number of virtual CPUs supported for
-  * the guest VM. If the guest is inactive, this is basically
-- * the same as virConnectGetMaxVcpus. If the guest is running
-+ * the same as virConnectGetMaxVcpus(). If the guest is running
-  * this will reflect the maximum number of virtual CPUs the
-- * guest was booted with.
-+ * guest was booted with.  For more details, see virDomainGetVcpusFlags().
-  *
-  * Returns the maximum of virtual CPU or -1 in case of error.
-  */
--- 
-1.7.2.3
-

docs/api_extension/0005-implement-the-remote-protocol.patch

@@ -1,421 +0,0 @@
-From eb826444f90c2563dadf148630b0cd6a9b41ba1e Mon Sep 17 00:00:00 2001
-From: Eric Blake <eblake@redhat.com>
-Date: Mon, 27 Sep 2010 10:10:06 -0600
-Subject: [PATCH 05/15] vcpu: implement the remote protocol
-
-Done by editing the first three files, then running
-'make -C src rpcgen', then editing src/remote_protocol-structs
-to match.
-
-* daemon/remote.c (remoteDispatchDomainSetVcpusFlags)
-(remoteDispatchDomainGetVcpusFlags): New functions.
-* src/remote/remote_driver.c (remoteDomainSetVcpusFlags)
-(remoteDomainGetVcpusFlags, remote_driver): Client side
-serialization.
-* src/remote/remote_protocol.x
-(remote_domain_set_vcpus_flags_args)
-(remote_domain_get_vcpus_flags_args)
-(remote_domain_get_vcpus_flags_ret)
-(REMOTE_PROC_DOMAIN_SET_VCPUS_FLAGS)
-(REMOTE_PROC_DOMAIN_GET_VCPUS_FLAGS): Define wire format.
-* daemon/remote_dispatch_args.h: Regenerate.
-* daemon/remote_dispatch_prototypes.h: Likewise.
-* daemon/remote_dispatch_table.h: Likewise.
-* src/remote/remote_protocol.c: Likewise.
-* src/remote/remote_protocol.h: Likewise.
-* src/remote_protocol-structs: Likewise.
----
- daemon/remote.c                     |   53 ++++++++++++++++++++++++++++++++
- daemon/remote_dispatch_args.h       |    2 +
- daemon/remote_dispatch_prototypes.h |   16 ++++++++++
- daemon/remote_dispatch_ret.h        |    1 +
- daemon/remote_dispatch_table.h      |   10 ++++++
- src/remote/remote_driver.c          |   57 +++++++++++++++++++++++++++++++++-
- src/remote/remote_protocol.c        |   33 ++++++++++++++++++++
- src/remote/remote_protocol.h        |   26 ++++++++++++++++
- src/remote/remote_protocol.x        |   19 +++++++++++-
- src/remote_protocol-structs         |   12 +++++++
- 10 files changed, 226 insertions(+), 3 deletions(-)
-
-diff --git a/daemon/remote.c b/daemon/remote.c
-index 7a96e29..323f00c 100644
---- a/daemon/remote.c
-+++ b/daemon/remote.c
-@@ -1751,6 +1751,33 @@ oom:
- }
-
- static int
-+remoteDispatchDomainGetVcpusFlags (struct qemud_server *server ATTRIBUTE_UNUSED,
-+                                   struct qemud_client *client ATTRIBUTE_UNUSED,
-+                                   virConnectPtr conn,
-+                                   remote_message_header *hdr ATTRIBUTE_UNUSED,
-+                                   remote_error *rerr,
-+                                   remote_domain_get_vcpus_flags_args *args,
-+                                   remote_domain_get_vcpus_flags_ret *ret)
-+{
-+    virDomainPtr dom;
-+
-+    dom = get_nonnull_domain (conn, args->dom);
-+    if (dom == NULL) {
-+        remoteDispatchConnError(rerr, conn);
-+        return -1;
-+    }
-+
-+    ret->num = virDomainGetVcpusFlags (dom, args->flags);
-+    if (ret->num == -1) {
-+        virDomainFree(dom);
-+        remoteDispatchConnError(rerr, conn);
-+        return -1;
-+    }
-+    virDomainFree(dom);
-+    return 0;
-+}
-+
-+static int
- remoteDispatchDomainMigratePrepare (struct qemud_server *server ATTRIBUTE_UNUSED,
-                                     struct qemud_client *client ATTRIBUTE_UNUSED,
-                                     virConnectPtr conn,
-@@ -2568,6 +2595,32 @@ remoteDispatchDomainSetVcpus (struct qemud_server *server ATTRIBUTE_UNUSED,
- }
-
- static int
-+remoteDispatchDomainSetVcpusFlags (struct qemud_server *server ATTRIBUTE_UNUSED,
-+                                   struct qemud_client *client ATTRIBUTE_UNUSED,
-+                                   virConnectPtr conn,
-+                                   remote_message_header *hdr ATTRIBUTE_UNUSED,
-+                                   remote_error *rerr,
-+                                   remote_domain_set_vcpus_flags_args *args,
-+                                   void *ret ATTRIBUTE_UNUSED)
-+{
-+    virDomainPtr dom;
-+
-+    dom = get_nonnull_domain (conn, args->dom);
-+    if (dom == NULL) {
-+        remoteDispatchConnError(rerr, conn);
-+        return -1;
-+    }
-+
-+    if (virDomainSetVcpusFlags (dom, args->nvcpus, args->flags) == -1) {
-+        virDomainFree(dom);
-+        remoteDispatchConnError(rerr, conn);
-+        return -1;
-+    }
-+    virDomainFree(dom);
-+    return 0;
-+}
-+
-+static int
- remoteDispatchDomainShutdown (struct qemud_server *server ATTRIBUTE_UNUSED,
-                               struct qemud_client *client ATTRIBUTE_UNUSED,
-                               virConnectPtr conn,
-diff --git a/daemon/remote_dispatch_args.h b/daemon/remote_dispatch_args.h
-index d8528b6..9583e9c 100644
---- a/daemon/remote_dispatch_args.h
-+++ b/daemon/remote_dispatch_args.h
-@@ -167,3 +167,5 @@
-     remote_domain_create_with_flags_args val_remote_domain_create_with_flags_args;
-     remote_domain_set_memory_parameters_args val_remote_domain_set_memory_parameters_args;
-     remote_domain_get_memory_parameters_args val_remote_domain_get_memory_parameters_args;
-+    remote_domain_set_vcpus_flags_args val_remote_domain_set_vcpus_flags_args;
-+    remote_domain_get_vcpus_flags_args val_remote_domain_get_vcpus_flags_args;
-diff --git a/daemon/remote_dispatch_prototypes.h b/daemon/remote_dispatch_prototypes.h
-index b674bb4..6b35851 100644
---- a/daemon/remote_dispatch_prototypes.h
-+++ b/daemon/remote_dispatch_prototypes.h
-@@ -306,6 +306,14 @@ static int remoteDispatchDomainGetVcpus(
-     remote_error *err,
-     remote_domain_get_vcpus_args *args,
-     remote_domain_get_vcpus_ret *ret);
-+static int remoteDispatchDomainGetVcpusFlags(
-+    struct qemud_server *server,
-+    struct qemud_client *client,
-+    virConnectPtr conn,
-+    remote_message_header *hdr,
-+    remote_error *err,
-+    remote_domain_get_vcpus_flags_args *args,
-+    remote_domain_get_vcpus_flags_ret *ret);
- static int remoteDispatchDomainHasCurrentSnapshot(
-     struct qemud_server *server,
-     struct qemud_client *client,
-@@ -554,6 +562,14 @@ static int remoteDispatchDomainSetVcpus(
-     remote_error *err,
-     remote_domain_set_vcpus_args *args,
-     void *ret);
-+static int remoteDispatchDomainSetVcpusFlags(
-+    struct qemud_server *server,
-+    struct qemud_client *client,
-+    virConnectPtr conn,
-+    remote_message_header *hdr,
-+    remote_error *err,
-+    remote_domain_set_vcpus_flags_args *args,
-+    void *ret);
- static int remoteDispatchDomainShutdown(
-     struct qemud_server *server,
-     struct qemud_client *client,
-diff --git a/daemon/remote_dispatch_ret.h b/daemon/remote_dispatch_ret.h
-index 17c9bca..3723b00 100644
---- a/daemon/remote_dispatch_ret.h
-+++ b/daemon/remote_dispatch_ret.h
-@@ -136,3 +136,4 @@
-     remote_domain_get_block_info_ret val_remote_domain_get_block_info_ret;
-     remote_domain_create_with_flags_ret val_remote_domain_create_with_flags_ret;
-     remote_domain_get_memory_parameters_ret val_remote_domain_get_memory_parameters_ret;
-+    remote_domain_get_vcpus_flags_ret val_remote_domain_get_vcpus_flags_ret;
-diff --git a/daemon/remote_dispatch_table.h b/daemon/remote_dispatch_table.h
-index 47d95eb..dd2adc7 100644
---- a/daemon/remote_dispatch_table.h
-+++ b/daemon/remote_dispatch_table.h
-@@ -997,3 +997,13 @@
-     .args_filter = (xdrproc_t) xdr_remote_domain_get_memory_parameters_args,
-     .ret_filter = (xdrproc_t) xdr_remote_domain_get_memory_parameters_ret,
- },
-+{   /* DomainSetVcpusFlags => 199 */
-+    .fn = (dispatch_fn) remoteDispatchDomainSetVcpusFlags,
-+    .args_filter = (xdrproc_t) xdr_remote_domain_set_vcpus_flags_args,
-+    .ret_filter = (xdrproc_t) xdr_void,
-+},
-+{   /* DomainGetVcpusFlags => 200 */
-+    .fn = (dispatch_fn) remoteDispatchDomainGetVcpusFlags,
-+    .args_filter = (xdrproc_t) xdr_remote_domain_get_vcpus_flags_args,
-+    .ret_filter = (xdrproc_t) xdr_remote_domain_get_vcpus_flags_ret,
-+},
-diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
-index 1a687ad..37c37ef 100644
---- a/src/remote/remote_driver.c
-+++ b/src/remote/remote_driver.c
-@@ -2580,6 +2580,59 @@ done:
- }
-
- static int
-+remoteDomainSetVcpusFlags (virDomainPtr domain, unsigned int nvcpus,
-+                           unsigned int flags)
-+{
-+    int rv = -1;
-+    remote_domain_set_vcpus_flags_args args;
-+    struct private_data *priv = domain->conn->privateData;
-+
-+    remoteDriverLock(priv);
-+
-+    make_nonnull_domain (&args.dom, domain);
-+    args.nvcpus = nvcpus;
-+    args.flags = flags;
-+
-+    if (call (domain->conn, priv, 0, REMOTE_PROC_DOMAIN_SET_VCPUS_FLAGS,
-+              (xdrproc_t) xdr_remote_domain_set_vcpus_flags_args,
-+              (char *) &args,
-+              (xdrproc_t) xdr_void, (char *) NULL) == -1)
-+        goto done;
-+
-+    rv = 0;
-+
-+done:
-+    remoteDriverUnlock(priv);
-+    return rv;
-+}
-+
-+static int
-+remoteDomainGetVcpusFlags (virDomainPtr domain, unsigned int flags)
-+{
-+    int rv = -1;
-+    remote_domain_get_vcpus_flags_args args;
-+    remote_domain_get_vcpus_flags_ret ret;
-+    struct private_data *priv = domain->conn->privateData;
-+
-+    remoteDriverLock(priv);
-+
-+    make_nonnull_domain (&args.dom, domain);
-+    args.flags = flags;
-+
-+    memset (&ret, 0, sizeof ret);
-+    if (call (domain->conn, priv, 0, REMOTE_PROC_DOMAIN_GET_VCPUS_FLAGS,
-+              (xdrproc_t) xdr_remote_domain_get_vcpus_flags_args, (char *) &args,
-+              (xdrproc_t) xdr_remote_domain_get_vcpus_flags_ret, (char *) &ret) == -1)
-+        goto done;
-+
-+    rv = ret.num;
-+
-+done:
-+    remoteDriverUnlock(priv);
-+    return rv;
-+}
-+
-+static int
- remoteDomainPinVcpu (virDomainPtr domain,
-                      unsigned int vcpu,
-                      unsigned char *cpumap,
-@@ -10468,8 +10521,8 @@ static virDriver remote_driver = {
-     remoteDomainRestore, /* domainRestore */
-     remoteDomainCoreDump, /* domainCoreDump */
-     remoteDomainSetVcpus, /* domainSetVcpus */
--    NULL, /* domainSetVcpusFlags */
--    NULL, /* domainGetVcpusFlags */
-+    remoteDomainSetVcpusFlags, /* domainSetVcpusFlags */
-+    remoteDomainGetVcpusFlags, /* domainGetVcpusFlags */
-     remoteDomainPinVcpu, /* domainPinVcpu */
-     remoteDomainGetVcpus, /* domainGetVcpus */
-     remoteDomainGetMaxVcpus, /* domainGetMaxVcpus */
-diff --git a/src/remote/remote_protocol.c b/src/remote/remote_protocol.c
-index 5c55713..38ea050 100644
---- a/src/remote/remote_protocol.c
-+++ b/src/remote/remote_protocol.c
-@@ -1355,6 +1355,39 @@ xdr_remote_domain_set_vcpus_args (XDR *xdrs, remote_domain_set_vcpus_args *objp)
- }
-
- bool_t
-+xdr_remote_domain_set_vcpus_flags_args (XDR *xdrs, remote_domain_set_vcpus_flags_args *objp)
-+{
-+
-+         if (!xdr_remote_nonnull_domain (xdrs, &objp->dom))
-+                 return FALSE;
-+         if (!xdr_u_int (xdrs, &objp->nvcpus))
-+                 return FALSE;
-+         if (!xdr_u_int (xdrs, &objp->flags))
-+                 return FALSE;
-+        return TRUE;
-+}
-+
-+bool_t
-+xdr_remote_domain_get_vcpus_flags_args (XDR *xdrs, remote_domain_get_vcpus_flags_args *objp)
-+{
-+
-+         if (!xdr_remote_nonnull_domain (xdrs, &objp->dom))
-+                 return FALSE;
-+         if (!xdr_u_int (xdrs, &objp->flags))
-+                 return FALSE;
-+        return TRUE;
-+}
-+
-+bool_t
-+xdr_remote_domain_get_vcpus_flags_ret (XDR *xdrs, remote_domain_get_vcpus_flags_ret *objp)
-+{
-+
-+         if (!xdr_int (xdrs, &objp->num))
-+                 return FALSE;
-+        return TRUE;
-+}
-+
-+bool_t
- xdr_remote_domain_pin_vcpu_args (XDR *xdrs, remote_domain_pin_vcpu_args *objp)
- {
-         char **objp_cpp0 = (char **) (void *) &objp->cpumap.cpumap_val;
-diff --git a/src/remote/remote_protocol.h b/src/remote/remote_protocol.h
-index 756da11..d75e76c 100644
---- a/src/remote/remote_protocol.h
-+++ b/src/remote/remote_protocol.h
-@@ -750,6 +750,24 @@ struct remote_domain_set_vcpus_args {
- };
- typedef struct remote_domain_set_vcpus_args remote_domain_set_vcpus_args;
-
-+struct remote_domain_set_vcpus_flags_args {
-+        remote_nonnull_domain dom;
-+        u_int nvcpus;
-+        u_int flags;
-+};
-+typedef struct remote_domain_set_vcpus_flags_args remote_domain_set_vcpus_flags_args;
-+
-+struct remote_domain_get_vcpus_flags_args {
-+        remote_nonnull_domain dom;
-+        u_int flags;
-+};
-+typedef struct remote_domain_get_vcpus_flags_args remote_domain_get_vcpus_flags_args;
-+
-+struct remote_domain_get_vcpus_flags_ret {
-+        int num;
-+};
-+typedef struct remote_domain_get_vcpus_flags_ret remote_domain_get_vcpus_flags_ret;
-+
- struct remote_domain_pin_vcpu_args {
-         remote_nonnull_domain dom;
-         int vcpu;
-@@ -2281,6 +2299,8 @@ enum remote_procedure {
-         REMOTE_PROC_DOMAIN_CREATE_WITH_FLAGS = 196,
-         REMOTE_PROC_DOMAIN_SET_MEMORY_PARAMETERS = 197,
-         REMOTE_PROC_DOMAIN_GET_MEMORY_PARAMETERS = 198,
-+        REMOTE_PROC_DOMAIN_SET_VCPUS_FLAGS = 199,
-+        REMOTE_PROC_DOMAIN_GET_VCPUS_FLAGS = 200,
- };
- typedef enum remote_procedure remote_procedure;
-
-@@ -2422,6 +2442,9 @@ extern  bool_t xdr_remote_domain_define_xml_args (XDR *, remote_domain_define_xm
- extern  bool_t xdr_remote_domain_define_xml_ret (XDR *, remote_domain_define_xml_ret*);
- extern  bool_t xdr_remote_domain_undefine_args (XDR *, remote_domain_undefine_args*);
- extern  bool_t xdr_remote_domain_set_vcpus_args (XDR *, remote_domain_set_vcpus_args*);
-+extern  bool_t xdr_remote_domain_set_vcpus_flags_args (XDR *, remote_domain_set_vcpus_flags_args*);
-+extern  bool_t xdr_remote_domain_get_vcpus_flags_args (XDR *, remote_domain_get_vcpus_flags_args*);
-+extern  bool_t xdr_remote_domain_get_vcpus_flags_ret (XDR *, remote_domain_get_vcpus_flags_ret*);
- extern  bool_t xdr_remote_domain_pin_vcpu_args (XDR *, remote_domain_pin_vcpu_args*);
- extern  bool_t xdr_remote_domain_get_vcpus_args (XDR *, remote_domain_get_vcpus_args*);
- extern  bool_t xdr_remote_domain_get_vcpus_ret (XDR *, remote_domain_get_vcpus_ret*);
-@@ -2762,6 +2785,9 @@ extern bool_t xdr_remote_domain_define_xml_args ();
- extern bool_t xdr_remote_domain_define_xml_ret ();
- extern bool_t xdr_remote_domain_undefine_args ();
- extern bool_t xdr_remote_domain_set_vcpus_args ();
-+extern bool_t xdr_remote_domain_set_vcpus_flags_args ();
-+extern bool_t xdr_remote_domain_get_vcpus_flags_args ();
-+extern bool_t xdr_remote_domain_get_vcpus_flags_ret ();
- extern bool_t xdr_remote_domain_pin_vcpu_args ();
- extern bool_t xdr_remote_domain_get_vcpus_args ();
- extern bool_t xdr_remote_domain_get_vcpus_ret ();
-diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x
-index e80fb5f..d57e6d0 100644
---- a/src/remote/remote_protocol.x
-+++ b/src/remote/remote_protocol.x
-@@ -768,6 +768,21 @@ struct remote_domain_set_vcpus_args {
-     int nvcpus;
- };
-
-+struct remote_domain_set_vcpus_flags_args {
-+    remote_nonnull_domain dom;
-+    unsigned int nvcpus;
-+    unsigned int flags;
-+};
-+
-+struct remote_domain_get_vcpus_flags_args {
-+    remote_nonnull_domain dom;
-+    unsigned int flags;
-+};
-+
-+struct remote_domain_get_vcpus_flags_ret {
-+    int num;
-+};
-+
- struct remote_domain_pin_vcpu_args {
-     remote_nonnull_domain dom;
-     int vcpu;
-@@ -2062,7 +2077,9 @@ enum remote_procedure {
-     REMOTE_PROC_DOMAIN_EVENT_IO_ERROR_REASON = 195,
-     REMOTE_PROC_DOMAIN_CREATE_WITH_FLAGS = 196,
-     REMOTE_PROC_DOMAIN_SET_MEMORY_PARAMETERS = 197,
--    REMOTE_PROC_DOMAIN_GET_MEMORY_PARAMETERS = 198
-+    REMOTE_PROC_DOMAIN_GET_MEMORY_PARAMETERS = 198,
-+    REMOTE_PROC_DOMAIN_SET_VCPUS_FLAGS = 199,
-+    REMOTE_PROC_DOMAIN_GET_VCPUS_FLAGS = 200
-
-     /*
-      * Notice how the entries are grouped in sets of 10 ?
-diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs
-index 838423e..d505886 100644
---- a/src/remote_protocol-structs
-+++ b/src/remote_protocol-structs
-@@ -461,6 +461,18 @@ struct remote_domain_set_vcpus_args {
- 	remote_nonnull_domain      dom;
- 	int                        nvcpus;
- };
-+struct remote_domain_set_vcpus_flags_args {
-+	remote_nonnull_domain      dom;
-+	u_int                      nvcpus;
-+	u_int                      flags;
-+};
-+struct remote_domain_get_vcpus_flags_args {
-+	remote_nonnull_domain      dom;
-+	u_int                      flags;
-+};
-+struct remote_domain_get_vcpus_flags_ret {
-+	int                        num;
-+};
- struct remote_domain_pin_vcpu_args {
- 	remote_nonnull_domain      dom;
- 	int                        vcpu;
--- 
-1.7.2.3
-

docs/api_extension/0006-make-old-API-trivially-wrap-to-new-API.patch

@@ -1,735 +0,0 @@
-From 50c51f13e2af04afac46e181c4ed62581545a488 Mon Sep 17 00:00:00 2001
-From: Eric Blake <eblake@redhat.com>
-Date: Mon, 27 Sep 2010 16:37:53 -0600
-Subject: [PATCH 06/15] vcpu: make old API trivially wrap to new API
-
-Note - this wrapping is completely mechanical; the old API will
-function identically, since the new API validates that the exact
-same flags are provided by the old API.  On a per-driver basis,
-it may make sense to have the old API pass a different set of flags,
-but that should be done in the per-driver patch that implements
-the full range of flag support in the new API.
-
-* src/esx/esx_driver.c (esxDomainSetVcpus, escDomainGetMaxVpcus):
-Move guts...
-(esxDomainSetVcpusFlags, esxDomainGetVcpusFlags): ...to new
-functions.
-(esxDriver): Trivially support the new API.
-* src/openvz/openvz_driver.c (openvzDomainSetVcpus)
-(openvzDomainSetVcpusFlags, openvzDomainGetMaxVcpus)
-(openvzDomainGetVcpusFlags, openvzDriver): Likewise.
-* src/phyp/phyp_driver.c (phypDomainSetCPU)
-(phypDomainSetVcpusFlags, phypGetLparCPUMAX)
-(phypDomainGetVcpusFlags, phypDriver): Likewise.
-* src/qemu/qemu_driver.c (qemudDomainSetVcpus)
-(qemudDomainSetVcpusFlags, qemudDomainGetMaxVcpus)
-(qemudDomainGetVcpusFlags, qemuDriver): Likewise.
-* src/test/test_driver.c (testSetVcpus, testDomainSetVcpusFlags)
-(testDomainGetMaxVcpus, testDomainGetVcpusFlags, testDriver):
-Likewise.
-* src/vbox/vbox_tmpl.c (vboxDomainSetVcpus)
-(vboxDomainSetVcpusFlags, virDomainGetMaxVcpus)
-(virDomainGetVcpusFlags, virDriver): Likewise.
-* src/xen/xen_driver.c (xenUnifiedDomainSetVcpus)
-(xenUnifiedDomainSetVcpusFlags, xenUnifiedDomainGetMaxVcpus)
-(xenUnifiedDomainGetVcpusFlags, xenUnifiedDriver): Likewise.
-* src/xenapi/xenapi_driver.c (xenapiDomainSetVcpus)
-(xenapiDomainSetVcpusFlags, xenapiDomainGetMaxVcpus)
-(xenapiDomainGetVcpusFlags, xenapiDriver): Likewise.
-(xenapiError): New helper macro.
----
- src/esx/esx_driver.c       |   32 +++++++++++++++++++---
- src/openvz/openvz_driver.c |   34 +++++++++++++++++++++---
- src/phyp/phyp_driver.c     |   32 ++++++++++++++++++++---
- src/qemu/qemu_driver.c     |   38 +++++++++++++++++++++++++---
- src/test/test_driver.c     |   36 ++++++++++++++++++++++---
- src/vbox/vbox_tmpl.c       |   36 +++++++++++++++++++++++---
- src/xen/xen_driver.c       |   34 ++++++++++++++++++++++---
- src/xenapi/xenapi_driver.c |   60 ++++++++++++++++++++++++++++++++++++++------
- 8 files changed, 263 insertions(+), 39 deletions(-)
-
-diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c
-index 2a32374..b3e1284 100644
---- a/src/esx/esx_driver.c
-+++ b/src/esx/esx_driver.c
-@@ -2384,7 +2384,8 @@ esxDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info)
-
-
- static int
--esxDomainSetVcpus(virDomainPtr domain, unsigned int nvcpus)
-+esxDomainSetVcpusFlags(virDomainPtr domain, unsigned int nvcpus,
-+                       unsigned int flags)
- {
-     int result = -1;
-     esxPrivate *priv = domain->conn->privateData;
-@@ -2394,6 +2395,11 @@ esxDomainSetVcpus(virDomainPtr domain, unsigned int nvcpus)
-     esxVI_ManagedObjectReference *task = NULL;
-     esxVI_TaskInfoState taskInfoState;
-
-+    if (flags != VIR_DOMAIN_VCPU_LIVE) {
-+        ESX_ERROR(VIR_ERR_INVALID_ARG, _("unsupported flags: (0x%x)"), flags);
-+        return -1;
-+    }
-+
-     if (nvcpus < 1) {
-         ESX_ERROR(VIR_ERR_INVALID_ARG, "%s",
-                   _("Requested number of virtual CPUs must at least be 1"));
-@@ -2453,15 +2459,26 @@ esxDomainSetVcpus(virDomainPtr domain, unsigned int nvcpus)
- }
-
-
-+static int
-+esxDomainSetVcpus(virDomainPtr domain, unsigned int nvcpus)
-+{
-+    return esxDomainSetVcpusFlags(domain, nvcpus, VIR_DOMAIN_VCPU_LIVE);
-+}
-+
-
- static int
--esxDomainGetMaxVcpus(virDomainPtr domain)
-+esxDomainGetVcpusFlags(virDomainPtr domain, unsigned int flags)
- {
-     esxPrivate *priv = domain->conn->privateData;
-     esxVI_String *propertyNameList = NULL;
-     esxVI_ObjectContent *hostSystem = NULL;
-     esxVI_DynamicProperty *dynamicProperty = NULL;
-
-+    if (flags != (VIR_DOMAIN_VCPU_LIVE | VIR_DOMAIN_VCPU_MAXIMUM)) {
-+        ESX_ERROR(VIR_ERR_INVALID_ARG, _("unsupported flags: (0x%x)"), flags);
-+        return -1;
-+    }
-+
-     if (priv->maxVcpus > 0) {
-         return priv->maxVcpus;
-     }
-@@ -2507,7 +2524,12 @@ esxDomainGetMaxVcpus(virDomainPtr domain)
-     return priv->maxVcpus;
- }
-
--
-+static int
-+esxDomainGetMaxVcpus(virDomainPtr domain)
-+{
-+    return esxDomainGetVcpusFlags(domain, (VIR_DOMAIN_VCPU_LIVE |
-+                                           VIR_DOMAIN_VCPU_MAXIMUM));
-+}
-
- static char *
- esxDomainDumpXML(virDomainPtr domain, int flags)
-@@ -4160,8 +4182,8 @@ static virDriver esxDriver = {
-     NULL,                            /* domainRestore */
-     NULL,                            /* domainCoreDump */
-     esxDomainSetVcpus,               /* domainSetVcpus */
--    NULL,                            /* domainSetVcpusFlags */
--    NULL,                            /* domainGetVcpusFlags */
-+    esxDomainSetVcpusFlags,          /* domainSetVcpusFlags */
-+    esxDomainGetVcpusFlags,          /* domainGetVcpusFlags */
-     NULL,                            /* domainPinVcpu */
-     NULL,                            /* domainGetVcpus */
-     esxDomainGetMaxVcpus,            /* domainGetMaxVcpus */
-diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c
-index 9d19aeb..0f3cfdf 100644
---- a/src/openvz/openvz_driver.c
-+++ b/src/openvz/openvz_driver.c
-@@ -67,7 +67,6 @@
- static int openvzGetProcessInfo(unsigned long long *cpuTime, int vpsid);
- static int openvzGetMaxVCPUs(virConnectPtr conn, const char *type);
- static int openvzDomainGetMaxVcpus(virDomainPtr dom);
--static int openvzDomainSetVcpus(virDomainPtr dom, unsigned int nvcpus);
- static int openvzDomainSetVcpusInternal(virDomainObjPtr vm,
-                                         unsigned int nvcpus);
- static int openvzDomainSetMemoryInternal(virDomainObjPtr vm,
-@@ -1211,11 +1210,24 @@ static int openvzGetMaxVCPUs(virConnectPtr conn ATTRIBUTE_UNUSED,
-     return -1;
- }
-
-+static int
-+openvzDomainGetVcpusFlags(virDomainPtr dom ATTRIBUTE_UNUSED,
-+                          unsigned int flags)
-+{
-+    if (flags != (VIR_DOMAIN_VCPU_LIVE | VIR_DOMAIN_VCPU_MAXIMUM)) {
-+        openvzError(VIR_ERR_INVALID_ARG, _("unsupported flags (0x%x)"), flags);
-+        return -1;
-+    }
-
--static int openvzDomainGetMaxVcpus(virDomainPtr dom ATTRIBUTE_UNUSED) {
-     return openvzGetMaxVCPUs(NULL, "openvz");
- }
-
-+static int openvzDomainGetMaxVcpus(virDomainPtr dom)
-+{
-+    return openvzDomainGetVcpusFlags(dom, (VIR_DOMAIN_VCPU_LIVE |
-+                                           VIR_DOMAIN_VCPU_MAXIMUM));
-+}
-+
- static int openvzDomainSetVcpusInternal(virDomainObjPtr vm,
-                                         unsigned int nvcpus)
- {
-@@ -1241,12 +1253,18 @@ static int openvzDomainSetVcpusInternal(virDomainObjPtr vm,
-     return 0;
- }
-
--static int openvzDomainSetVcpus(virDomainPtr dom, unsigned int nvcpus)
-+static int openvzDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus,
-+                                     unsigned int flags)
- {
-     virDomainObjPtr         vm;
-     struct openvz_driver   *driver = dom->conn->privateData;
-     int                     ret = -1;
-
-+    if (flags != VIR_DOMAIN_VCPU_LIVE) {
-+        openvzError(VIR_ERR_INVALID_ARG, _("unsupported flags (0x%x)"), flags);
-+        return -1;
-+    }
-+
-     openvzDriverLock(driver);
-     vm = virDomainFindByUUID(&driver->domains, dom->uuid);
-     openvzDriverUnlock(driver);
-@@ -1272,6 +1290,12 @@ cleanup:
-     return ret;
- }
-
-+static int
-+openvzDomainSetVcpus(virDomainPtr dom, unsigned int nvcpus)
-+{
-+    return openvzDomainSetVcpusFlags(dom, nvcpus, VIR_DOMAIN_VCPU_LIVE);
-+}
-+
- static virDrvOpenStatus openvzOpen(virConnectPtr conn,
-                                    virConnectAuthPtr auth ATTRIBUTE_UNUSED,
-                                    int flags ATTRIBUTE_UNUSED)
-@@ -1590,8 +1614,8 @@ static virDriver openvzDriver = {
-     NULL, /* domainRestore */
-     NULL, /* domainCoreDump */
-     openvzDomainSetVcpus, /* domainSetVcpus */
--    NULL, /* domainSetVcpusFlags */
--    NULL, /* domainGetVcpusFlags */
-+    openvzDomainSetVcpusFlags, /* domainSetVcpusFlags */
-+    openvzDomainGetVcpusFlags, /* domainGetVcpusFlags */
-     NULL, /* domainPinVcpu */
-     NULL, /* domainGetVcpus */
-     openvzDomainGetMaxVcpus, /* domainGetMaxVcpus */
-diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c
-index 6e0a5e9..e284ae0 100644
---- a/src/phyp/phyp_driver.c
-+++ b/src/phyp/phyp_driver.c
-@@ -1497,15 +1497,27 @@ phypGetLparCPU(virConnectPtr conn, const char *managed_system, int lpar_id)
- }
-
- static int
--phypGetLparCPUMAX(virDomainPtr dom)
-+phypDomainGetVcpusFlags(virDomainPtr dom, unsigned int flags)
- {
-     phyp_driverPtr phyp_driver = dom->conn->privateData;
-     char *managed_system = phyp_driver->managed_system;
-
-+    if (flags != (VIR_DOMAIN_VCPU_LIVE | VIR_DOMAIN_VCPU_MAXIMUM)) {
-+        PHYP_ERROR(VIR_ERR_INVALID_ARG, _("unsupported flags: (0x%x)"), flags);
-+        return -1;
-+    }
-+
-     return phypGetLparCPUGeneric(dom->conn, managed_system, dom->id, 1);
- }
-
- static int
-+phypGetLparCPUMAX(virDomainPtr dom)
-+{
-+    return phypDomainGetVcpusFlags(dom, (VIR_DOMAIN_VCPU_LIVE |
-+                                         VIR_DOMAIN_VCPU_MAXIMUM));
-+}
-+
-+static int
- phypGetRemoteSlot(virConnectPtr conn, const char *managed_system,
-                   const char *lpar_name)
- {
-@@ -3831,7 +3843,8 @@ phypConnectGetCapabilities(virConnectPtr conn)
- }
-
- static int
--phypDomainSetCPU(virDomainPtr dom, unsigned int nvcpus)
-+phypDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus,
-+                        unsigned int flags)
- {
-     ConnectionData *connection_data = dom->conn->networkPrivateData;
-     phyp_driverPtr phyp_driver = dom->conn->privateData;
-@@ -3846,6 +3859,11 @@ phypDomainSetCPU(virDomainPtr dom, unsigned int nvcpus)
-     unsigned int amount = 0;
-     virBuffer buf = VIR_BUFFER_INITIALIZER;
-
-+    if (flags != VIR_DOMAIN_VCPU_LIVE) {
-+        PHYP_ERROR(VIR_ERR_INVALID_ARG, _("unsupported flags: (0x%x)"), flags);
-+        return -1;
-+    }
-+
-     if ((ncpus = phypGetLparCPU(dom->conn, managed_system, dom->id)) == 0)
-         return 0;
-
-@@ -3891,6 +3909,12 @@ phypDomainSetCPU(virDomainPtr dom, unsigned int nvcpus)
-
- }
-
-+static int
-+phypDomainSetCPU(virDomainPtr dom, unsigned int nvcpus)
-+{
-+    return phypDomainSetVcpusFlags(dom, nvcpus, VIR_DOMAIN_VCPU_LIVE);
-+}
-+
- static virDrvOpenStatus
- phypVIOSDriverOpen(virConnectPtr conn,
-                    virConnectAuthPtr auth ATTRIBUTE_UNUSED,
-@@ -3941,8 +3965,8 @@ static virDriver phypDriver = {
-     NULL,                       /* domainRestore */
-     NULL,                       /* domainCoreDump */
-     phypDomainSetCPU,           /* domainSetVcpus */
--    NULL,                       /* domainSetVcpusFlags */
--    NULL,                       /* domainGetVcpusFlags */
-+    phypDomainSetVcpusFlags,    /* domainSetVcpusFlags */
-+    phypDomainGetVcpusFlags,    /* domainGetVcpusFlags */
-     NULL,                       /* domainPinVcpu */
-     NULL,                       /* domainGetVcpus */
-     phypGetLparCPUMAX,          /* domainGetMaxVcpus */
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index 3d17e04..7a2ea8f 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -5934,13 +5934,22 @@ unsupported:
- }
-
-
--static int qemudDomainSetVcpus(virDomainPtr dom, unsigned int nvcpus) {
-+static int
-+qemudDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus,
-+                         unsigned int flags)
-+{
-     struct qemud_driver *driver = dom->conn->privateData;
-     virDomainObjPtr vm;
-     const char * type;
-     int max;
-     int ret = -1;
-
-+    if (flags != VIR_DOMAIN_VCPU_LIVE) {
-+        qemuReportError(VIR_ERR_INVALID_ARG, _("unsupported flags: (0x%x)"),
-+                        flags);
-+        return -1;
-+    }
-+
-     qemuDriverLock(driver);
-     vm = virDomainFindByUUID(&driver->domains, dom->uuid);
-     qemuDriverUnlock(driver);
-@@ -5994,6 +6003,12 @@ cleanup:
-     return ret;
- }
-
-+static int
-+qemudDomainSetVcpus(virDomainPtr dom, unsigned int nvcpus)
-+{
-+    return qemudDomainSetVcpusFlags(dom, nvcpus, VIR_DOMAIN_VCPU_LIVE);
-+}
-+
-
- static int
- qemudDomainPinVcpu(virDomainPtr dom,
-@@ -6150,12 +6165,20 @@ cleanup:
- }
-
-
--static int qemudDomainGetMaxVcpus(virDomainPtr dom) {
-+static int
-+qemudDomainGetVcpusFlags(virDomainPtr dom, unsigned int flags)
-+{
-     struct qemud_driver *driver = dom->conn->privateData;
-     virDomainObjPtr vm;
-     const char *type;
-     int ret = -1;
-
-+    if (flags != (VIR_DOMAIN_VCPU_LIVE | VIR_DOMAIN_VCPU_MAXIMUM)) {
-+        qemuReportError(VIR_ERR_INVALID_ARG, _("unsupported flags: (0x%x)"),
-+                        flags);
-+        return -1;
-+    }
-+
-     qemuDriverLock(driver);
-     vm = virDomainFindByUUID(&driver->domains, dom->uuid);
-     qemuDriverUnlock(driver);
-@@ -6183,6 +6206,13 @@ cleanup:
-     return ret;
- }
-
-+static int
-+qemudDomainGetMaxVcpus(virDomainPtr dom)
-+{
-+    return qemudDomainGetVcpusFlags(dom, (VIR_DOMAIN_VCPU_LIVE |
-+                                          VIR_DOMAIN_VCPU_MAXIMUM));
-+}
-+
- static int qemudDomainGetSecurityLabel(virDomainPtr dom, virSecurityLabelPtr seclabel)
- {
-     struct qemud_driver *driver = (struct qemud_driver *)dom->conn->privateData;
-@@ -12938,8 +12968,8 @@ static virDriver qemuDriver = {
-     qemudDomainRestore, /* domainRestore */
-     qemudDomainCoreDump, /* domainCoreDump */
-     qemudDomainSetVcpus, /* domainSetVcpus */
--    NULL, /* domainSetVcpusFlags */
--    NULL, /* domainGetVcpusFlags */
-+    qemudDomainSetVcpusFlags, /* domainSetVcpusFlags */
-+    qemudDomainGetVcpusFlags, /* domainGetVcpusFlags */
-     qemudDomainPinVcpu, /* domainPinVcpu */
-     qemudDomainGetVcpus, /* domainGetVcpus */
-     qemudDomainGetMaxVcpus, /* domainGetMaxVcpus */
-diff --git a/src/test/test_driver.c b/src/test/test_driver.c
-index 6a00558..b70c80d 100644
---- a/src/test/test_driver.c
-+++ b/src/test/test_driver.c
-@@ -2029,17 +2029,37 @@ cleanup:
-     return ret;
- }
-
--static int testDomainGetMaxVcpus(virDomainPtr domain)
-+static int
-+testDomainGetVcpusFlags(virDomainPtr domain, unsigned int flags)
- {
-+    if (flags != (VIR_DOMAIN_VCPU_LIVE | VIR_DOMAIN_VCPU_MAXIMUM)) {
-+        testError(VIR_ERR_INVALID_ARG, _("unsupported flags: (0x%x)"), flags);
-+        return -1;
-+    }
-+
-     return testGetMaxVCPUs(domain->conn, "test");
- }
-
--static int testSetVcpus(virDomainPtr domain,
--                        unsigned int nrCpus) {
-+static int
-+testDomainGetMaxVcpus(virDomainPtr domain)
-+{
-+    return testDomainGetVcpusFlags(domain, (VIR_DOMAIN_VCPU_LIVE |
-+                                            VIR_DOMAIN_VCPU_MAXIMUM));
-+}
-+
-+static int
-+testDomainSetVcpusFlags(virDomainPtr domain, unsigned int nrCpus,
-+                        unsigned int flags)
-+{
-     testConnPtr privconn = domain->conn->privateData;
-     virDomainObjPtr privdom = NULL;
-     int ret = -1, maxvcpus;
-
-+    if (flags != VIR_DOMAIN_VCPU_LIVE) {
-+        testError(VIR_ERR_INVALID_ARG, _("unsupported flags: (0x%x)"), flags);
-+        return -1;
-+    }
-+
-     /* Do this first before locking */
-     maxvcpus = testDomainGetMaxVcpus(domain);
-     if (maxvcpus < 0)
-@@ -2082,6 +2102,12 @@ cleanup:
-     return ret;
- }
-
-+static int
-+testSetVcpus(virDomainPtr domain, unsigned int nrCpus)
-+{
-+    return testDomainSetVcpusFlags(domain, nrCpus, VIR_DOMAIN_VCPU_LIVE);
-+}
-+
- static int testDomainGetVcpus(virDomainPtr domain,
-                               virVcpuInfoPtr info,
-                               int maxinfo,
-@@ -5260,8 +5286,8 @@ static virDriver testDriver = {
-     testDomainRestore, /* domainRestore */
-     testDomainCoreDump, /* domainCoreDump */
-     testSetVcpus, /* domainSetVcpus */
--    NULL, /* domainSetVcpusFlags */
--    NULL, /* domainGetVcpusFlags */
-+    testDomainSetVcpusFlags, /* domainSetVcpusFlags */
-+    testDomainGetVcpusFlags, /* domainGetVcpusFlags */
-     testDomainPinVcpu, /* domainPinVcpu */
-     testDomainGetVcpus, /* domainGetVcpus */
-     testDomainGetMaxVcpus, /* domainGetMaxVcpus */
-diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c
-index cb9193a..0cbe8b3 100644
---- a/src/vbox/vbox_tmpl.c
-+++ b/src/vbox/vbox_tmpl.c
-@@ -1839,13 +1839,21 @@ cleanup:
-     return ret;
- }
-
--static int vboxDomainSetVcpus(virDomainPtr dom, unsigned int nvcpus) {
-+static int
-+vboxDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus,
-+                        unsigned int flags)
-+{
-     VBOX_OBJECT_CHECK(dom->conn, int, -1);
-     IMachine *machine    = NULL;
-     vboxIID  *iid        = NULL;
-     PRUint32  CPUCount   = nvcpus;
-     nsresult rc;
-
-+    if (flags != VIR_DOMAIN_VCPU_LIVE) {
-+        vboxError(VIR_ERR_INVALID_ARG, _("unsupported flags: (0x%x)"), flags);
-+        return -1;
-+    }
-+
- #if VBOX_API_VERSION == 2002
-     if (VIR_ALLOC(iid) < 0) {
-         virReportOOMError();
-@@ -1887,11 +1895,24 @@ cleanup:
-     return ret;
- }
-
--static int vboxDomainGetMaxVcpus(virDomainPtr dom) {
-+static int
-+vboxDomainSetVcpus(virDomainPtr dom, unsigned int nvcpus)
-+{
-+    return vboxDomainSetVcpusFlags(dom, nvcpus, VIR_DOMAIN_VCPU_LIVE);
-+}
-+
-+static int
-+vboxDomainGetVcpusFlags(virDomainPtr dom, unsigned int flags)
-+{
-     VBOX_OBJECT_CHECK(dom->conn, int, -1);
-     ISystemProperties *systemProperties = NULL;
-     PRUint32 maxCPUCount = 0;
-
-+    if (flags != (VIR_DOMAIN_VCPU_LIVE | VIR_DOMAIN_VCPU_MAXIMUM)) {
-+        vboxError(VIR_ERR_INVALID_ARG, _("unsupported flags: (0x%x)"), flags);
-+        return -1;
-+    }
-+
-     /* Currently every domain supports the same number of max cpus
-      * as that supported by vbox and thus take it directly from
-      * the systemproperties.
-@@ -1909,6 +1930,13 @@ static int vboxDomainGetMaxVcpus(virDomainPtr dom) {
-     return ret;
- }
-
-+static int
-+vboxDomainGetMaxVcpus(virDomainPtr dom)
-+{
-+    return vboxDomainGetVcpusFlags(dom, (VIR_DOMAIN_VCPU_LIVE |
-+                                         VIR_DOMAIN_VCPU_MAXIMUM));
-+}
-+
- static char *vboxDomainDumpXML(virDomainPtr dom, int flags) {
-     VBOX_OBJECT_CHECK(dom->conn, char *, NULL);
-     virDomainDefPtr def  = NULL;
-@@ -8267,8 +8295,8 @@ virDriver NAME(Driver) = {
-     NULL, /* domainRestore */
-     NULL, /* domainCoreDump */
-     vboxDomainSetVcpus, /* domainSetVcpus */
--    NULL, /* domainSetVcpusFlags */
--    NULL, /* domainGetVcpusFlags */
-+    vboxDomainSetVcpusFlags, /* domainSetVcpusFlags */
-+    vboxDomainGetVcpusFlags, /* domainGetVcpusFlags */
-     NULL, /* domainPinVcpu */
-     NULL, /* domainGetVcpus */
-     vboxDomainGetMaxVcpus, /* domainGetMaxVcpus */
-diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c
-index 7d67ced..d6c9c57 100644
---- a/src/xen/xen_driver.c
-+++ b/src/xen/xen_driver.c
-@@ -1069,11 +1069,18 @@ xenUnifiedDomainCoreDump (virDomainPtr dom, const char *to, int flags)
- }
-
- static int
--xenUnifiedDomainSetVcpus (virDomainPtr dom, unsigned int nvcpus)
-+xenUnifiedDomainSetVcpusFlags (virDomainPtr dom, unsigned int nvcpus,
-+                               unsigned int flags)
- {
-     GET_PRIVATE(dom->conn);
-     int i;
-
-+    if (flags != VIR_DOMAIN_VCPU_LIVE) {
-+        xenUnifiedError(VIR_ERR_INVALID_ARG, _("unsupported flags: (0x%x)"),
-+                        flags);
-+        return -1;
-+    }
-+
-     /* Try non-hypervisor methods first, then hypervisor direct method
-      * as a last resort.
-      */
-@@ -1093,6 +1100,12 @@ xenUnifiedDomainSetVcpus (virDomainPtr dom, unsigned int nvcpus)
- }
-
- static int
-+xenUnifiedDomainSetVcpus (virDomainPtr dom, unsigned int nvcpus)
-+{
-+    return xenUnifiedDomainSetVcpusFlags(dom, nvcpus, VIR_DOMAIN_VCPU_LIVE);
-+}
-+
-+static int
- xenUnifiedDomainPinVcpu (virDomainPtr dom, unsigned int vcpu,
-                          unsigned char *cpumap, int maplen)
- {
-@@ -1126,11 +1139,17 @@ xenUnifiedDomainGetVcpus (virDomainPtr dom,
- }
-
- static int
--xenUnifiedDomainGetMaxVcpus (virDomainPtr dom)
-+xenUnifiedDomainGetVcpusFlags (virDomainPtr dom, unsigned int flags)
- {
-     GET_PRIVATE(dom->conn);
-     int i, ret;
-
-+    if (flags != (VIR_DOMAIN_VCPU_LIVE | VIR_DOMAIN_VCPU_MAXIMUM)) {
-+        xenUnifiedError(VIR_ERR_INVALID_ARG, _("unsupported flags: (0x%x)"),
-+                        flags);
-+        return -1;
-+    }
-+
-     for (i = 0; i < XEN_UNIFIED_NR_DRIVERS; ++i)
-         if (priv->opened[i] && drivers[i]->domainGetMaxVcpus) {
-             ret = drivers[i]->domainGetMaxVcpus (dom);
-@@ -1140,6 +1159,13 @@ xenUnifiedDomainGetMaxVcpus (virDomainPtr dom)
-     return -1;
- }
-
-+static int
-+xenUnifiedDomainGetMaxVcpus (virDomainPtr dom)
-+{
-+    return xenUnifiedDomainGetVcpusFlags(dom, (VIR_DOMAIN_VCPU_LIVE |
-+                                               VIR_DOMAIN_VCPU_MAXIMUM));
-+}
-+
- static char *
- xenUnifiedDomainDumpXML (virDomainPtr dom, int flags)
- {
-@@ -1951,8 +1977,8 @@ static virDriver xenUnifiedDriver = {
-     xenUnifiedDomainRestore, /* domainRestore */
-     xenUnifiedDomainCoreDump, /* domainCoreDump */
-     xenUnifiedDomainSetVcpus, /* domainSetVcpus */
--    NULL, /* domainSetVcpusFlags */
--    NULL, /* domainGetVcpusFlags */
-+    xenUnifiedDomainSetVcpusFlags, /* domainSetVcpusFlags */
-+    xenUnifiedDomainGetVcpusFlags, /* domainGetVcpusFlags */
-     xenUnifiedDomainPinVcpu, /* domainPinVcpu */
-     xenUnifiedDomainGetVcpus, /* domainGetVcpus */
-     xenUnifiedDomainGetMaxVcpus, /* domainGetMaxVcpus */
-diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c
-index 753169c..7d4ab8d 100644
---- a/src/xenapi/xenapi_driver.c
-+++ b/src/xenapi/xenapi_driver.c
-@@ -40,6 +40,11 @@
- #include "xenapi_driver_private.h"
- #include "xenapi_utils.h"
-
-+#define VIR_FROM_THIS VIR_FROM_XENAPI
-+
-+#define xenapiError(code, ...)                                    \
-+        virReportErrorHelper(NULL, VIR_FROM_THIS, code, __FILE__, \
-+                             __FUNCTION__, __LINE__, __VA_ARGS__)
-
- /*
-  * getCapsObject
-@@ -987,19 +992,26 @@ xenapiDomainGetInfo (virDomainPtr dom, virDomainInfoPtr info)
-
-
- /*
-- * xenapiDomainSetVcpus
-+ * xenapiDomainSetVcpusFlags
-  *
-  * Sets the VCPUs on the domain
-  * Return 0 on success or -1 in case of error
-  */
- static int
--xenapiDomainSetVcpus (virDomainPtr dom, unsigned int nvcpus)
-+xenapiDomainSetVcpusFlags (virDomainPtr dom, unsigned int nvcpus,
-+                           unsigned int flags)
- {
--
-     /* vm.set_vcpus_max */
-     xen_vm vm;
-     xen_vm_set *vms;
-     xen_session *session = ((struct _xenapiPrivate *)(dom->conn->privateData))->session;
-+
-+    if (flags != VIR_DOMAIN_VCPU_LIVE) {
-+        xenapiError(VIR_ERR_INVALID_ARG, _("unsupported flags: (0x%x)"),
-+                    flags);
-+        return -1;
-+    }
-+
-     if (xen_vm_get_by_name_label(session, &vms, dom->name) && vms->size > 0) {
-         if (vms->size != 1) {
-             xenapiSessionErrorHandler(dom->conn, VIR_ERR_INTERNAL_ERROR,
-@@ -1019,6 +1031,18 @@ xenapiDomainSetVcpus (virDomainPtr dom, unsigned int nvcpus)
- }
-
- /*
-+ * xenapiDomainSetVcpus
-+ *
-+ * Sets the VCPUs on the domain
-+ * Return 0 on success or -1 in case of error
-+ */
-+static int
-+xenapiDomainSetVcpus (virDomainPtr dom, unsigned int nvcpus)
-+{
-+    return xenapiDomainSetVcpusFlags(dom, nvcpus, VIR_DOMAIN_VCPU_LIVE);
-+}
-+
-+/*
-  * xenapiDomainPinVcpu
-  *
-  * Dynamically change the real CPUs which can be allocated to a virtual CPU
-@@ -1140,19 +1164,26 @@ xenapiDomainGetVcpus (virDomainPtr dom,
- }
-
- /*
-- * xenapiDomainGetMaxVcpus
-+ * xenapiDomainGetVcpusFlags
-  *
-  *
-- * Returns maximum number of Vcpus on success or -1 in case of error
-+ * Returns Vcpus count on success or -1 in case of error
-  */
- static int
--xenapiDomainGetMaxVcpus (virDomainPtr dom)
-+xenapiDomainGetVcpusFlags (virDomainPtr dom, unsigned int flags)
- {
-     xen_vm vm;
-     xen_vm_set *vms;
-     int64_t maxvcpu = 0;
-     enum xen_vm_power_state state;
-     xen_session *session = ((struct _xenapiPrivate *)(dom->conn->privateData))->session;
-+
-+    if (flags != (VIR_DOMAIN_VCPU_LIVE | VIR_DOMAIN_VCPU_MAXIMUM)) {
-+        xenapiError(VIR_ERR_INVALID_ARG, _("unsupported flags: (0x%x)"),
-+                    flags);
-+        return -1;
-+    }
-+
-     if (xen_vm_get_by_name_label(session, &vms, dom->name) && vms->size > 0) {
-         if (vms->size != 1) {
-             xenapiSessionErrorHandler(dom->conn, VIR_ERR_INTERNAL_ERROR,
-@@ -1176,6 +1207,19 @@ xenapiDomainGetMaxVcpus (virDomainPtr dom)
- }
-
- /*
-+ * xenapiDomainGetMaxVcpus
-+ *
-+ *
-+ * Returns maximum number of Vcpus on success or -1 in case of error
-+ */
-+static int
-+xenapiDomainGetMaxVcpus (virDomainPtr dom)
-+{
-+    return xenapiDomainGetVcpusFlags(dom, (VIR_DOMAIN_VCPU_LIVE |
-+                                           VIR_DOMAIN_VCPU_MAXIMUM));
-+}
-+
-+/*
-  * xenapiDomainDumpXML
-  *
-  *
-@@ -1754,8 +1798,8 @@ static virDriver xenapiDriver = {
-     NULL, /* domainRestore */
-     NULL, /* domainCoreDump */
-     xenapiDomainSetVcpus, /* domainSetVcpus */
--    NULL, /* domainSetVcpusFlags */
--    NULL, /* domainGetVcpusFlags */
-+    xenapiDomainSetVcpusFlags, /* domainSetVcpusFlags */
-+    xenapiDomainGetVcpusFlags, /* domainGetVcpusFlags */
-     xenapiDomainPinVcpu, /* domainPinVcpu */
-     xenapiDomainGetVcpus, /* domainGetVcpus */
-     xenapiDomainGetMaxVcpus, /* domainGetMaxVcpus */
--- 
-1.7.2.3
-

docs/api_extension/0007-add-virsh-support.patch

@@ -1,388 +0,0 @@
-From bf945ee97b72d3b0c4fc2da04530f5294f529d66 Mon Sep 17 00:00:00 2001
-From: Eric Blake <eblake@redhat.com>
-Date: Wed, 29 Sep 2010 15:20:23 -0600
-Subject: [PATCH 08/15] vcpu: add virsh support
-
-* tools/virsh.c (cmdSetvcpus): Add new flags.  Let invalid
-commands through to driver, to ease testing of hypervisor argument
-validation.
-(cmdMaxvcpus, cmdVcpucount): New commands.
-(commands): Add new commands.
-* tools/virsh.pod (setvcpus, vcpucount, maxvcpus): Document new
-behavior.
----
- tools/virsh.c   |  247 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
- tools/virsh.pod |   38 ++++++++-
- 2 files changed, 262 insertions(+), 23 deletions(-)
-
-diff --git a/tools/virsh.c b/tools/virsh.c
-index 4f8c495..7fb7fbd 100644
---- a/tools/virsh.c
-+++ b/tools/virsh.c
-@@ -2281,10 +2281,216 @@ cmdFreecell(vshControl *ctl, const vshCmd *cmd)
- }
-
- /*
-+ * "maxvcpus" command
-+ */
-+static const vshCmdInfo info_maxvcpus[] = {
-+    {"help", N_("connection vcpu maximum")},
-+    {"desc", N_("Show maximum number of virtual CPUs for guests on this connection.")},
-+    {NULL, NULL}
-+};
-+
-+static const vshCmdOptDef opts_maxvcpus[] = {
-+    {"type", VSH_OT_STRING, 0, N_("domain type")},
-+    {NULL, 0, 0, NULL}
-+};
-+
-+static int
-+cmdMaxvcpus(vshControl *ctl, const vshCmd *cmd)
-+{
-+    char *type;
-+    int vcpus;
-+
-+    type = vshCommandOptString(cmd, "type", NULL);
-+
-+    if (!vshConnectionUsability(ctl, ctl->conn))
-+        return FALSE;
-+
-+    vcpus = virConnectGetMaxVcpus(ctl->conn, type);
-+    if (vcpus < 0)
-+        return FALSE;
-+    vshPrint(ctl, "%d\n", vcpus);
-+
-+    return TRUE;
-+}
-+
-+/*
-+ * "vcpucount" command
-+ */
-+static const vshCmdInfo info_vcpucount[] = {
-+    {"help", N_("domain vcpu counts")},
-+    {"desc", N_("Returns the number of virtual CPUs used by the domain.")},
-+    {NULL, NULL}
-+};
-+
-+static const vshCmdOptDef opts_vcpucount[] = {
-+    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")},
-+    {"maximum", VSH_OT_BOOL, 0, N_("get maximum cap on vcpus")},
-+    {"current", VSH_OT_BOOL, 0, N_("get current vcpu usage")},
-+    {"config", VSH_OT_BOOL, 0, N_("get value to be used on next boot")},
-+    {"live", VSH_OT_BOOL, 0, N_("get value from running domain")},
-+    {NULL, 0, 0, NULL}
-+};
-+
-+static int
-+cmdVcpucount(vshControl *ctl, const vshCmd *cmd)
-+{
-+    virDomainPtr dom;
-+    int ret = TRUE;
-+    int maximum = vshCommandOptBool(cmd, "maximum");
-+    int current = vshCommandOptBool(cmd, "current");
-+    int config = vshCommandOptBool(cmd, "config");
-+    int live = vshCommandOptBool(cmd, "live");
-+    bool all = maximum + current + config + live == 0;
-+    int count;
-+
-+    if (maximum && current) {
-+        vshError(ctl, "%s",
-+                 _("--maximum and --current cannot both be specified"));
-+        return FALSE;
-+    }
-+    if (config && live) {
-+        vshError(ctl, "%s",
-+                 _("--config and --live cannot both be specified"));
-+        return FALSE;
-+    }
-+    /* We want one of each pair of mutually exclusive options; that
-+     * is, use of flags requires exactly two options.  */
-+    if (maximum + current + config + live == 1) {
-+        vshError(ctl,
-+                 _("when using --%s, either --%s or --%s must be specified"),
-+                 (maximum ? "maximum" : current ? "current"
-+                  : config ? "config" : "live"),
-+                 maximum + current ? "config" : "maximum",
-+                 maximum + current ? "live" : "current");
-+        return FALSE;
-+    }
-+
-+    if (!vshConnectionUsability(ctl, ctl->conn))
-+        return FALSE;
-+
-+    if (!(dom = vshCommandOptDomain(ctl, cmd, NULL)))
-+        return FALSE;
-+
-+    /* In all cases, try the new API first; if it fails because we are
-+     * talking to an older client, try a fallback API before giving
-+     * up.  */
-+    if (all || (maximum && config)) {
-+        count = virDomainGetVcpusFlags(dom, (VIR_DOMAIN_VCPU_MAXIMUM |
-+                                             VIR_DOMAIN_VCPU_CONFIG));
-+        if (count < 0 && (last_error->code == VIR_ERR_NO_SUPPORT
-+                          || last_error->code == VIR_ERR_INVALID_ARG)) {
-+            char *tmp;
-+            char *xml = virDomainGetXMLDesc(dom, VIR_DOMAIN_XML_INACTIVE);
-+            if (xml && (tmp = strstr(xml, "<vcpu"))) {
-+                tmp = strchr(tmp, '>');
-+                if (!tmp || virStrToLong_i(tmp + 1, &tmp, 10, &count) < 0)
-+                    count = -1;
-+            }
-+            VIR_FREE(xml);
-+        }
-+
-+        if (count < 0) {
-+            virshReportError(ctl);
-+            ret = FALSE;
-+        } else if (all) {
-+            vshPrint(ctl, "%-12s %-12s %3d\n", _("maximum"), _("config"),
-+                     count);
-+        } else {
-+            vshPrint(ctl, "%d\n", count);
-+        }
-+        virFreeError(last_error);
-+        last_error = NULL;
-+    }
-+
-+    if (all || (maximum && live)) {
-+        count = virDomainGetVcpusFlags(dom, (VIR_DOMAIN_VCPU_MAXIMUM |
-+                                             VIR_DOMAIN_VCPU_LIVE));
-+        if (count < 0 && (last_error->code == VIR_ERR_NO_SUPPORT
-+                          || last_error->code == VIR_ERR_INVALID_ARG)) {
-+            count = virDomainGetMaxVcpus(dom);
-+        }
-+
-+        if (count < 0) {
-+            virshReportError(ctl);
-+            ret = FALSE;
-+        } else if (all) {
-+            vshPrint(ctl, "%-12s %-12s %3d\n", _("maximum"), _("live"),
-+                     count);
-+        } else {
-+            vshPrint(ctl, "%d\n", count);
-+        }
-+        virFreeError(last_error);
-+        last_error = NULL;
-+    }
-+
-+    if (all || (current && config)) {
-+        count = virDomainGetVcpusFlags(dom, VIR_DOMAIN_VCPU_CONFIG);
-+        if (count < 0 && (last_error->code == VIR_ERR_NO_SUPPORT
-+                          || last_error->code == VIR_ERR_INVALID_ARG)) {
-+            char *tmp, *end;
-+            char *xml = virDomainGetXMLDesc(dom, VIR_DOMAIN_XML_INACTIVE);
-+            if (xml && (tmp = strstr(xml, "<vcpu"))) {
-+                end = strchr(tmp, '>');
-+                if (end) {
-+                    *end = '\0';
-+                    tmp = strstr(tmp, "current=");
-+                    if (!tmp)
-+                        tmp = end + 1;
-+                    else {
-+                        tmp += strlen("current=");
-+                        tmp += *tmp == '\'' || *tmp == '"';
-+                    }
-+                }
-+                if (!tmp || virStrToLong_i(tmp, &tmp, 10, &count) < 0)
-+                    count = -1;
-+            }
-+            VIR_FREE(xml);
-+        }
-+
-+        if (count < 0) {
-+            virshReportError(ctl);
-+            ret = FALSE;
-+        } else if (all) {
-+            vshPrint(ctl, "%-12s %-12s %3d\n", _("current"), _("config"),
-+                     count);
-+        } else {
-+            vshPrint(ctl, "%d\n", count);
-+        }
-+        virFreeError(last_error);
-+        last_error = NULL;
-+    }
-+
-+    if (all || (current && live)) {
-+        count = virDomainGetVcpusFlags(dom, VIR_DOMAIN_VCPU_LIVE);
-+        if (count < 0 && (last_error->code == VIR_ERR_NO_SUPPORT
-+                          || last_error->code == VIR_ERR_INVALID_ARG)) {
-+            virDomainInfo info;
-+            if (virDomainGetInfo(dom, &info) == 0)
-+                count = info.nrVirtCpu;
-+        }
-+
-+        if (count < 0) {
-+            virshReportError(ctl);
-+            ret = FALSE;
-+        } else if (all) {
-+            vshPrint(ctl, "%-12s %-12s %3d\n", _("current"), _("live"),
-+                     count);
-+        } else {
-+            vshPrint(ctl, "%d\n", count);
-+        }
-+        virFreeError(last_error);
-+        last_error = NULL;
-+    }
-+
-+    virDomainFree(dom);
-+    return ret;
-+}
-+
-+/*
-  * "vcpuinfo" command
-  */
- static const vshCmdInfo info_vcpuinfo[] = {
--    {"help", N_("domain vcpu information")},
-+    {"help", N_("detailed domain vcpu information")},
-     {"desc", N_("Returns basic information about the domain virtual CPUs.")},
-     {NULL, NULL}
- };
-@@ -2514,6 +2720,9 @@ static const vshCmdInfo info_setvcpus[] = {
- static const vshCmdOptDef opts_setvcpus[] = {
-     {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")},
-     {"count", VSH_OT_DATA, VSH_OFLAG_REQ, N_("number of virtual CPUs")},
-+    {"maximum", VSH_OT_BOOL, 0, N_("set maximum limit on next boot")},
-+    {"config", VSH_OT_BOOL, 0, N_("affect next boot")},
-+    {"live", VSH_OT_BOOL, 0, N_("affect running domain")},
-     {NULL, 0, 0, NULL}
- };
-
-@@ -2522,8 +2731,13 @@ cmdSetvcpus(vshControl *ctl, const vshCmd *cmd)
- {
-     virDomainPtr dom;
-     int count;
--    int maxcpu;
-     int ret = TRUE;
-+    int maximum = vshCommandOptBool(cmd, "maximum");
-+    int config = vshCommandOptBool(cmd, "config");
-+    int live = vshCommandOptBool(cmd, "live");
-+    int flags = ((maximum ? VIR_DOMAIN_VCPU_MAXIMUM : 0) |
-+                 (config ? VIR_DOMAIN_VCPU_CONFIG : 0) |
-+                 (live ? VIR_DOMAIN_VCPU_LIVE : 0));
-
-     if (!vshConnectionUsability(ctl, ctl->conn))
-         return FALSE;
-@@ -2532,26 +2746,15 @@ cmdSetvcpus(vshControl *ctl, const vshCmd *cmd)
-         return FALSE;
-
-     count = vshCommandOptInt(cmd, "count", &count);
--    if (count <= 0) {
--        vshError(ctl, "%s", _("Invalid number of virtual CPUs."));
--        virDomainFree(dom);
--        return FALSE;
--    }
--
--    maxcpu = virDomainGetMaxVcpus(dom);
--    if (maxcpu <= 0) {
--        virDomainFree(dom);
--        return FALSE;
--    }
--
--    if (count > maxcpu) {
--        vshError(ctl, "%s", _("Too many virtual CPUs."));
--        virDomainFree(dom);
--        return FALSE;
--    }
-
--    if (virDomainSetVcpus(dom, count) != 0) {
--        ret = FALSE;
-+    if (!flags) {
-+        if (virDomainSetVcpus(dom, count) != 0) {
-+            ret = FALSE;
-+        }
-+    } else {
-+        if (virDomainSetVcpusFlags(dom, count, flags) < 0) {
-+            ret = FALSE;
-+        }
-     }
-
-     virDomainFree(dom);
-@@ -9642,6 +9845,7 @@ static const vshCmdDef commands[] = {
-     {"freecell", cmdFreecell, opts_freecell, info_freecell},
-     {"hostname", cmdHostname, NULL, info_hostname},
-     {"list", cmdList, opts_list, info_list},
-+    {"maxvcpus", cmdMaxvcpus, opts_maxvcpus, info_maxvcpus},
-     {"migrate", cmdMigrate, opts_migrate, info_migrate},
-     {"migrate-setmaxdowntime", cmdMigrateSetMaxDowntime, opts_migrate_setmaxdowntime, info_migrate_setmaxdowntime},
-
-@@ -9748,6 +9952,7 @@ static const vshCmdDef commands[] = {
-     {"vol-name", cmdVolName, opts_vol_name, info_vol_name},
-     {"vol-key", cmdVolKey, opts_vol_key, info_vol_key},
-
-+    {"vcpucount", cmdVcpucount, opts_vcpucount, info_vcpucount},
-     {"vcpuinfo", cmdVcpuinfo, opts_vcpuinfo, info_vcpuinfo},
-     {"vcpupin", cmdVcpupin, opts_vcpupin, info_vcpupin},
-     {"version", cmdVersion, NULL, info_version},
-diff --git a/tools/virsh.pod b/tools/virsh.pod
-index 943a563..dbcc680 100644
---- a/tools/virsh.pod
-+++ b/tools/virsh.pod
-@@ -443,7 +443,14 @@ Remove the managed save file for a domain if it exists.  The next time the
- domain is started it will not restore to its previous state but instead will
- do a full boot.
-
--=item B<migrate> optional I<--live> I<--suspend> I<domain-id> I<desturi> I<migrateuri>
-+=item B<maxvcpus> optional I<type>
-+
-+Provide the maximum number of virtual CPUs supported for a guest VM on
-+this connection.  If provided, the I<type> parameter must be a valid
-+type attribute for the <domain> element of XML.
-+
-+=item B<migrate> optional I<--live> I<--suspend> I<domain-id> I<desturi>
-+I<migrateuri>
-
- Migrate domain to another host.  Add --live for live migration; --suspend
- leaves the domain paused on the destination host. The I<desturi> is the
-@@ -521,7 +528,8 @@ Displays the domain memory parameters.
-
- Allows you to set the domain memory parameters. LXC and QEMU/KVM supports these parameters.
-
--=item B<setvcpus> I<domain-id> I<count>
-+=item B<setvcpus> I<domain-id> I<count> optional I<--maximum> I<--config>
-+I<--live>
-
- Change the number of virtual CPUs active in the guest domain. Note that
- I<count> may be limited by host, hypervisor or limit coming from the
-@@ -530,6 +538,17 @@ original description of domain.
- For Xen, you can only adjust the virtual CPUs of a running domain if
- the domain is paravirtualized.
-
-+If I<--config> is specified, the change will only affect the next
-+boot of a domain.  If I<--live> is specified, the domain must be
-+running, and the change takes place immediately.  Both flags may be
-+specified, if supported by the hypervisor.  If neither flag is given,
-+then I<--live> is implied and it is up to the hypervisor whether
-+I<--config> is also implied.
-+
-+If I<--maximum> is specified, then you must use I<--config> and
-+avoid I<--live>; this flag controls the maximum limit of vcpus that
-+can be hot-plugged the next time the domain is booted.
-+
- =item B<shutdown> I<domain-id>
-
- Gracefully shuts down a domain.  This coordinates with the domain OS
-@@ -568,6 +587,21 @@ is not available the processes will provide an exit code of 1.
- Undefine the configuration for an inactive domain. Since it's not running
- the domain name or UUID must be used as the I<domain-id>.
-
-+=item B<vcpucount> I<domain-id>  optional I<--maximum> I<--current>
-+I<--config> I<--live>
-+
-+Print information about the virtual cpu counts of the given
-+I<domain-id>.  If no flags are specified, all possible counts are
-+listed in a table; otherwise, the output is limited to just the
-+numeric value requested.
-+
-+I<--maximum> requests information on the maximum cap of vcpus that a
-+domain can add via B<setvcpus>, while I<--current> shows the current
-+usage; these two flags cannot both be specified.  I<--config>
-+requests information regarding the next time the domain will be
-+booted, while I<--live> requires a running domain and lists current
-+values; these two flags cannot both be specified.
-+
- =item B<vcpuinfo> I<domain-id>
-
- Returns basic information about the domain virtual CPUs, like the number of
--- 
-1.7.2.3
-

docs/api_extension/0008-support-new-xml.patch

@@ -1,519 +0,0 @@
-From 4617eedfaeee2b187a1f14691d25746ba3ff31b6 Mon Sep 17 00:00:00 2001
-From: Eric Blake <eblake@redhat.com>
-Date: Wed, 29 Sep 2010 10:20:07 -0600
-Subject: [PATCH 07/15] vcpu: support maxvcpu in domain_conf
-
-Although this patch adds a distinction between maximum vcpus and
-current vcpus in the XML, the values should be identical for all
-drivers at this point.  Only in subsequent per-driver patches will
-a distinction be made.
-
-In general, virDomainGetInfo should prefer the current vcpus.
-
-* src/conf/domain_conf.h (_virDomainDef): Adjust vcpus to unsigned
-short, to match virDomainGetInfo limit.  Add maxvcpus member.
-* src/conf/domain_conf.c (virDomainDefParseXML)
-(virDomainDefFormat): parse and print out vcpu details.
-* src/xen/xend_internal.c (xenDaemonParseSxpr)
-(xenDaemonFormatSxpr): Manage both vcpu numbers, and require them
-to be equal for now.
-* src/xen/xm_internal.c (xenXMDomainConfigParse)
-(xenXMDomainConfigFormat): Likewise.
-* src/phyp/phyp_driver.c (phypDomainDumpXML): Likewise.
-* src/openvz/openvz_conf.c (openvzLoadDomains): Likewise.
-* src/openvz/openvz_driver.c (openvzDomainDefineXML)
-(openvzDomainCreateXML, openvzDomainSetVcpusInternal): Likewise.
-* src/vbox/vbox_tmpl.c (vboxDomainDumpXML, vboxDomainDefineXML):
-Likewise.
-* src/xenapi/xenapi_driver.c (xenapiDomainDumpXML): Likewise.
-* src/xenapi/xenapi_utils.c (createVMRecordFromXml): Likewise.
-* src/esx/esx_vmx.c (esxVMX_ParseConfig, esxVMX_FormatConfig):
-Likewise.
-* src/qemu/qemu_conf.c (qemuBuildSmpArgStr)
-(qemuParseCommandLineSmp, qemuParseCommandLine): Likewise.
-* src/qemu/qemu_driver.c (qemudDomainHotplugVcpus): Likewise.
-* src/opennebula/one_conf.c (xmlOneTemplate): Likewise.
----
- src/conf/domain_conf.c     |   45 +++++++++++++++++++++++++++++++++++++------
- src/conf/domain_conf.h     |    3 +-
- src/esx/esx_vmx.c          |   24 ++++++++++++++--------
- src/opennebula/one_conf.c  |    9 +++++--
- src/openvz/openvz_conf.c   |    7 +++--
- src/openvz/openvz_driver.c |   15 +++++++++----
- src/phyp/phyp_driver.c     |    2 +-
- src/qemu/qemu_conf.c       |   14 +++++++++++-
- src/qemu/qemu_driver.c     |    5 ++-
- src/vbox/vbox_tmpl.c       |   12 +++++++---
- src/xen/xend_internal.c    |    9 ++++---
- src/xen/xm_internal.c      |   11 ++++++---
- src/xenapi/xenapi_driver.c |    2 +-
- src/xenapi/xenapi_utils.c  |    4 +-
- 14 files changed, 114 insertions(+), 48 deletions(-)
-
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index 78d7a6a..a997e06 100644
---- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -4203,6 +4203,7 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps,
-     int i, n;
-     long id = -1;
-     virDomainDefPtr def;
-+    unsigned long count;
-
-     if (VIR_ALLOC(def) < 0) {
-         virReportOOMError();
-@@ -4287,8 +4288,37 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps,
-                       &def->mem.swap_hard_limit) < 0)
-         def->mem.swap_hard_limit = 0;
-
--    if (virXPathULong("string(./vcpu[1])", ctxt, &def->vcpus) < 0)
--        def->vcpus = 1;
-+    n = virXPathULong("string(./vcpu[1])", ctxt, &count);
-+    if (n == -2) {
-+        virDomainReportError(VIR_ERR_XML_ERROR, "%s",
-+                             _("maximum vcpus must be an integer"));
-+        goto error;
-+    } else if (n < 0) {
-+        def->maxvcpus = 1;
-+    } else {
-+        def->maxvcpus = count;
-+        if (def->maxvcpus != count || count == 0) {
-+            virDomainReportError(VIR_ERR_XML_ERROR,
-+                                 _("invalid maxvcpus %lu"), count);
-+            goto error;
-+        }
-+    }
-+
-+    n = virXPathULong("string(./vcpu[1]/@current)", ctxt, &count);
-+    if (n == -2) {
-+        virDomainReportError(VIR_ERR_XML_ERROR, "%s",
-+                             _("current vcpus must be an integer"));
-+        goto error;
-+    } else if (n < 0) {
-+        def->vcpus = def->maxvcpus;
-+    } else {
-+        def->vcpus = count;
-+        if (def->vcpus != count || count == 0 || def->maxvcpus < count) {
-+            virDomainReportError(VIR_ERR_XML_ERROR,
-+                                 _("invalid current vcpus %lu"), count);
-+            goto error;
-+        }
-+    }
-
-     tmp = virXPathString("string(./vcpu[1]/@cpuset)", ctxt);
-     if (tmp) {
-@@ -6462,17 +6492,18 @@ char *virDomainDefFormat(virDomainDefPtr def,
-         if (def->cpumask[n] != 1)
-             allones = 0;
-
--    if (allones) {
--        virBufferAsprintf(&buf, "  <vcpu>%lu</vcpu>\n", def->vcpus);
--    } else {
-+    virBufferAddLit(&buf, "  <vcpu");
-+    if (!allones) {
-         char *cpumask = NULL;
-         if ((cpumask =
-              virDomainCpuSetFormat(def->cpumask, def->cpumasklen)) == NULL)
-             goto cleanup;
--        virBufferAsprintf(&buf, "  <vcpu cpuset='%s'>%lu</vcpu>\n",
--                          cpumask, def->vcpus);
-+        virBufferAsprintf(&buf, " cpuset='%s'", cpumask);
-         VIR_FREE(cpumask);
-     }
-+    if (def->vcpus != def->maxvcpus)
-+        virBufferAsprintf(&buf, " current='%u'", def->vcpus);
-+    virBufferAsprintf(&buf, ">%u</vcpu>\n", def->maxvcpus);
-
-     if (def->os.bootloader) {
-         virBufferEscapeString(&buf, "  <bootloader>%s</bootloader>\n",
-diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
-index db09c23..5499f28 100644
---- a/src/conf/domain_conf.h
-+++ b/src/conf/domain_conf.h
-@@ -885,7 +885,8 @@ struct _virDomainDef {
-         unsigned long min_guarantee;
-         unsigned long swap_hard_limit;
-     } mem;
--    unsigned long vcpus;
-+    unsigned short vcpus;
-+    unsigned short maxvcpus;
-     int cpumasklen;
-     char *cpumask;
-
-diff --git a/src/esx/esx_vmx.c b/src/esx/esx_vmx.c
-index 7ec8c0e..0a26614 100644
---- a/src/esx/esx_vmx.c
-+++ b/src/esx/esx_vmx.c
-@@ -50,7 +50,7 @@ def->uuid = <value>               <=>   uuid.bios = "<value>"
- def->name = <value>               <=>   displayName = "<value>"
- def->mem.max_balloon = <value kilobyte>    <=>   memsize = "<value megabyte>"            # must be a multiple of 4, defaults to 32
- def->mem.cur_balloon = <value kilobyte>    <=>   sched.mem.max = "<value megabyte>"      # defaults to "unlimited" -> def->mem.cur_balloon = def->mem.max_balloon
--def->vcpus = <value>              <=>   numvcpus = "<value>"                    # must be 1 or a multiple of 2, defaults to 1
-+def->maxvcpus = <value>           <=>   numvcpus = "<value>"                    # must be 1 or a multiple of 2, defaults to 1
- def->cpumask = <uint list>        <=>   sched.cpu.affinity = "<uint list>"
-
-
-@@ -1075,7 +1075,7 @@ esxVMX_ParseConfig(esxVMX_Context *ctx, virCapsPtr caps, const char *vmx,
-         goto cleanup;
-     }
-
--    def->vcpus = numvcpus;
-+    def->maxvcpus = def->vcpus = numvcpus;
-
-     /* vmx:sched.cpu.affinity -> def:cpumask */
-     // VirtualMachine:config.cpuAffinity.affinitySet
-@@ -2609,16 +2609,22 @@ esxVMX_FormatConfig(esxVMX_Context *ctx, virCapsPtr caps, virDomainDefPtr def,
-                           (int)(def->mem.cur_balloon / 1024));
-     }
-
--    /* def:vcpus -> vmx:numvcpus */
--    if (def->vcpus <= 0 || (def->vcpus % 2 != 0 && def->vcpus != 1)) {
-+    /* def:maxvcpus -> vmx:numvcpus */
-+    if (def->vcpus != def->maxvcpus) {
-+        ESX_ERROR(VIR_ERR_CONFIG_UNSUPPORTED,
-+                  _("No support for domain XML entry 'vcpu' attribute "
-+                    "'current'"));
-+        goto cleanup;
-+    }
-+    if (def->maxvcpus <= 0 || (def->maxvcpus % 2 != 0 && def->maxvcpus != 1)) {
-         ESX_ERROR(VIR_ERR_INTERNAL_ERROR,
-                   _("Expecting domain XML entry 'vcpu' to be an unsigned "
-                     "integer (1 or a multiple of 2) but found %d"),
--                  (int)def->vcpus);
-+                  def->maxvcpus);
-         goto cleanup;
-     }
-
--    virBufferAsprintf(&buffer, "numvcpus = \"%d\"\n", (int)def->vcpus);
-+    virBufferAsprintf(&buffer, "numvcpus = \"%d\"\n", def->maxvcpus);
-
-     /* def:cpumask -> vmx:sched.cpu.affinity */
-     if (def->cpumasklen > 0) {
-@@ -2632,11 +2638,11 @@ esxVMX_FormatConfig(esxVMX_Context *ctx, virCapsPtr caps, virDomainDefPtr def,
-             }
-         }
-
--        if (sched_cpu_affinity_length < def->vcpus) {
-+        if (sched_cpu_affinity_length < def->maxvcpus) {
-             ESX_ERROR(VIR_ERR_INTERNAL_ERROR,
-                       _("Expecting domain XML attribute 'cpuset' of entry "
--                        "'vcpu' to contains at least %d CPU(s)"),
--                      (int)def->vcpus);
-+                        "'vcpu' to contain at least %d CPU(s)"),
-+                      def->maxvcpus);
-             goto cleanup;
-         }
-
-diff --git a/src/opennebula/one_conf.c b/src/opennebula/one_conf.c
-index 44e28dc..2079c51 100644
---- a/src/opennebula/one_conf.c
-+++ b/src/opennebula/one_conf.c
-@@ -1,5 +1,7 @@
- /*----------------------------------------------------------------------------------*/
--/* Copyright 2002-2009, Distributed Systems Architecture Group, Universidad
-+/*
-+ * Copyright (C) 2010 Red Hat, Inc.
-+ * Copyright 2002-2009, Distributed Systems Architecture Group, Universidad
-  * Complutense de Madrid (dsa-research.org)
-  *
-  * This library is free software; you can redistribute it and/or
-@@ -169,9 +171,10 @@ char* xmlOneTemplate(virDomainDefPtr def)
- {
-     int i;
-     virBuffer buf= VIR_BUFFER_INITIALIZER;
--    virBufferAsprintf(&buf,"#OpenNebula Template automatically generated by libvirt\nNAME = %s\nCPU = %ld\nMEMORY = %ld\n",
-+    virBufferAsprintf(&buf,"#OpenNebula Template automatically generated "
-+                      "by libvirt\nNAME = %s\nCPU = %d\nMEMORY = %ld\n",
-                       def->name,
--                      def->vcpus,
-+                      def->maxvcpus,
-                       (def->mem.max_balloon)/1024);
-
-     /*Optional Booting OpenNebula Information:*/
-diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c
-index ec11bbc..c84a6f3 100644
---- a/src/openvz/openvz_conf.c
-+++ b/src/openvz/openvz_conf.c
-@@ -507,11 +507,12 @@ int openvzLoadDomains(struct openvz_driver *driver) {
-                         veid);
-             goto cleanup;
-         } else if (ret > 0) {
--            dom->def->vcpus = strtoI(temp);
-+            dom->def->maxvcpus = strtoI(temp);
-         }
-
--        if (ret == 0 || dom->def->vcpus == 0)
--            dom->def->vcpus = openvzGetNodeCPUs();
-+        if (ret == 0 || dom->def->maxvcpus == 0)
-+            dom->def->maxvcpus = openvzGetNodeCPUs();
-+        dom->def->vcpus = dom->def->maxvcpus;
-
-         /* XXX load rest of VM config data .... */
-
-diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c
-index 0f3cfdf..b7c2754 100644
---- a/src/openvz/openvz_driver.c
-+++ b/src/openvz/openvz_driver.c
-@@ -925,8 +925,13 @@ openvzDomainDefineXML(virConnectPtr conn, const char *xml)
-     if (openvzDomainSetNetworkConfig(conn, vm->def) < 0)
-         goto cleanup;
-
--    if (vm->def->vcpus > 0) {
--        if (openvzDomainSetVcpusInternal(vm, vm->def->vcpus) < 0) {
-+    if (vm->def->vcpus != vm->def->maxvcpus) {
-+        openvzError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-+                    _("current vcpu count must equal maximum"));
-+        goto cleanup;
-+    }
-+    if (vm->def->maxvcpus > 0) {
-+        if (openvzDomainSetVcpusInternal(vm, vm->def->maxvcpus) < 0) {
-             openvzError(VIR_ERR_INTERNAL_ERROR, "%s",
-                         _("Could not set number of virtual cpu"));
-              goto cleanup;
-@@ -1019,8 +1024,8 @@ openvzDomainCreateXML(virConnectPtr conn, const char *xml,
-     vm->def->id = vm->pid;
-     vm->state = VIR_DOMAIN_RUNNING;
-
--    if (vm->def->vcpus > 0) {
--        if (openvzDomainSetVcpusInternal(vm, vm->def->vcpus) < 0) {
-+    if (vm->def->maxvcpus > 0) {
-+        if (openvzDomainSetVcpusInternal(vm, vm->def->maxvcpus) < 0) {
-             openvzError(VIR_ERR_INTERNAL_ERROR, "%s",
-                         _("Could not set number of virtual cpu"));
-             goto cleanup;
-@@ -1249,7 +1254,7 @@ static int openvzDomainSetVcpusInternal(virDomainObjPtr vm,
-         return -1;
-     }
-
--    vm->def->vcpus = nvcpus;
-+    vm->def->maxvcpus = vm->def->vcpus = nvcpus;
-     return 0;
- }
-
-diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c
-index e284ae0..3d0ed11 100644
---- a/src/phyp/phyp_driver.c
-+++ b/src/phyp/phyp_driver.c
-@@ -3540,7 +3540,7 @@ phypDomainDumpXML(virDomainPtr dom, int flags)
-         goto err;
-     }
-
--    if ((def.vcpus =
-+    if ((def.maxvcpus = def.vcpus =
-          phypGetLparCPU(dom->conn, managed_system, dom->id)) == 0) {
-         VIR_ERROR0(_("Unable to determine domain's CPU."));
-         goto err;
-diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
-index 83c0f83..38c8351 100644
---- a/src/qemu/qemu_conf.c
-+++ b/src/qemu/qemu_conf.c
-@@ -3711,7 +3711,7 @@ qemuBuildSmpArgStr(const virDomainDefPtr def,
- {
-     virBuffer buf = VIR_BUFFER_INITIALIZER;
-
--    virBufferAsprintf(&buf, "%lu", def->vcpus);
-+    virBufferAsprintf(&buf, "%u", def->vcpus);
-
-     if ((qemuCmdFlags & QEMUD_CMD_FLAG_SMP_TOPOLOGY)) {
-         /* sockets, cores, and threads are either all zero
-@@ -3722,11 +3722,18 @@ qemuBuildSmpArgStr(const virDomainDefPtr def,
-             virBufferAsprintf(&buf, ",threads=%u", def->cpu->threads);
-         }
-         else {
--            virBufferAsprintf(&buf, ",sockets=%lu", def->vcpus);
-+            virBufferAsprintf(&buf, ",sockets=%u", def->maxvcpus);
-             virBufferAsprintf(&buf, ",cores=%u", 1);
-             virBufferAsprintf(&buf, ",threads=%u", 1);
-         }
-     }
-+    if (def->vcpus != def->maxvcpus) {
-+        virBufferFreeAndReset(&buf);
-+        qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-+                        _("setting current vcpu count less than maximum is "
-+                          "not supported yet"));
-+        return NULL;
-+    }
-
-     if (virBufferError(&buf)) {
-         virBufferFreeAndReset(&buf);
-@@ -6178,6 +6185,8 @@ qemuParseCommandLineSmp(virDomainDefPtr dom,
-         }
-     }
-
-+    dom->maxvcpus = dom->vcpus;
-+
-     if (sockets && cores && threads) {
-         virCPUDefPtr cpu;
-
-@@ -6247,6 +6256,7 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr caps,
-
-     def->id = -1;
-     def->mem.cur_balloon = def->mem.max_balloon = 64 * 1024;
-+    def->maxvcpus = 1;
-     def->vcpus = 1;
-     def->clock.offset = VIR_DOMAIN_CLOCK_OFFSET_UTC;
-     def->features = (1 << VIR_DOMAIN_FEATURE_ACPI)
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index 7a2ea8f..c66dc04 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -2425,8 +2425,9 @@ qemuDetectVcpuPIDs(struct qemud_driver *driver,
-
-     if (ncpupids != vm->def->vcpus) {
-         qemuReportError(VIR_ERR_INTERNAL_ERROR,
--                        _("got wrong number of vCPU pids from QEMU monitor. got %d, wanted %d"),
--                        ncpupids, (int)vm->def->vcpus);
-+                        _("got wrong number of vCPU pids from QEMU monitor. "
-+                          "got %d, wanted %d"),
-+                        ncpupids, vm->def->vcpus);
-         VIR_FREE(cpupids);
-         return -1;
-     }
-diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c
-index 0cbe8b3..5a859a4 100644
---- a/src/vbox/vbox_tmpl.c
-+++ b/src/vbox/vbox_tmpl.c
-@@ -2028,7 +2028,7 @@ static char *vboxDomainDumpXML(virDomainPtr dom, int flags) {
-             def->mem.max_balloon = memorySize * 1024;
-
-             machine->vtbl->GetCPUCount(machine, &CPUCount);
--            def->vcpus = CPUCount;
-+            def->maxvcpus = def->vcpus = CPUCount;
-
-             /* Skip cpumasklen, cpumask, onReboot, onPoweroff, onCrash */
-
-@@ -4598,11 +4598,15 @@ static virDomainPtr vboxDomainDefineXML(virConnectPtr conn, const char *xml) {
-                   def->mem.cur_balloon, (unsigned)rc);
-     }
-
--    rc = machine->vtbl->SetCPUCount(machine, def->vcpus);
-+    if (def->vcpus != def->maxvcpus) {
-+        vboxError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-+                    _("current vcpu count must equal maximum"));
-+    }
-+    rc = machine->vtbl->SetCPUCount(machine, def->maxvcpus);
-     if (NS_FAILED(rc)) {
-         vboxError(VIR_ERR_INTERNAL_ERROR,
--                  _("could not set the number of virtual CPUs to: %lu, rc=%08x"),
--                  def->vcpus, (unsigned)rc);
-+                  _("could not set the number of virtual CPUs to: %u, rc=%08x"),
-+                  def->maxvcpus, (unsigned)rc);
-     }
-
- #if VBOX_API_VERSION < 3001
-diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c
-index 5ffc3c8..456b477 100644
---- a/src/xen/xend_internal.c
-+++ b/src/xen/xend_internal.c
-@@ -2190,7 +2190,8 @@ xenDaemonParseSxpr(virConnectPtr conn,
-         }
-     }
-
--    def->vcpus = sexpr_int(root, "domain/vcpus");
-+    def->maxvcpus = sexpr_int(root, "domain/vcpus");
-+    def->vcpus = def->maxvcpus;
-
-     tmp = sexpr_node(root, "domain/on_poweroff");
-     if (tmp != NULL) {
-@@ -5649,7 +5650,7 @@ xenDaemonFormatSxprInput(virDomainInputDefPtr input,
-  *
-  * Generate an SEXPR representing the domain configuration.
-  *
-- * Returns the 0 terminatedi S-Expr string or NULL in case of error.
-+ * Returns the 0 terminated S-Expr string or NULL in case of error.
-  *         the caller must free() the returned value.
-  */
- char *
-@@ -5666,7 +5667,7 @@ xenDaemonFormatSxpr(virConnectPtr conn,
-     virBufferAsprintf(&buf, "(name '%s')", def->name);
-     virBufferAsprintf(&buf, "(memory %lu)(maxmem %lu)",
-                       def->mem.cur_balloon/1024, def->mem.max_balloon/1024);
--    virBufferAsprintf(&buf, "(vcpus %lu)", def->vcpus);
-+    virBufferAsprintf(&buf, "(vcpus %u)", def->maxvcpus);
-
-     if (def->cpumask) {
-         char *ranges = virDomainCpuSetFormat(def->cpumask, def->cpumasklen);
-@@ -5761,7 +5762,7 @@ xenDaemonFormatSxpr(virConnectPtr conn,
-             else
-                 virBufferAsprintf(&buf, "(kernel '%s')", def->os.loader);
-
--            virBufferAsprintf(&buf, "(vcpus %lu)", def->vcpus);
-+            virBufferAsprintf(&buf, "(vcpus %u)", def->maxvcpus);
-
-             for (i = 0 ; i < def->os.nBootDevs ; i++) {
-                 switch (def->os.bootDevs[i]) {
-diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c
-index 8e42a1c..bf20a64 100644
---- a/src/xen/xm_internal.c
-+++ b/src/xen/xm_internal.c
-@@ -678,6 +678,7 @@ xenXMDomainConfigParse(virConnectPtr conn, virConfPtr conf) {
-     int i;
-     const char *defaultArch, *defaultMachine;
-     int vmlocaltime = 0;
-+    unsigned long count;
-
-     if (VIR_ALLOC(def) < 0) {
-         virReportOOMError();
-@@ -770,9 +771,11 @@ xenXMDomainConfigParse(virConnectPtr conn, virConfPtr conf) {
-     def->mem.cur_balloon *= 1024;
-     def->mem.max_balloon *= 1024;
-
--
--    if (xenXMConfigGetULong(conf, "vcpus", &def->vcpus, 1) < 0)
-+    if (xenXMConfigGetULong(conf, "vcpus", &count, 1) < 0 ||
-+        (unsigned short) count != count)
-         goto cleanup;
-+    def->maxvcpus = count;
-+    def->vcpus = def->maxvcpus;
-
-     if (xenXMConfigGetString(conf, "cpus", &str, NULL) < 0)
-         goto cleanup;
-@@ -1650,7 +1653,7 @@ int xenXMDomainSetVcpus(virDomainPtr domain, unsigned int vcpus) {
-     if (!(entry = virHashLookup(priv->configCache, filename)))
-         goto cleanup;
-
--    entry->def->vcpus = vcpus;
-+    entry->def->maxvcpus = entry->def->vcpus = vcpus;
-
-     /* If this fails, should we try to undo our changes to the
-      * in-memory representation of the config file. I say not!
-@@ -2241,7 +2244,7 @@ virConfPtr xenXMDomainConfigFormat(virConnectPtr conn,
-     if (xenXMConfigSetInt(conf, "memory", def->mem.cur_balloon / 1024) < 0)
-         goto no_memory;
-
--    if (xenXMConfigSetInt(conf, "vcpus", def->vcpus) < 0)
-+    if (xenXMConfigSetInt(conf, "vcpus", def->maxvcpus) < 0)
-         goto no_memory;
-
-     if ((def->cpumask != NULL) &&
-diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c
-index 7d4ab8d..5ccdede 100644
---- a/src/xenapi/xenapi_driver.c
-+++ b/src/xenapi/xenapi_driver.c
-@@ -1335,7 +1335,7 @@ xenapiDomainDumpXML (virDomainPtr dom, int flags ATTRIBUTE_UNUSED)
-     } else {
-         defPtr->mem.cur_balloon = memory;
-     }
--    defPtr->vcpus = xenapiDomainGetMaxVcpus(dom);
-+    defPtr->maxvcpus = defPtr->vcpus = xenapiDomainGetMaxVcpus(dom);
-     enum xen_on_normal_exit action;
-     if (xen_vm_get_actions_after_shutdown(session, &action, vm)) {
-         defPtr->onPoweroff = xenapiNormalExitEnum2virDomainLifecycle(action);
-diff --git a/src/xenapi/xenapi_utils.c b/src/xenapi/xenapi_utils.c
-index be55491..a7e2a4b 100644
---- a/src/xenapi/xenapi_utils.c
-+++ b/src/xenapi/xenapi_utils.c
-@@ -510,8 +510,8 @@ createVMRecordFromXml (virConnectPtr conn, virDomainDefPtr def,
-     else
-         (*record)->memory_dynamic_max = (*record)->memory_static_max;
-
--    if (def->vcpus) {
--        (*record)->vcpus_max = (int64_t) def->vcpus;
-+    if (def->maxvcpus) {
-+        (*record)->vcpus_max = (int64_t) def->maxvcpus;
-         (*record)->vcpus_at_startup = (int64_t) def->vcpus;
-     }
-     if (def->onPoweroff)
--- 
-1.7.2.3
-

docs/api_extension/0009-support-all-flags-in-test-driver.patch

@@ -1,197 +0,0 @@
-From 6c9e6b956453d0f0c4ff542ef8a184d663a39266 Mon Sep 17 00:00:00 2001
-From: Eric Blake <eblake@redhat.com>
-Date: Mon, 4 Oct 2010 17:01:12 -0600
-Subject: [PATCH 09/15] vcpu: support all flags in test driver
-
-* src/test/test_driver.c (testDomainGetVcpusFlags)
-(testDomainSetVcpusFlags): Support all flags.
-(testDomainUpdateVCPUs): Update cpu count here.
----
- src/test/test_driver.c |  128 ++++++++++++++++++++++++++++++++++++++++-------
- 1 files changed, 109 insertions(+), 19 deletions(-)
-
-diff --git a/src/test/test_driver.c b/src/test/test_driver.c
-index b70c80d..a9d3d89 100644
---- a/src/test/test_driver.c
-+++ b/src/test/test_driver.c
-@@ -450,6 +450,7 @@ testDomainUpdateVCPUs(virConnectPtr conn,
-                 goto cleanup;
-     }
-
-+    dom->def->vcpus = nvcpus;
-     ret = 0;
- cleanup:
-     return ret;
-@@ -2032,12 +2033,51 @@ cleanup:
- static int
- testDomainGetVcpusFlags(virDomainPtr domain, unsigned int flags)
- {
--    if (flags != (VIR_DOMAIN_VCPU_LIVE | VIR_DOMAIN_VCPU_MAXIMUM)) {
--        testError(VIR_ERR_INVALID_ARG, _("unsupported flags: (0x%x)"), flags);
-+    testConnPtr privconn = domain->conn->privateData;
-+    virDomainObjPtr vm;
-+    virDomainDefPtr def;
-+    int ret = -1;
-+
-+    virCheckFlags(VIR_DOMAIN_VCPU_LIVE |
-+                  VIR_DOMAIN_VCPU_CONFIG |
-+                  VIR_DOMAIN_VCPU_MAXIMUM, -1);
-+
-+    /* Exactly one of LIVE or CONFIG must be set.  */
-+    if (!(flags & VIR_DOMAIN_VCPU_LIVE) == !(flags & VIR_DOMAIN_VCPU_CONFIG)) {
-+        testError(VIR_ERR_INVALID_ARG,
-+                  _("invalid flag combination: (0x%x)"), flags);
-         return -1;
-     }
-
--    return testGetMaxVCPUs(domain->conn, "test");
-+    testDriverLock(privconn);
-+    vm = virDomainFindByUUID(&privconn->domains, domain->uuid);
-+    testDriverUnlock(privconn);
-+
-+    if (!vm) {
-+        char uuidstr[VIR_UUID_STRING_BUFLEN];
-+        virUUIDFormat(domain->uuid, uuidstr);
-+        testError(VIR_ERR_NO_DOMAIN,
-+                  _("no domain with matching uuid '%s'"), uuidstr);
-+        goto cleanup;
-+    }
-+
-+    if (flags & VIR_DOMAIN_VCPU_LIVE) {
-+        if (!virDomainObjIsActive(vm)) {
-+            testError(VIR_ERR_OPERATION_INVALID, "%s",
-+                      _("domain not active"));
-+            goto cleanup;
-+        }
-+        def = vm->def;
-+    } else {
-+        def = vm->newDef ? vm->newDef : vm->def;
-+    }
-+
-+    ret = (flags & VIR_DOMAIN_VCPU_MAXIMUM) ? def->maxvcpus : def->vcpus;
-+
-+cleanup:
-+    if (vm)
-+        virDomainObjUnlock(vm);
-+    return ret;
- }
-
- static int
-@@ -2053,21 +2093,30 @@ testDomainSetVcpusFlags(virDomainPtr domain, unsigned int nrCpus,
- {
-     testConnPtr privconn = domain->conn->privateData;
-     virDomainObjPtr privdom = NULL;
-+    virDomainDefPtr def;
-     int ret = -1, maxvcpus;
-
--    if (flags != VIR_DOMAIN_VCPU_LIVE) {
--        testError(VIR_ERR_INVALID_ARG, _("unsupported flags: (0x%x)"), flags);
-+    virCheckFlags(VIR_DOMAIN_VCPU_LIVE |
-+                  VIR_DOMAIN_VCPU_CONFIG |
-+                  VIR_DOMAIN_VCPU_MAXIMUM, -1);
-+
-+    /* At least one of LIVE or CONFIG must be set.  MAXIMUM cannot be
-+     * mixed with LIVE.  */
-+    if ((flags & (VIR_DOMAIN_VCPU_LIVE | VIR_DOMAIN_VCPU_CONFIG)) == 0 ||
-+        (flags & (VIR_DOMAIN_VCPU_MAXIMUM | VIR_DOMAIN_VCPU_LIVE)) ==
-+         (VIR_DOMAIN_VCPU_MAXIMUM | VIR_DOMAIN_VCPU_LIVE)) {
-+        testError(VIR_ERR_INVALID_ARG,
-+                  _("invalid flag combination: (0x%x)"), flags);
-+        return -1;
-+    }
-+    if (!nrCpus || (maxvcpus = testGetMaxVCPUs(domain->conn, NULL)) < nrCpus) {
-+        testError(VIR_ERR_INVALID_ARG,
-+                  _("argument out of range: %d"), nrCpus);
-         return -1;
-     }
--
--    /* Do this first before locking */
--    maxvcpus = testDomainGetMaxVcpus(domain);
--    if (maxvcpus < 0)
--        goto cleanup;
-
-     testDriverLock(privconn);
--    privdom = virDomainFindByName(&privconn->domains,
--                                  domain->name);
-+    privdom = virDomainFindByUUID(&privconn->domains, domain->uuid);
-     testDriverUnlock(privconn);
-
-     if (privdom == NULL) {
-@@ -2075,13 +2124,17 @@ testDomainSetVcpusFlags(virDomainPtr domain, unsigned int nrCpus,
-         goto cleanup;
-     }
-
--    if (!virDomainObjIsActive(privdom)) {
-+    if (!virDomainObjIsActive(privdom) && (flags & VIR_DOMAIN_VCPU_LIVE)) {
-         testError(VIR_ERR_OPERATION_INVALID,
-                   "%s", _("cannot hotplug vcpus for an inactive domain"));
-         goto cleanup;
-     }
-
--    /* We allow more cpus in guest than host */
-+    /* We allow more cpus in guest than host, but not more than the
-+     * domain's starting limit.  */
-+    if ((flags & (VIR_DOMAIN_VCPU_MAXIMUM | VIR_DOMAIN_VCPU_LIVE)) ==
-+        VIR_DOMAIN_VCPU_LIVE && privdom->def->maxvcpus < maxvcpus)
-+        maxvcpus = privdom->def->maxvcpus;
-     if (nrCpus > maxvcpus) {
-         testError(VIR_ERR_INVALID_ARG,
-                   "requested cpu amount exceeds maximum (%d > %d)",
-@@ -2089,12 +2142,49 @@ testDomainSetVcpusFlags(virDomainPtr domain, unsigned int nrCpus,
-         goto cleanup;
-     }
-
--    /* Update VCPU state for the running domain */
--    if (testDomainUpdateVCPUs(domain->conn, privdom, nrCpus, 0) < 0)
--        goto cleanup;
-+    switch (flags) {
-+    case VIR_DOMAIN_VCPU_MAXIMUM | VIR_DOMAIN_VCPU_CONFIG:
-+        def = privdom->def;
-+        if (virDomainObjIsActive(privdom)) {
-+            if (privdom->newDef)
-+                def = privdom->newDef;
-+            else {
-+                testError(VIR_ERR_OPERATION_INVALID, "%s",
-+                          _("no persistent state"));
-+                goto cleanup;
-+            }
-+        }
-+        def->maxvcpus = nrCpus;
-+        if (nrCpus < def->vcpus)
-+            def->vcpus = nrCpus;
-+        ret = 0;
-+        break;
-
--    privdom->def->vcpus = nrCpus;
--    ret = 0;
-+    case VIR_DOMAIN_VCPU_CONFIG:
-+        def = privdom->def;
-+        if (virDomainObjIsActive(privdom)) {
-+            if (privdom->newDef)
-+                def = privdom->newDef;
-+            else {
-+                testError(VIR_ERR_OPERATION_INVALID, "%s",
-+                          _("no persistent state"));
-+                goto cleanup;
-+            }
-+        }
-+        def->vcpus = nrCpus;
-+        ret = 0;
-+        break;
-+
-+    case VIR_DOMAIN_VCPU_LIVE:
-+        ret = testDomainUpdateVCPUs(domain->conn, privdom, nrCpus, 0);
-+        break;
-+
-+    case VIR_DOMAIN_VCPU_LIVE | VIR_DOMAIN_VCPU_CONFIG:
-+        ret = testDomainUpdateVCPUs(domain->conn, privdom, nrCpus, 0);
-+        if (ret == 0 && privdom->newDef)
-+            privdom->newDef->vcpus = nrCpus;
-+        break;
-+    }
-
- cleanup:
-     if (privdom)
--- 
-1.7.2.3
-

docs/api_extension/0010-improve-vcpu-support-in-qemu-command-line.patch

@@ -1,122 +0,0 @@
-From d67c189e80e6aef7adf13e5763365555cfc1a02a Mon Sep 17 00:00:00 2001
-From: Eric Blake <eblake@redhat.com>
-Date: Wed, 29 Sep 2010 15:58:47 -0600
-Subject: [PATCH 10/15] vcpu: improve vcpu support in qemu command line
-
-* src/qemu/qemu_conf.c (qemuParseCommandLineSmp): Distinguish
-between vcpus and maxvcpus, for new enough qemu.
-* tests/qemuargv2xmltest.c (mymain): Add new test.
-* tests/qemuxml2argvtest.c (mymain): Likewise.
-* tests/qemuxml2xmltest.c (mymain): Likewise.
-* tests/qemuxml2argvdata/qemuxml2argv-smp.args: New file.
----
- src/qemu/qemu_conf.c                         |   13 +++++++++----
- tests/qemuargv2xmltest.c                     |    2 ++
- tests/qemuxml2argvdata/qemuxml2argv-smp.args |    1 +
- tests/qemuxml2argvtest.c                     |    2 ++
- tests/qemuxml2xmltest.c                      |    2 ++
- 5 files changed, 16 insertions(+), 4 deletions(-)
- create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-smp.args
-
-diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
-index 38c8351..ffe184b 100644
---- a/src/qemu/qemu_conf.c
-+++ b/src/qemu/qemu_conf.c
-@@ -3714,6 +3714,8 @@ qemuBuildSmpArgStr(const virDomainDefPtr def,
-     virBufferAsprintf(&buf, "%u", def->vcpus);
-
-     if ((qemuCmdFlags & QEMUD_CMD_FLAG_SMP_TOPOLOGY)) {
-+        if (def->vcpus != def->maxvcpus)
-+            virBufferAsprintf(&buf, ",maxcpus=%u", def->maxvcpus);
-         /* sockets, cores, and threads are either all zero
-          * or all non-zero, thus checking one of them is enough */
-         if (def->cpu && def->cpu->sockets) {
-@@ -3726,12 +3728,12 @@ qemuBuildSmpArgStr(const virDomainDefPtr def,
-             virBufferAsprintf(&buf, ",cores=%u", 1);
-             virBufferAsprintf(&buf, ",threads=%u", 1);
-         }
--    }
--    if (def->vcpus != def->maxvcpus) {
-+    } else if (def->vcpus != def->maxvcpus) {
-         virBufferFreeAndReset(&buf);
-+        /* FIXME - consider hot-unplugging cpus after boot for older qemu */
-         qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                         _("setting current vcpu count less than maximum is "
--                          "not supported yet"));
-+                          "not supported with this QEMU binary"));
-         return NULL;
-     }
-
-@@ -6153,6 +6155,7 @@ qemuParseCommandLineSmp(virDomainDefPtr dom,
-     unsigned int sockets = 0;
-     unsigned int cores = 0;
-     unsigned int threads = 0;
-+    unsigned int maxcpus = 0;
-     int i;
-     int nkws;
-     char **kws;
-@@ -6180,12 +6183,14 @@ qemuParseCommandLineSmp(virDomainDefPtr dom,
-                 cores = n;
-             else if (STREQ(kws[i], "threads"))
-                 threads = n;
-+            else if (STREQ(kws[i], "maxcpus"))
-+                maxcpus = n;
-             else
-                 goto syntax;
-         }
-     }
-
--    dom->maxvcpus = dom->vcpus;
-+    dom->maxvcpus = maxcpus ? maxcpus : dom->vcpus;
-
-     if (sockets && cores && threads) {
-         virCPUDefPtr cpu;
-diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c
-index 4f9ec84..d941b0b 100644
---- a/tests/qemuargv2xmltest.c
-+++ b/tests/qemuargv2xmltest.c
-@@ -221,6 +221,8 @@ mymain(int argc, char **argv)
-
-     DO_TEST("hostdev-pci-address");
-
-+    DO_TEST("smp");
-+
-     DO_TEST_FULL("restore-v1", 0, "stdio");
-     DO_TEST_FULL("restore-v2", 0, "stdio");
-     DO_TEST_FULL("restore-v2", 0, "exec:cat");
-diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smp.args b/tests/qemuxml2argvdata/qemuxml2argv-smp.args
-new file mode 100644
-index 0000000..3ec8f15
---- /dev/null
-+++ b/tests/qemuxml2argvdata/qemuxml2argv-smp.args
-@@ -0,0 +1 @@
-+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1,maxcpus=2,sockets=2,cores=1,threads=1 -nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb
-diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
-index 92d5b18..551d6c4 100644
---- a/tests/qemuxml2argvtest.c
-+++ b/tests/qemuxml2argvtest.c
-@@ -385,6 +385,8 @@ mymain(int argc, char **argv)
-
-     DO_TEST("qemu-ns", 0);
-
-+    DO_TEST("smp", QEMUD_CMD_FLAG_SMP_TOPOLOGY);
-+
-     free(driver.stateDir);
-     virCapabilitiesFree(driver.caps);
-
-diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
-index a33d435..cdc4390 100644
---- a/tests/qemuxml2xmltest.c
-+++ b/tests/qemuxml2xmltest.c
-@@ -180,6 +180,8 @@ mymain(int argc, char **argv)
-     DO_TEST("encrypted-disk");
-     DO_TEST("memtune");
-
-+    DO_TEST("smp");
-+
-     /* These tests generate different XML */
-     DO_TEST_DIFFERENT("balloon-device-auto");
-     DO_TEST_DIFFERENT("channel-virtio-auto");
--- 
-1.7.2.3
-

docs/api_extension/0011-complete-vcpu-support-in-qemu-driver.patch

@@ -1,169 +0,0 @@
-From 28a3605906385cba43df77051dc26e865f237b09 Mon Sep 17 00:00:00 2001
-From: Eric Blake <eblake@redhat.com>
-Date: Wed, 29 Sep 2010 17:40:45 -0600
-Subject: [PATCH 11/15] vcpu: complete vcpu support in qemu driver
-
-* src/qemu/qemu_driver.c (qemudDomainSetVcpusFlags)
-(qemudDomainGetVcpusFlags): Support all feasible flag
-combinations.
----
- src/qemu/qemu_driver.c |  100 ++++++++++++++++++++++++++++++++++++++++-------
- 1 files changed, 85 insertions(+), 15 deletions(-)
-
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index c66dc04..a9e057f 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -5941,13 +5941,27 @@ qemudDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus,
- {
-     struct qemud_driver *driver = dom->conn->privateData;
-     virDomainObjPtr vm;
-+    virDomainDefPtr def;
-     const char * type;
-     int max;
-     int ret = -1;
-
--    if (flags != VIR_DOMAIN_VCPU_LIVE) {
--        qemuReportError(VIR_ERR_INVALID_ARG, _("unsupported flags: (0x%x)"),
--                        flags);
-+    virCheckFlags(VIR_DOMAIN_VCPU_LIVE |
-+                  VIR_DOMAIN_VCPU_CONFIG |
-+                  VIR_DOMAIN_VCPU_MAXIMUM, -1);
-+
-+    /* At least one of LIVE or CONFIG must be set.  MAXIMUM cannot be
-+     * mixed with LIVE.  */
-+    if ((flags & (VIR_DOMAIN_VCPU_LIVE | VIR_DOMAIN_VCPU_CONFIG)) == 0 ||
-+        (flags & (VIR_DOMAIN_VCPU_MAXIMUM | VIR_DOMAIN_VCPU_LIVE)) ==
-+         (VIR_DOMAIN_VCPU_MAXIMUM | VIR_DOMAIN_VCPU_LIVE)) {
-+        qemuReportError(VIR_ERR_INVALID_ARG,
-+                        _("invalid flag combination: (0x%x)"), flags);
-+        return -1;
-+    }
-+    if (!nvcpus || (unsigned short) nvcpus != nvcpus) {
-+        qemuReportError(VIR_ERR_INVALID_ARG,
-+                        _("argument out of range: %d"), nvcpus);
-         return -1;
-     }
-
-@@ -5966,7 +5980,7 @@ qemudDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus,
-     if (qemuDomainObjBeginJob(vm) < 0)
-         goto cleanup;
-
--    if (!virDomainObjIsActive(vm)) {
-+    if (!virDomainObjIsActive(vm) && (flags & VIR_DOMAIN_VCPU_LIVE)) {
-         qemuReportError(VIR_ERR_OPERATION_INVALID,
-                          "%s", _("domain is not running"));
-         goto endjob;
-@@ -5985,6 +5999,11 @@ qemudDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus,
-         goto endjob;
-     }
-
-+    if ((flags & (VIR_DOMAIN_VCPU_MAXIMUM | VIR_DOMAIN_VCPU_LIVE)) ==
-+        VIR_DOMAIN_VCPU_LIVE && vm->def->maxvcpus < max) {
-+        max = vm->def->maxvcpus;
-+    }
-+
-     if (nvcpus > max) {
-         qemuReportError(VIR_ERR_INVALID_ARG,
-                         _("requested vcpus is greater than max allowable"
-@@ -5992,7 +6011,49 @@ qemudDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus,
-         goto endjob;
-     }
-
--    ret = qemudDomainHotplugVcpus(vm, nvcpus);
-+    switch (flags) {
-+    case VIR_DOMAIN_VCPU_MAXIMUM | VIR_DOMAIN_VCPU_CONFIG:
-+        def = vm->def;
-+        if (virDomainObjIsActive(vm)) {
-+            if (vm->newDef)
-+                def = vm->newDef;
-+            else{
-+                qemuReportError(VIR_ERR_OPERATION_INVALID, "%s",
-+                                _("no persistent state"));
-+                goto endjob;
-+            }
-+        }
-+        def->maxvcpus = nvcpus;
-+        if (nvcpus < vm->newDef->vcpus)
-+            def->vcpus = nvcpus;
-+        ret = 0;
-+        break;
-+
-+    case VIR_DOMAIN_VCPU_CONFIG:
-+        def = vm->def;
-+        if (virDomainObjIsActive(vm)) {
-+            if (vm->newDef)
-+                def = vm->newDef;
-+            else {
-+                qemuReportError(VIR_ERR_OPERATION_INVALID, "%s",
-+                                _("no persistent state"));
-+                goto endjob;
-+            }
-+        }
-+        def->vcpus = nvcpus;
-+        ret = 0;
-+        break;
-+
-+    case VIR_DOMAIN_VCPU_LIVE:
-+        ret = qemudDomainHotplugVcpus(vm, nvcpus);
-+        break;
-+
-+    case VIR_DOMAIN_VCPU_LIVE | VIR_DOMAIN_VCPU_CONFIG:
-+        ret = qemudDomainHotplugVcpus(vm, nvcpus);
-+        if (ret == 0 && vm->newDef)
-+            vm->newDef->vcpus = nvcpus;
-+        break;
-+    }
-
- endjob:
-     if (qemuDomainObjEndJob(vm) == 0)
-@@ -6171,12 +6232,17 @@ qemudDomainGetVcpusFlags(virDomainPtr dom, unsigned int flags)
- {
-     struct qemud_driver *driver = dom->conn->privateData;
-     virDomainObjPtr vm;
--    const char *type;
-+    virDomainDefPtr def;
-     int ret = -1;
-
--    if (flags != (VIR_DOMAIN_VCPU_LIVE | VIR_DOMAIN_VCPU_MAXIMUM)) {
--        qemuReportError(VIR_ERR_INVALID_ARG, _("unsupported flags: (0x%x)"),
--                        flags);
-+    virCheckFlags(VIR_DOMAIN_VCPU_LIVE |
-+                  VIR_DOMAIN_VCPU_CONFIG |
-+                  VIR_DOMAIN_VCPU_MAXIMUM, -1);
-+
-+    /* Exactly one of LIVE or CONFIG must be set.  */
-+    if (!(flags & VIR_DOMAIN_VCPU_LIVE) == !(flags & VIR_DOMAIN_VCPU_CONFIG)) {
-+        qemuReportError(VIR_ERR_INVALID_ARG,
-+                        _("invalid flag combination: (0x%x)"), flags);
-         return -1;
-     }
-
-@@ -6192,14 +6258,18 @@ qemudDomainGetVcpusFlags(virDomainPtr dom, unsigned int flags)
-         goto cleanup;
-     }
-
--    if (!(type = virDomainVirtTypeToString(vm->def->virtType))) {
--        qemuReportError(VIR_ERR_INTERNAL_ERROR,
--                        _("unknown virt type in domain definition '%d'"),
--                        vm->def->virtType);
--        goto cleanup;
-+    if (flags & VIR_DOMAIN_VCPU_LIVE) {
-+        if (!virDomainObjIsActive(vm)) {
-+            qemuReportError(VIR_ERR_OPERATION_INVALID, "%s",
-+                            _("domain not active"));
-+            goto cleanup;
-+        }
-+        def = vm->def;
-+    } else {
-+        def = vm->newDef ? vm->newDef : vm->def;
-     }
-
--    ret = qemudGetMaxVCPUs(NULL, type);
-+    ret = (flags & VIR_DOMAIN_VCPU_MAXIMUM) ? def->maxvcpus : def->vcpus;
-
- cleanup:
-     if (vm)
--- 
-1.7.2.3
-

docs/api_extension/0012-improve-vcpu-support-in-xen-command-line.patch

@@ -1,294 +0,0 @@
-From 0fab10e5ed971ab4f960a53e9640b0672f4b8ac3 Mon Sep 17 00:00:00 2001
-From: Eric Blake <eblake@redhat.com>
-Date: Tue, 5 Oct 2010 08:18:52 -0600
-Subject: [PATCH 12/15] vcpu: improve vcpu support in xen command line
-
-This patch series focuses on xendConfigVersion 2 (xm_internal) and 3
-(xend_internal), but leaves out changes for xenapi drivers.
-
-See this link for more details about vcpu_avail for xm usage.
-http://lists.xensource.com/archives/html/xen-devel/2009-11/msg01061.html
-
-This relies on the fact that def->maxvcpus can be at most 32 with xen.
-
-* src/xen/xend_internal.c (xenDaemonParseSxpr)
-(sexpr_to_xend_domain_info, xenDaemonFormatSxpr): Use vcpu_avail
-when current vcpus is less than maximum.
-* src/xen/xm_internal.c (xenXMDomainConfigParse)
-(xenXMDomainConfigFormat): Likewise.
-* tests/xml2sexprdata/xml2sexpr-pv-vcpus.sexpr: New file.
-* tests/sexpr2xmldata/sexpr2xml-pv-vcpus.sexpr: Likewise.
-* tests/sexpr2xmldata/sexpr2xml-pv-vcpus.xml: Likewise.
-* tests/xmconfigdata/test-paravirt-vcpu.cfg: Likewise.
-* tests/xmconfigdata/test-paravirt-vcpu.xml: Likewise.
-* tests/xml2sexprtest.c (mymain): New test.
-* tests/sexpr2xmltest.c (mymain): Likewise.
-* tests/xmconfigtest.c (mymain): Likewise.
----
- src/xen/xend_internal.c                      |   19 +++++++++++++--
- src/xen/xm_internal.c                        |   10 ++++++-
- tests/sexpr2xmldata/sexpr2xml-pv-vcpus.sexpr |    1 +
- tests/sexpr2xmldata/sexpr2xml-pv-vcpus.xml   |   27 +++++++++++++++++++++
- tests/sexpr2xmltest.c                        |    1 +
- tests/xmconfigdata/test-paravirt-vcpu.cfg    |   17 +++++++++++++
- tests/xmconfigdata/test-paravirt-vcpu.xml    |   32 ++++++++++++++++++++++++++
- tests/xmconfigtest.c                         |    1 +
- tests/xml2sexprdata/xml2sexpr-pv-vcpus.sexpr |    1 +
- tests/xml2sexprtest.c                        |    1 +
- 10 files changed, 105 insertions(+), 5 deletions(-)
- create mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-vcpus.sexpr
- create mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-vcpus.xml
- create mode 100644 tests/xmconfigdata/test-paravirt-vcpu.cfg
- create mode 100644 tests/xmconfigdata/test-paravirt-vcpu.xml
- create mode 100644 tests/xml2sexprdata/xml2sexpr-pv-vcpus.sexpr
-
-diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c
-index 456b477..dfc6415 100644
---- a/src/xen/xend_internal.c
-+++ b/src/xen/xend_internal.c
-@@ -44,6 +44,7 @@
- #include "xen_hypervisor.h"
- #include "xs_internal.h" /* To extract VNC port & Serial console TTY */
- #include "memory.h"
-+#include "count-one-bits.h"
-
- /* required for cpumap_t */
- #include <xen/dom0_ops.h>
-@@ -2191,7 +2192,9 @@ xenDaemonParseSxpr(virConnectPtr conn,
-     }
-
-     def->maxvcpus = sexpr_int(root, "domain/vcpus");
--    def->vcpus = def->maxvcpus;
-+    def->vcpus = count_one_bits(sexpr_int(root, "domain/vcpu_avail"));
-+    if (!def->vcpus || def->maxvcpus < def->vcpus)
-+        def->vcpus = def->maxvcpus;
-
-     tmp = sexpr_node(root, "domain/on_poweroff");
-     if (tmp != NULL) {
-@@ -2433,7 +2436,7 @@ sexpr_to_xend_domain_info(virDomainPtr domain, const struct sexpr *root,
-                           virDomainInfoPtr info)
- {
-     const char *flags;
--
-+    int vcpus;
-
-     if ((root == NULL) || (info == NULL))
-         return (-1);
-@@ -2464,7 +2467,11 @@ sexpr_to_xend_domain_info(virDomainPtr domain, const struct sexpr *root,
-             info->state = VIR_DOMAIN_NOSTATE;
-     }
-     info->cpuTime = sexpr_float(root, "domain/cpu_time") * 1000000000;
--    info->nrVirtCpu = sexpr_int(root, "domain/vcpus");
-+    vcpus = sexpr_int(root, "domain/vcpus");
-+    info->nrVirtCpu = count_one_bits(sexpr_int(root, "domain/vcpu_avail"));
-+    if (!info->nrVirtCpu || vcpus < info->nrVirtCpu)
-+        info->nrVirtCpu = vcpus;
-+
-     return (0);
- }
-
-@@ -5668,6 +5675,9 @@ xenDaemonFormatSxpr(virConnectPtr conn,
-     virBufferAsprintf(&buf, "(memory %lu)(maxmem %lu)",
-                       def->mem.cur_balloon/1024, def->mem.max_balloon/1024);
-     virBufferAsprintf(&buf, "(vcpus %u)", def->maxvcpus);
-+    /* Computing the vcpu_avail bitmask works because MAX_VIRT_CPUS is 32.  */
-+    if (def->vcpus < def->maxvcpus)
-+        virBufferAsprintf(&buf, "(vcpu_avail %u)", (1U << def->vcpus) - 1);
-
-     if (def->cpumask) {
-         char *ranges = virDomainCpuSetFormat(def->cpumask, def->cpumasklen);
-@@ -5763,6 +5773,9 @@ xenDaemonFormatSxpr(virConnectPtr conn,
-                 virBufferAsprintf(&buf, "(kernel '%s')", def->os.loader);
-
-             virBufferAsprintf(&buf, "(vcpus %u)", def->maxvcpus);
-+            if (def->vcpus < def->maxvcpus)
-+                virBufferAsprintf(&buf, "(vcpu_avail %u)",
-+                                  (1U << def->vcpus) - 1);
-
-             for (i = 0 ; i < def->os.nBootDevs ; i++) {
-                 switch (def->os.bootDevs[i]) {
-diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c
-index bf20a64..f7121ab 100644
---- a/src/xen/xm_internal.c
-+++ b/src/xen/xm_internal.c
-@@ -46,6 +46,7 @@
- #include "util.h"
- #include "memory.h"
- #include "logging.h"
-+#include "count-one-bits.h"
-
- #define VIR_FROM_THIS VIR_FROM_XENXM
-
-@@ -772,10 +773,12 @@ xenXMDomainConfigParse(virConnectPtr conn, virConfPtr conf) {
-     def->mem.max_balloon *= 1024;
-
-     if (xenXMConfigGetULong(conf, "vcpus", &count, 1) < 0 ||
--        (unsigned short) count != count)
-+        MAX_VIRT_CPUS < count)
-         goto cleanup;
-     def->maxvcpus = count;
--    def->vcpus = def->maxvcpus;
-+    if (xenXMConfigGetULong(conf, "vcpu_avail", &count, -1) < 0)
-+        goto cleanup;
-+    def->vcpus = MIN(count_one_bits(count), def->maxvcpus);
-
-     if (xenXMConfigGetString(conf, "cpus", &str, NULL) < 0)
-         goto cleanup;
-@@ -2246,6 +2249,9 @@ virConfPtr xenXMDomainConfigFormat(virConnectPtr conn,
-
-     if (xenXMConfigSetInt(conf, "vcpus", def->maxvcpus) < 0)
-         goto no_memory;
-+    if (def->vcpus < def->maxvcpus &&
-+        xenXMConfigSetInt(conf, "vcpu_avail", (1U << def->vcpus) - 1) < 0)
-+        goto no_memory;
-
-     if ((def->cpumask != NULL) &&
-         ((cpus = virDomainCpuSetFormat(def->cpumask,
-diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vcpus.sexpr b/tests/sexpr2xmldata/sexpr2xml-pv-vcpus.sexpr
-new file mode 100644
-index 0000000..2be6822
---- /dev/null
-+++ b/tests/sexpr2xmldata/sexpr2xml-pv-vcpus.sexpr
-@@ -0,0 +1 @@
-+(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 4)(vcpu_avail 3)(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  ')))(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w'))))
-diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vcpus.xml b/tests/sexpr2xmldata/sexpr2xml-pv-vcpus.xml
-new file mode 100644
-index 0000000..0d6bf11
---- /dev/null
-+++ b/tests/sexpr2xmldata/sexpr2xml-pv-vcpus.xml
-@@ -0,0 +1,27 @@
-+<domain type='xen' id='6'>
-+  <name>pvtest</name>
-+  <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid>
-+  <memory>430080</memory>
-+  <currentMemory>430080</currentMemory>
-+  <vcpu current='2'>4</vcpu>
-+  <os>
-+    <type>linux</type>
-+    <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
-+    <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
-+    <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
-+  </os>
-+  <clock offset='utc'/>
-+  <on_poweroff>destroy</on_poweroff>
-+  <on_reboot>destroy</on_reboot>
-+  <on_crash>destroy</on_crash>
-+  <devices>
-+    <disk type='file' device='disk'>
-+      <driver name='file'/>
-+      <source file='/root/some.img'/>
-+      <target dev='xvda' bus='xen'/>
-+    </disk>
-+    <console type='pty'>
-+      <target type='xen' port='0'/>
-+    </console>
-+  </devices>
-+</domain>
-diff --git a/tests/sexpr2xmltest.c b/tests/sexpr2xmltest.c
-index d62b44f..f100dd8 100644
---- a/tests/sexpr2xmltest.c
-+++ b/tests/sexpr2xmltest.c
-@@ -132,6 +132,7 @@ mymain(int argc, char **argv)
-     DO_TEST("pv-vfb-type-crash", "pv-vfb-type-crash", 3);
-     DO_TEST("fv-autoport", "fv-autoport", 3);
-     DO_TEST("pv-bootloader", "pv-bootloader", 1);
-+    DO_TEST("pv-vcpus", "pv-vcpus", 1);
-
-     DO_TEST("disk-file", "disk-file", 2);
-     DO_TEST("disk-block", "disk-block", 2);
-diff --git a/tests/xmconfigdata/test-paravirt-vcpu.cfg b/tests/xmconfigdata/test-paravirt-vcpu.cfg
-new file mode 100644
-index 0000000..24c78f4
---- /dev/null
-+++ b/tests/xmconfigdata/test-paravirt-vcpu.cfg
-@@ -0,0 +1,17 @@
-+name = "XenGuest1"
-+uuid = "c7a5fdb0-cdaf-9455-926a-d65c16db1809"
-+maxmem = 579
-+memory = 394
-+vcpus = 4
-+vcpu_avail = 3
-+bootloader = "/usr/bin/pygrub"
-+on_poweroff = "destroy"
-+on_reboot = "restart"
-+on_crash = "restart"
-+sdl = 0
-+vnc = 1
-+vncunused = 1
-+vnclisten = "127.0.0.1"
-+vncpasswd = "123poi"
-+disk = [ "phy:/dev/HostVG/XenGuest1,xvda,w" ]
-+vif = [ "mac=00:16:3e:66:94:9c,bridge=br0,script=vif-bridge" ]
-diff --git a/tests/xmconfigdata/test-paravirt-vcpu.xml b/tests/xmconfigdata/test-paravirt-vcpu.xml
-new file mode 100644
-index 0000000..0be9456
---- /dev/null
-+++ b/tests/xmconfigdata/test-paravirt-vcpu.xml
-@@ -0,0 +1,32 @@
-+<domain type='xen'>
-+  <name>XenGuest1</name>
-+  <uuid>c7a5fdb0-cdaf-9455-926a-d65c16db1809</uuid>
-+  <memory>592896</memory>
-+  <currentMemory>403456</currentMemory>
-+  <vcpu current='2'>4</vcpu>
-+  <bootloader>/usr/bin/pygrub</bootloader>
-+  <os>
-+    <type arch='i686' machine='xenpv'>linux</type>
-+  </os>
-+  <clock offset='utc'/>
-+  <on_poweroff>destroy</on_poweroff>
-+  <on_reboot>restart</on_reboot>
-+  <on_crash>restart</on_crash>
-+  <devices>
-+    <disk type='block' device='disk'>
-+      <driver name='phy'/>
-+      <source dev='/dev/HostVG/XenGuest1'/>
-+      <target dev='xvda' bus='xen'/>
-+    </disk>
-+    <interface type='bridge'>
-+      <mac address='00:16:3e:66:94:9c'/>
-+      <source bridge='br0'/>
-+      <script path='vif-bridge'/>
-+    </interface>
-+    <console type='pty'>
-+      <target type='xen' port='0'/>
-+    </console>
-+    <input type='mouse' bus='xen'/>
-+    <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'/>
-+  </devices>
-+</domain>
-diff --git a/tests/xmconfigtest.c b/tests/xmconfigtest.c
-index 221b322..ea00747 100644
---- a/tests/xmconfigtest.c
-+++ b/tests/xmconfigtest.c
-@@ -210,6 +210,7 @@ mymain(int argc, char **argv)
-     DO_TEST("paravirt-new-pvfb-vncdisplay", 3);
-     DO_TEST("paravirt-net-e1000", 3);
-     DO_TEST("paravirt-net-vifname", 3);
-+    DO_TEST("paravirt-vcpu", 2);
-     DO_TEST("fullvirt-old-cdrom", 1);
-     DO_TEST("fullvirt-new-cdrom", 2);
-     DO_TEST("fullvirt-utc", 2);
-diff --git a/tests/xml2sexprdata/xml2sexpr-pv-vcpus.sexpr b/tests/xml2sexprdata/xml2sexpr-pv-vcpus.sexpr
-new file mode 100644
-index 0000000..e886545
---- /dev/null
-+++ b/tests/xml2sexprdata/xml2sexpr-pv-vcpus.sexpr
-@@ -0,0 +1 @@
-+(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 4)(vcpu_avail 3)(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  ')))(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w'))))
-\ No newline at end of file
-diff --git a/tests/xml2sexprtest.c b/tests/xml2sexprtest.c
-index 77cf760..9cf8d39 100644
---- a/tests/xml2sexprtest.c
-+++ b/tests/xml2sexprtest.c
-@@ -118,6 +118,7 @@ mymain(int argc, char **argv)
-     DO_TEST("pv-vfb-new", "pv-vfb-new", "pvtest", 3);
-     DO_TEST("pv-vfb-new-auto", "pv-vfb-new-auto", "pvtest", 3);
-     DO_TEST("pv-bootloader", "pv-bootloader", "pvtest", 1);
-+    DO_TEST("pv-vcpus", "pv-vcpus", "pvtest", 1);
-
-     DO_TEST("disk-file", "disk-file", "pvtest", 2);
-     DO_TEST("disk-block", "disk-block", "pvtest", 2);
--- 
-1.7.2.3
-

docs/api_extension/0013-improve-getting-xen-vcpu-counts.patch

@@ -1,216 +0,0 @@
-From 290ea33111be7bdf1f1381b90de33eb0e67c1a15 Mon Sep 17 00:00:00 2001
-From: Eric Blake <eblake@redhat.com>
-Date: Wed, 6 Oct 2010 17:54:41 -0600
-Subject: [PATCH 13/15] vcpu: improve support for getting xen vcpu counts
-
-* src/xen/xen_driver.c (xenUnifiedDomainGetVcpusFlags): Support
-more flags.
-* src/xen/xend_internal.h (xenDaemonDomainGetVcpusFlags): New
-prototype.
-* src/xen/xm_internal.h (xenXMDomainGetVcpusFlags): Likewise.
-* src/xen/xend_internal.c (virDomainGetVcpusFlags): New function.
-* src/xen/xm_internal.c (xenXMDomainGetVcpusFlags): Likewise.
----
- src/xen/xen_driver.c    |   31 +++++++++++++++++++--------
- src/xen/xend_internal.c |   52 +++++++++++++++++++++++++++++++++++++++++++++++
- src/xen/xend_internal.h |    2 +
- src/xen/xm_internal.c   |   47 ++++++++++++++++++++++++++++++++++++++++++
- src/xen/xm_internal.h   |    1 +
- 5 files changed, 124 insertions(+), 9 deletions(-)
-
-diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c
-index d6c9c57..fe2ff86 100644
---- a/src/xen/xen_driver.c
-+++ b/src/xen/xen_driver.c
-@@ -1142,20 +1142,33 @@ static int
- xenUnifiedDomainGetVcpusFlags (virDomainPtr dom, unsigned int flags)
- {
-     GET_PRIVATE(dom->conn);
--    int i, ret;
-+    int ret;
-
--    if (flags != (VIR_DOMAIN_VCPU_LIVE | VIR_DOMAIN_VCPU_MAXIMUM)) {
--        xenUnifiedError(VIR_ERR_INVALID_ARG, _("unsupported flags: (0x%x)"),
--                        flags);
-+    virCheckFlags(VIR_DOMAIN_VCPU_LIVE |
-+                  VIR_DOMAIN_VCPU_CONFIG |
-+                  VIR_DOMAIN_VCPU_MAXIMUM, -1);
-+
-+    /* Exactly one of LIVE or CONFIG must be set.  */
-+    if (!(flags & VIR_DOMAIN_VCPU_LIVE) == !(flags & VIR_DOMAIN_VCPU_CONFIG)) {
-+        xenUnifiedError(VIR_ERR_INVALID_ARG,
-+                        _("invalid flag combination: (0x%x)"), flags);
-         return -1;
-     }
-
--    for (i = 0; i < XEN_UNIFIED_NR_DRIVERS; ++i)
--        if (priv->opened[i] && drivers[i]->domainGetMaxVcpus) {
--            ret = drivers[i]->domainGetMaxVcpus (dom);
--            if (ret != 0) return ret;
--        }
-+    if (priv->opened[XEN_UNIFIED_XEND_OFFSET]) {
-+        ret = xenDaemonDomainGetVcpusFlags(dom, flags);
-+        if (ret != -2)
-+            return ret;
-+    }
-+    if (priv->opened[XEN_UNIFIED_XM_OFFSET]) {
-+        ret = xenXMDomainGetVcpusFlags(dom, flags);
-+        if (ret != -2)
-+            return ret;
-+    }
-+    if (flags == (VIR_DOMAIN_VCPU_CONFIG | VIR_DOMAIN_VCPU_MAXIMUM))
-+        return xenHypervisorGetVcpuMax(dom);
-
-+    xenUnifiedError(VIR_ERR_NO_SUPPORT, __FUNCTION__);
-     return -1;
- }
-
-diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c
-index dfc6415..3642296 100644
---- a/src/xen/xend_internal.c
-+++ b/src/xen/xend_internal.c
-@@ -3620,6 +3620,58 @@ xenDaemonDomainPinVcpu(virDomainPtr domain, unsigned int vcpu,
- }
-
- /**
-+ * xenDaemonDomainGetVcpusFlags:
-+ * @domain: pointer to domain object
-+ * @flags: bitwise-ORd from virDomainVcpuFlags
-+ *
-+ * Extract information about virtual CPUs of domain according to flags.
-+ *
-+ * Returns the number of vcpus on success, -1 if an error message was
-+ * issued, and -2 if the unified driver should keep trying.
-+
-+ */
-+int
-+xenDaemonDomainGetVcpusFlags(virDomainPtr domain, unsigned int flags)
-+{
-+    struct sexpr *root;
-+    int ret;
-+    xenUnifiedPrivatePtr priv;
-+
-+    if (domain == NULL || domain->conn == NULL || domain->name == NULL) {
-+        virXendError(VIR_ERR_INVALID_ARG, __FUNCTION__);
-+        return -1;
-+    }
-+
-+    priv = (xenUnifiedPrivatePtr) domain->conn->privateData;
-+
-+    /* If xendConfigVersion is 2, then we can only report _LIVE (and
-+     * xm_internal reports _CONFIG).  If it is 3, then _LIVE and
-+     * _CONFIG are always in sync for a running system.  */
-+    if (domain->id < 0 && priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4)
-+        return -2;
-+    if (domain->id < 0 && (flags & VIR_DOMAIN_VCPU_LIVE)) {
-+        virXendError(VIR_ERR_OPERATION_INVALID, "%s",
-+                     _("domain not active"));
-+        return -1;
-+    }
-+
-+    root = sexpr_get(domain->conn, "/xend/domain/%s?detail=1", domain->name);
-+    if (root == NULL)
-+        return -1;
-+
-+    ret = sexpr_int(root, "domain/vcpus");
-+    if (!(flags & VIR_DOMAIN_VCPU_MAXIMUM)) {
-+        int vcpus = count_one_bits(sexpr_int(root, "domain/vcpu_avail"));
-+        if (vcpus)
-+            ret = MIN(vcpus, ret);
-+    }
-+    if (!ret)
-+        ret = -2;
-+    sexpr_free(root);
-+    return ret;
-+}
-+
-+/**
-  * virDomainGetVcpus:
-  * @domain: pointer to domain object, or NULL for Domain0
-  * @info: pointer to an array of virVcpuInfo structures (OUT)
-diff --git a/src/xen/xend_internal.h b/src/xen/xend_internal.h
-index c757716..923cebd 100644
---- a/src/xen/xend_internal.h
-+++ b/src/xen/xend_internal.h
-@@ -155,6 +155,8 @@ int	xenDaemonDomainPinVcpu		(virDomainPtr domain,
-                                          unsigned int vcpu,
-                                          unsigned char *cpumap,
-                                          int maplen);
-+int     xenDaemonDomainGetVcpusFlags    (virDomainPtr domain,
-+                                         unsigned int flags);
- int	xenDaemonDomainGetVcpus		(virDomainPtr domain,
-                                          virVcpuInfoPtr info,
-                                          int maxinfo,
-diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c
-index f7121ab..4ea4245 100644
---- a/src/xen/xm_internal.c
-+++ b/src/xen/xm_internal.c
-@@ -1671,6 +1671,53 @@ cleanup:
- }
-
- /**
-+ * xenXMDomainGetVcpusFlags:
-+ * @domain: pointer to domain object
-+ * @flags: bitwise-ORd from virDomainVcpuFlags
-+ *
-+ * Extract information about virtual CPUs of domain according to flags.
-+ *
-+ * Returns the number of vcpus on success, -1 if an error message was
-+ * issued, and -2 if the unified driver should keep trying.
-+ */
-+int
-+xenXMDomainGetVcpusFlags(virDomainPtr domain, unsigned int flags)
-+{
-+    xenUnifiedPrivatePtr priv;
-+    const char *filename;
-+    xenXMConfCachePtr entry;
-+    int ret = -2;
-+
-+    if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) {
-+        xenXMError(VIR_ERR_INVALID_ARG, __FUNCTION__);
-+        return -1;
-+    }
-+
-+    if (domain->id != -1)
-+        return -2;
-+    if (flags & VIR_DOMAIN_VCPU_LIVE) {
-+        xenXMError(VIR_ERR_OPERATION_FAILED, "%s", _("domain not active"));
-+        return -1;
-+    }
-+
-+    priv = domain->conn->privateData;
-+    xenUnifiedLock(priv);
-+
-+    if (!(filename = virHashLookup(priv->nameConfigMap, domain->name)))
-+        goto cleanup;
-+
-+    if (!(entry = virHashLookup(priv->configCache, filename)))
-+        goto cleanup;
-+
-+    ret = ((flags & VIR_DOMAIN_VCPU_MAXIMUM) ? entry->def->maxvcpus
-+           : entry->def->vcpus);
-+
-+cleanup:
-+    xenUnifiedUnlock(priv);
-+    return ret;
-+}
-+
-+/**
-  * xenXMDomainPinVcpu:
-  * @domain: pointer to domain object
-  * @vcpu: virtual CPU number (reserved)
-diff --git a/src/xen/xm_internal.h b/src/xen/xm_internal.h
-index 3ad3456..3295fbd 100644
---- a/src/xen/xm_internal.h
-+++ b/src/xen/xm_internal.h
-@@ -45,6 +45,7 @@ int xenXMDomainSetMemory(virDomainPtr domain, unsigned long memory);
- int xenXMDomainSetMaxMemory(virDomainPtr domain, unsigned long memory);
- unsigned long xenXMDomainGetMaxMemory(virDomainPtr domain);
- int xenXMDomainSetVcpus(virDomainPtr domain, unsigned int vcpus);
-+int xenXMDomainGetVcpusFlags(virDomainPtr domain, unsigned int flags);
- int xenXMDomainPinVcpu(virDomainPtr domain, unsigned int vcpu,
-                        unsigned char *cpumap, int maplen);
- virDomainPtr xenXMDomainLookupByName(virConnectPtr conn, const char *domname);
--- 
-1.7.2.3
-

docs/api_extension/0014-improve-setting-xen-vcpu-counts.patch

@@ -1,342 +0,0 @@
-From e443a003129a172a7332f3cb6e40b3c39363ed5e Mon Sep 17 00:00:00 2001
-From: Eric Blake <eblake@redhat.com>
-Date: Thu, 14 Oct 2010 16:17:18 -0600
-Subject: [PATCH 14/15] vcpu: improve support for setting xen vcpu counts
-
-Tested with RHEL 5.6 (xendConfigVersion 2, where xend_internal
-controls live domains and xm_internal controls inactive domains).
-Hopefully this works with xendConfigVersion 3 (where xend_internal
-controls everything).
-
-* src/xen/xen_driver.c (xenUnifiedDomainSetVcpusFlags): Support
-more flags.
-(xenUnifiedGetMaxVcpus): Export.
-* src/xen/xm_internal.h (xenXMDomainSetVcpusFlags): New prototype.
-* src/xen/xend_internal.h (xenDaemonDomainSetVcpusFlags): Likewise.
-* src/xen/xen_driver.h (xenUnifiedGetMaxVcpus): Likewise.
-* src/xen/xm_internal.c (xenXMDomainSetVcpusFlags): New function.
-* src/xen/xend_internal.c (xenDaemonDomainSetVcpusFlags): Likewise.
----
- src/xen/xen_driver.c    |   60 ++++++++++++++++++++++++---------
- src/xen/xen_driver.h    |    1 +
- src/xen/xend_internal.c |   76 +++++++++++++++++++++++++++++++++++++++++++
- src/xen/xend_internal.h |    3 ++
- src/xen/xm_internal.c   |   83 +++++++++++++++++++++++++++++++++++++++++++++++
- src/xen/xm_internal.h   |    2 +
- 6 files changed, 208 insertions(+), 17 deletions(-)
-
-diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c
-index fe2ff86..66e8518 100644
---- a/src/xen/xen_driver.c
-+++ b/src/xen/xen_driver.c
-@@ -508,7 +508,7 @@ xenUnifiedIsSecure(virConnectPtr conn)
-     return ret;
- }
-
--static int
-+int
- xenUnifiedGetMaxVcpus (virConnectPtr conn, const char *type)
- {
-     GET_PRIVATE(conn);
-@@ -1073,36 +1073,62 @@ xenUnifiedDomainSetVcpusFlags (virDomainPtr dom, unsigned int nvcpus,
-                                unsigned int flags)
- {
-     GET_PRIVATE(dom->conn);
--    int i;
-+    int ret;
-+
-+    virCheckFlags(VIR_DOMAIN_VCPU_LIVE |
-+                  VIR_DOMAIN_VCPU_CONFIG |
-+                  VIR_DOMAIN_VCPU_MAXIMUM, -1);
-
--    if (flags != VIR_DOMAIN_VCPU_LIVE) {
--        xenUnifiedError(VIR_ERR_INVALID_ARG, _("unsupported flags: (0x%x)"),
--                        flags);
-+    /* At least one of LIVE or CONFIG must be set.  MAXIMUM cannot be
-+     * mixed with LIVE.  */
-+    if ((flags & (VIR_DOMAIN_VCPU_LIVE | VIR_DOMAIN_VCPU_CONFIG)) == 0 ||
-+        (flags & (VIR_DOMAIN_VCPU_MAXIMUM | VIR_DOMAIN_VCPU_LIVE)) ==
-+         (VIR_DOMAIN_VCPU_MAXIMUM | VIR_DOMAIN_VCPU_LIVE)) {
-+        xenUnifiedError(VIR_ERR_INVALID_ARG,
-+                        _("invalid flag combination: (0x%x)"), flags);
-+        return -1;
-+    }
-+    if (!nvcpus || (unsigned short) nvcpus != nvcpus) {
-+        xenUnifiedError(VIR_ERR_INVALID_ARG,
-+                        _("argument out of range: %d"), nvcpus);
-         return -1;
-     }
-
-     /* Try non-hypervisor methods first, then hypervisor direct method
-      * as a last resort.
-      */
--    for (i = 0; i < XEN_UNIFIED_NR_DRIVERS; ++i)
--        if (i != XEN_UNIFIED_HYPERVISOR_OFFSET &&
--            priv->opened[i] &&
--            drivers[i]->domainSetVcpus &&
--            drivers[i]->domainSetVcpus (dom, nvcpus) == 0)
--            return 0;
--
--    if (priv->opened[XEN_UNIFIED_HYPERVISOR_OFFSET] &&
--        drivers[XEN_UNIFIED_HYPERVISOR_OFFSET]->domainSetVcpus &&
--        drivers[XEN_UNIFIED_HYPERVISOR_OFFSET]->domainSetVcpus (dom, nvcpus) == 0)
--        return 0;
-+    if (priv->opened[XEN_UNIFIED_XEND_OFFSET]) {
-+        ret = xenDaemonDomainSetVcpusFlags(dom, nvcpus, flags);
-+        if (ret != -2)
-+            return ret;
-+    }
-+    if (priv->opened[XEN_UNIFIED_XM_OFFSET]) {
-+        ret = xenXMDomainSetVcpusFlags(dom, nvcpus, flags);
-+        if (ret != -2)
-+            return ret;
-+    }
-+    if (flags == VIR_DOMAIN_VCPU_LIVE)
-+        return xenHypervisorSetVcpus(dom, nvcpus);
-
-+    xenUnifiedError(VIR_ERR_NO_SUPPORT, __FUNCTION__);
-     return -1;
- }
-
- static int
- xenUnifiedDomainSetVcpus (virDomainPtr dom, unsigned int nvcpus)
- {
--    return xenUnifiedDomainSetVcpusFlags(dom, nvcpus, VIR_DOMAIN_VCPU_LIVE);
-+    unsigned int flags = VIR_DOMAIN_VCPU_LIVE;
-+    xenUnifiedPrivatePtr priv;
-+
-+    /* Per the documented API, it is hypervisor-dependent whether this
-+     * affects just _LIVE or _LIVE|_CONFIG; in xen's case, that
-+     * depends on xendConfigVersion.  */
-+    if (dom) {
-+        priv = dom->conn->privateData;
-+        if (priv->xendConfigVersion >= XEND_CONFIG_VERSION_3_0_4)
-+            flags |= VIR_DOMAIN_VCPU_CONFIG;
-+    }
-+    return xenUnifiedDomainSetVcpusFlags(dom, nvcpus, flags);
- }
-
- static int
-diff --git a/src/xen/xen_driver.h b/src/xen/xen_driver.h
-index 3e7c1d0..115a26a 100644
---- a/src/xen/xen_driver.h
-+++ b/src/xen/xen_driver.h
-@@ -220,6 +220,7 @@ int  xenUnifiedRemoveDomainInfo(xenUnifiedDomainInfoListPtr info,
- void xenUnifiedDomainEventDispatch (xenUnifiedPrivatePtr priv,
-                                     virDomainEventPtr event);
- unsigned long xenUnifiedVersion(void);
-+int xenUnifiedGetMaxVcpus(virConnectPtr conn, const char *type);
-
- # ifndef PROXY
- void xenUnifiedLock(xenUnifiedPrivatePtr priv);
-diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c
-index 3642296..55c2cc4 100644
---- a/src/xen/xend_internal.c
-+++ b/src/xen/xend_internal.c
-@@ -3535,6 +3535,82 @@ xenDaemonLookupByID(virConnectPtr conn, int id) {
- }
-
- /**
-+ * xenDaemonDomainSetVcpusFlags:
-+ * @domain: pointer to domain object
-+ * @nvcpus: the new number of virtual CPUs for this domain
-+ * @flags: bitwise-ORd from virDomainVcpuFlags
-+ *
-+ * Change virtual CPUs allocation of domain according to flags.
-+ *
-+ * Returns 0 on success, -1 if an error message was issued, and -2 if
-+ * the unified driver should keep trying.
-+ */
-+int
-+xenDaemonDomainSetVcpusFlags(virDomainPtr domain, unsigned int vcpus,
-+                             unsigned int flags)
-+{
-+    char buf[VIR_UUID_BUFLEN];
-+    xenUnifiedPrivatePtr priv;
-+    int max;
-+
-+    if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)
-+        || (vcpus < 1)) {
-+        virXendError(VIR_ERR_INVALID_ARG, __FUNCTION__);
-+        return (-1);
-+    }
-+
-+    priv = (xenUnifiedPrivatePtr) domain->conn->privateData;
-+
-+    if ((domain->id < 0 && priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) ||
-+        (flags & VIR_DOMAIN_VCPU_MAXIMUM))
-+        return -2;
-+
-+    /* With xendConfigVersion 2, only _LIVE is supported.  With
-+     * xendConfigVersion 3, only _LIVE|_CONFIG is supported for
-+     * running domains, or _CONFIG for inactive domains.  */
-+    if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) {
-+        if (flags & VIR_DOMAIN_VCPU_CONFIG) {
-+            virXendError(VIR_ERR_OPERATION_INVALID, "%s",
-+                         _("Xend version does not support modifying "
-+                           "persistent config"));
-+            return -1;
-+        }
-+    } else if (domain->id < 0) {
-+        if (flags & VIR_DOMAIN_VCPU_LIVE) {
-+            virXendError(VIR_ERR_OPERATION_INVALID, "%s",
-+                         _("domain not running"));
-+            return -1;
-+        }
-+    } else {
-+        if ((flags & (VIR_DOMAIN_VCPU_LIVE | VIR_DOMAIN_VCPU_CONFIG)) !=
-+            (VIR_DOMAIN_VCPU_LIVE | VIR_DOMAIN_VCPU_CONFIG)) {
-+            virXendError(VIR_ERR_OPERATION_INVALID, "%s",
-+                         _("Xend only supports modifying both live and "
-+                           "persistent config"));
-+        }
-+    }
-+
-+    /* Unfortunately, xend_op does not validate whether this exceeds
-+     * the maximum.  */
-+    flags |= VIR_DOMAIN_VCPU_MAXIMUM;
-+    if ((max = xenDaemonDomainGetVcpusFlags(domain, flags)) < 0) {
-+        virXendError(VIR_ERR_OPERATION_INVALID, "%s",
-+                     _("could not determin max vcpus for the domain"));
-+        return -1;
-+    }
-+    if (vcpus > max) {
-+        virXendError(VIR_ERR_INVALID_ARG,
-+                     _("requested vcpus is greater than max allowable"
-+                       " vcpus for the domain: %d > %d"), vcpus, max);
-+        return -1;
-+    }
-+
-+    snprintf(buf, sizeof(buf), "%d", vcpus);
-+    return xend_op(domain->conn, domain->name, "op", "set_vcpus", "vcpus",
-+                   buf, NULL);
-+}
-+
-+/**
-  * xenDaemonDomainSetVcpus:
-  * @domain: pointer to domain object
-  * @nvcpus: the new number of virtual CPUs for this domain
-diff --git a/src/xen/xend_internal.h b/src/xen/xend_internal.h
-index 923cebd..53f5d2c 100644
---- a/src/xen/xend_internal.h
-+++ b/src/xen/xend_internal.h
-@@ -151,6 +151,9 @@ int xenDaemonDomainUndefine(virDomainPtr domain);
-
- int	xenDaemonDomainSetVcpus		(virDomainPtr domain,
-                                          unsigned int vcpus);
-+int	xenDaemonDomainSetVcpusFlags	(virDomainPtr domain,
-+                                         unsigned int vcpus,
-+                                         unsigned int flags);
- int	xenDaemonDomainPinVcpu		(virDomainPtr domain,
-                                          unsigned int vcpu,
-                                          unsigned char *cpumap,
-diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c
-index 4ea4245..2b8e51e 100644
---- a/src/xen/xm_internal.c
-+++ b/src/xen/xm_internal.c
-@@ -1670,6 +1670,89 @@ cleanup:
-     return ret;
- }
-
-+/*
-+ * xenXMDomainSetVcpusFlags:
-+ * @domain: pointer to domain object
-+ * @nvcpus: number of vcpus
-+ * @flags: bitwise-ORd from virDomainVcpuFlags
-+ *
-+ * Change virtual CPUs allocation of domain according to flags.
-+ *
-+ * Returns 0 on success, -1 if an error message was issued, and -2 if
-+ * the unified driver should keep trying.
-+ */
-+int
-+xenXMDomainSetVcpusFlags(virDomainPtr domain, unsigned int vcpus,
-+                         unsigned int flags)
-+{
-+    xenUnifiedPrivatePtr priv;
-+    const char *filename;
-+    xenXMConfCachePtr entry;
-+    int ret = -1;
-+    int max;
-+
-+    if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) {
-+        xenXMError(VIR_ERR_INVALID_ARG, __FUNCTION__);
-+        return -1;
-+    }
-+    if (domain->conn->flags & VIR_CONNECT_RO) {
-+        xenXMError(VIR_ERR_OPERATION_DENIED, __FUNCTION__);
-+        return -1;
-+    }
-+    if (domain->id != -1)
-+        return -2;
-+    if (flags & VIR_DOMAIN_VCPU_LIVE) {
-+        xenXMError(VIR_ERR_OPERATION_INVALID, "%s",
-+                   _("domain is not running"));
-+        return -1;
-+    }
-+
-+    priv = domain->conn->privateData;
-+    xenUnifiedLock(priv);
-+
-+    if (!(filename = virHashLookup(priv->nameConfigMap, domain->name)))
-+        goto cleanup;
-+
-+    if (!(entry = virHashLookup(priv->configCache, filename)))
-+        goto cleanup;
-+
-+    /* Hypervisor maximum. */
-+    if ((max = xenUnifiedGetMaxVcpus(domain->conn, NULL)) < 0) {
-+        xenXMError(VIR_ERR_INTERNAL_ERROR, "%s",
-+                   _("could not determin max vcpus for the domain"));
-+        goto cleanup;
-+    }
-+    /* Can't specify a current larger than stored maximum; but
-+     * reducing maximum can silently reduce current.  */
-+    if (!(flags & VIR_DOMAIN_VCPU_MAXIMUM))
-+        max = entry->def->maxvcpus;
-+    if (vcpus > max) {
-+        xenXMError(VIR_ERR_INVALID_ARG,
-+                   _("requested vcpus is greater than max allowable"
-+                     " vcpus for the domain: %d > %d"), vcpus, max);
-+        goto cleanup;
-+    }
-+
-+    if (flags & VIR_DOMAIN_VCPU_MAXIMUM) {
-+        entry->def->maxvcpus = vcpus;
-+        if (entry->def->vcpus > vcpus)
-+            entry->def->vcpus = vcpus;
-+    } else {
-+        entry->def->vcpus = vcpus;
-+    }
-+
-+    /* If this fails, should we try to undo our changes to the
-+     * in-memory representation of the config file. I say not!
-+     */
-+    if (xenXMConfigSaveFile(domain->conn, entry->filename, entry->def) < 0)
-+        goto cleanup;
-+    ret = 0;
-+
-+cleanup:
-+    xenUnifiedUnlock(priv);
-+    return ret;
-+}
-+
- /**
-  * xenXMDomainGetVcpusFlags:
-  * @domain: pointer to domain object
-diff --git a/src/xen/xm_internal.h b/src/xen/xm_internal.h
-index 3295fbd..a46e1a2 100644
---- a/src/xen/xm_internal.h
-+++ b/src/xen/xm_internal.h
-@@ -45,6 +45,8 @@ int xenXMDomainSetMemory(virDomainPtr domain, unsigned long memory);
- int xenXMDomainSetMaxMemory(virDomainPtr domain, unsigned long memory);
- unsigned long xenXMDomainGetMaxMemory(virDomainPtr domain);
- int xenXMDomainSetVcpus(virDomainPtr domain, unsigned int vcpus);
-+int xenXMDomainSetVcpusFlags(virDomainPtr domain, unsigned int vcpus,
-+                             unsigned int flags);
- int xenXMDomainGetVcpusFlags(virDomainPtr domain, unsigned int flags);
- int xenXMDomainPinVcpu(virDomainPtr domain, unsigned int vcpu,
-                        unsigned char *cpumap, int maplen);
--- 
-1.7.2.3
-

docs/api_extension/0015-remove-dead-xen-code.patch

@@ -1,228 +0,0 @@
-From b013788742183afec9aa5068d3cfd185a3b5c62e Mon Sep 17 00:00:00 2001
-From: Eric Blake <eblake@redhat.com>
-Date: Thu, 7 Oct 2010 08:59:27 -0600
-Subject: [PATCH 15/15] vcpu: remove dead xen code
-
-* src/xen/xen_driver.h (xenUnifiedDriver): Remove now-unused
-domainGetMaxVcpus, domainSetVcpus.
-* src/xen/proxy_internal.c (xenProxyDriver): Likewise.
-* src/xen/xen_hypervisor.c (xenHypervisorDriver): Likewise.
-* src/xen/xen_inotify.c (xenInotifyDriver): Likewise.
-* src/xen/xend_internal.c (xenDaemonDriver)
-(xenDaemonDomainSetVcpus): Likewise.
-* src/xen/xm_internal.c (xenXMDriver, xenXMDomainSetVcpus):
-Likewise.
-* src/xen/xs_internal.c (xenStoreDriver): Likewise.
----
- src/xen/proxy_internal.c |    2 --
- src/xen/xen_driver.h     |    4 +---
- src/xen/xen_hypervisor.c |    2 --
- src/xen/xen_inotify.c    |    2 --
- src/xen/xend_internal.c  |   33 ---------------------------------
- src/xen/xm_internal.c    |   43 -------------------------------------------
- src/xen/xs_internal.c    |    2 --
- 7 files changed, 1 insertions(+), 87 deletions(-)
-
-diff --git a/src/xen/proxy_internal.c b/src/xen/proxy_internal.c
-index 335dfc4..4033727 100644
---- a/src/xen/proxy_internal.c
-+++ b/src/xen/proxy_internal.c
-@@ -67,10 +67,8 @@ struct xenUnifiedDriver xenProxyDriver = {
-     NULL, /* domainSave */
-     NULL, /* domainRestore */
-     NULL, /* domainCoreDump */
--    NULL, /* domainSetVcpus */
-     NULL, /* domainPinVcpu */
-     NULL, /* domainGetVcpus */
--    NULL, /* domainGetMaxVcpus */
-     NULL, /* listDefinedDomains */
-     NULL, /* numOfDefinedDomains */
-     NULL, /* domainCreate */
-diff --git a/src/xen/xen_driver.h b/src/xen/xen_driver.h
-index 115a26a..53f97d4 100644
---- a/src/xen/xen_driver.h
-+++ b/src/xen/xen_driver.h
-@@ -1,7 +1,7 @@
- /*
-  * xen_unified.c: Unified Xen driver.
-  *
-- * Copyright (C) 2007 Red Hat, Inc.
-+ * Copyright (C) 2007, 2010 Red Hat, Inc.
-  *
-  * See COPYING.LIB for the License of this software
-  *
-@@ -84,10 +84,8 @@ struct xenUnifiedDriver {
-         virDrvDomainSave		domainSave;
-         virDrvDomainRestore		domainRestore;
-         virDrvDomainCoreDump		domainCoreDump;
--        virDrvDomainSetVcpus		domainSetVcpus;
-         virDrvDomainPinVcpu		domainPinVcpu;
-         virDrvDomainGetVcpus		domainGetVcpus;
--        virDrvDomainGetMaxVcpus		domainGetMaxVcpus;
-         virDrvListDefinedDomains	listDefinedDomains;
-         virDrvNumOfDefinedDomains	numOfDefinedDomains;
-         virDrvDomainCreate		domainCreate;
-diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
-index 6246513..3797865 100644
---- a/src/xen/xen_hypervisor.c
-+++ b/src/xen/xen_hypervisor.c
-@@ -784,10 +784,8 @@ struct xenUnifiedDriver xenHypervisorDriver = {
-     NULL, /* domainSave */
-     NULL, /* domainRestore */
-     NULL, /* domainCoreDump */
--    xenHypervisorSetVcpus, /* domainSetVcpus */
-     xenHypervisorPinVcpu, /* domainPinVcpu */
-     xenHypervisorGetVcpus, /* domainGetVcpus */
--    xenHypervisorGetVcpuMax, /* domainGetMaxVcpus */
-     NULL, /* listDefinedDomains */
-     NULL, /* numOfDefinedDomains */
-     NULL, /* domainCreate */
-diff --git a/src/xen/xen_inotify.c b/src/xen/xen_inotify.c
-index d24b20f..9507061 100644
---- a/src/xen/xen_inotify.c
-+++ b/src/xen/xen_inotify.c
-@@ -71,10 +71,8 @@ struct xenUnifiedDriver xenInotifyDriver = {
-     NULL, /* domainSave */
-     NULL, /* domainRestore */
-     NULL, /* domainCoreDump */
--    NULL, /* domainSetVcpus */
-     NULL, /* domainPinVcpu */
-     NULL, /* domainGetVcpus */
--    NULL, /* domainGetMaxVcpus */
-     NULL, /* listDefinedDomains */
-     NULL, /* numOfDefinedDomains */
-     NULL, /* domainCreate */
-diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c
-index 55c2cc4..b90c331 100644
---- a/src/xen/xend_internal.c
-+++ b/src/xen/xend_internal.c
-@@ -3611,37 +3611,6 @@ xenDaemonDomainSetVcpusFlags(virDomainPtr domain, unsigned int vcpus,
- }
-
- /**
-- * xenDaemonDomainSetVcpus:
-- * @domain: pointer to domain object
-- * @nvcpus: the new number of virtual CPUs for this domain
-- *
-- * Dynamically change the number of virtual CPUs used by the domain.
-- *
-- * Returns 0 for success; -1 (with errno) on error
-- */
--int
--xenDaemonDomainSetVcpus(virDomainPtr domain, unsigned int vcpus)
--{
--    char buf[VIR_UUID_BUFLEN];
--    xenUnifiedPrivatePtr priv;
--
--    if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)
--     || (vcpus < 1)) {
--        virXendError(VIR_ERR_INVALID_ARG, __FUNCTION__);
--        return (-1);
--    }
--
--    priv = (xenUnifiedPrivatePtr) domain->conn->privateData;
--
--    if (domain->id < 0 && priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4)
--        return(-1);
--
--    snprintf(buf, sizeof(buf), "%d", vcpus);
--    return(xend_op(domain->conn, domain->name, "op", "set_vcpus", "vcpus",
--                   buf, NULL));
--}
--
--/**
-  * xenDaemonDomainPinCpu:
-  * @domain: pointer to domain object
-  * @vcpu: virtual CPU number
-@@ -5213,10 +5182,8 @@ struct xenUnifiedDriver xenDaemonDriver = {
-     xenDaemonDomainSave,         /* domainSave */
-     xenDaemonDomainRestore,      /* domainRestore */
-     xenDaemonDomainCoreDump,     /* domainCoreDump */
--    xenDaemonDomainSetVcpus,     /* domainSetVcpus */
-     xenDaemonDomainPinVcpu,      /* domainPinVcpu */
-     xenDaemonDomainGetVcpus,     /* domainGetVcpus */
--    NULL,                        /* domainGetMaxVcpus */
-     xenDaemonListDefinedDomains, /* listDefinedDomains */
-     xenDaemonNumOfDefinedDomains,/* numOfDefinedDomains */
-     xenDaemonDomainCreate,       /* domainCreate */
-diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c
-index 2b8e51e..430d40b 100644
---- a/src/xen/xm_internal.c
-+++ b/src/xen/xm_internal.c
-@@ -103,10 +103,8 @@ struct xenUnifiedDriver xenXMDriver = {
-     NULL, /* domainSave */
-     NULL, /* domainRestore */
-     NULL, /* domainCoreDump */
--    xenXMDomainSetVcpus, /* domainSetVcpus */
-     xenXMDomainPinVcpu, /* domainPinVcpu */
-     NULL, /* domainGetVcpus */
--    NULL, /* domainGetMaxVcpus */
-     xenXMListDefinedDomains, /* listDefinedDomains */
-     xenXMNumOfDefinedDomains, /* numOfDefinedDomains */
-     xenXMDomainCreate, /* domainCreate */
-@@ -1630,47 +1628,6 @@ cleanup:
- }
-
- /*
-- * Set the VCPU count in config
-- */
--int xenXMDomainSetVcpus(virDomainPtr domain, unsigned int vcpus) {
--    xenUnifiedPrivatePtr priv;
--    const char *filename;
--    xenXMConfCachePtr entry;
--    int ret = -1;
--
--    if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) {
--        xenXMError(VIR_ERR_INVALID_ARG, __FUNCTION__);
--        return (-1);
--    }
--    if (domain->conn->flags & VIR_CONNECT_RO)
--        return (-1);
--    if (domain->id != -1)
--        return (-1);
--
--    priv = domain->conn->privateData;
--    xenUnifiedLock(priv);
--
--    if (!(filename = virHashLookup(priv->nameConfigMap, domain->name)))
--        goto cleanup;
--
--    if (!(entry = virHashLookup(priv->configCache, filename)))
--        goto cleanup;
--
--    entry->def->maxvcpus = entry->def->vcpus = vcpus;
--
--    /* If this fails, should we try to undo our changes to the
--     * in-memory representation of the config file. I say not!
--     */
--    if (xenXMConfigSaveFile(domain->conn, entry->filename, entry->def) < 0)
--        goto cleanup;
--    ret = 0;
--
--cleanup:
--    xenUnifiedUnlock(priv);
--    return ret;
--}
--
--/*
-  * xenXMDomainSetVcpusFlags:
-  * @domain: pointer to domain object
-  * @nvcpus: number of vcpus
-diff --git a/src/xen/xs_internal.c b/src/xen/xs_internal.c
-index 9296f25..a9817b1 100644
---- a/src/xen/xs_internal.c
-+++ b/src/xen/xs_internal.c
-@@ -67,10 +67,8 @@ struct xenUnifiedDriver xenStoreDriver = {
-     NULL, /* domainSave */
-     NULL, /* domainRestore */
-     NULL, /* domainCoreDump */
--    NULL, /* domainSetVcpus */
-     NULL, /* domainPinVcpu */
-     NULL, /* domainGetVcpus */
--    NULL, /* domainGetMaxVcpus */
-     NULL, /* listDefinedDomains */
-     NULL, /* numOfDefinedDomains */
-     NULL, /* domainCreate */
--- 
-1.7.2.3
-

docs/cgroups.html.in

@@ -23,12 +23,13 @@
 
     <p>
       The QEMU driver is capable of using the <code>cpuset</code>,
-      <code>cpu</code>, <code>memory</code>, <code>blkio</code> and
-      <code>devices</code> controllers. None of them are compulsory.
-      If any controller is not mounted, the resource management APIs
-      which use it will cease to operate. It is possible to explicitly
-      turn off use of a controller, even when mounted, via the
-      <code>/etc/libvirt/qemu.conf</code> configuration file.
+      <code>cpu</code>, <code>cpuacct</code>, <code>memory</code>,
+      <code>blkio</code> and <code>devices</code> controllers.
+      None of them are compulsory. If any controller is not mounted,
+      the resource management APIs which use it will cease to operate.
+      It is possible to explicitly turn off use of a controller,
+      even when mounted, via the <code>/etc/libvirt/qemu.conf</code>
+      configuration file.
     </p>
 
     <p>
@@ -75,11 +76,13 @@
     <p>
       The systemd convention is for the scope name of virtual machines / containers
       to be of the general format <code>machine-$NAME.scope</code>. Libvirt forms the
-      <code>$NAME</code> part of this by concatenating the driver type with the name
-      of the guest, and then escaping any systemd reserved characters.
+      <code>$NAME</code> part of this by concatenating the driver type with the id
+      and truncated name of the guest, and then escaping any systemd reserved
+      characters.
       So for a guest <code>demo</code> running under the <code>lxc</code> driver,
-      we get a <code>$NAME</code> of <code>lxc-demo</code> which when escaped is
-      <code>lxc\x2ddemo</code>. So the complete scope name is <code>machine-lxc\x2ddemo.scope</code>.
+      we get a <code>$NAME</code> of <code>lxc-12345-demo</code> which when escaped
+      is <code>lxc\x2d12345\x2ddemo</code>. So the complete scope name is
+      <code>machine-lxc\x2d12345\x2ddemo.scope</code>.
       The scope names map directly to the cgroup directory names.
     </p>
 
@@ -112,19 +115,19 @@ $ROOT
   |
   +- machine.slice
       |
-      +- machine-qemu\x2dvm1.scope
+      +- machine-qemu\x2d1\x2dvm1.scope
       |   |
       |   +- emulator
       |   +- vcpu0
       |   +- vcpu1
       |
-      +- machine-qemu\x2dvm2.scope
+      +- machine-qemu\x2d2\x2dvm2.scope
       |   |
       |   +- emulator
       |   +- vcpu0
       |   +- vcpu1
       |
-      +- machine-qemu\x2dvm3.scope
+      +- machine-qemu\x2d3\x2dvm3.scope
       |   |
       |   +- emulator
       |   +- vcpu0
@@ -134,15 +137,15 @@ $ROOT
       |   |
       |   +- machine-engineering-testing.slice
       |   |   |
-      |   |   +- machine-lxc\x2dcontainer1.scope
+      |   |   +- machine-lxc\x2d11111\x2dcontainer1.scope
       |   |
       |   +- machine-engineering-production.slice
       |       |
-      |       +- machine-lxc\x2dcontainer2.scope
+      |       +- machine-lxc\x2d22222\x2dcontainer2.scope
       |
       +- machine-marketing.slice
           |
-          +- machine-lxc\x2dcontainer3.scope
+          +- machine-lxc\x2d33333\x2dcontainer3.scope
     </pre>
 
     <h3><a id="currentLayoutGeneric">Non-systemd cgroups layout</a></h3>
@@ -173,19 +176,19 @@ $ROOT
   |
   +- machine
       |
-      +- vm1.libvirt-qemu
+      +- qemu-1-vm1.libvirt-qemu
       |   |
       |   +- emulator
       |   +- vcpu0
       |   +- vcpu1
       |
-      +- vm2.libvirt-qemu
+      +- qeme-2-vm2.libvirt-qemu
       |   |
       |   +- emulator
       |   +- vcpu0
       |   +- vcpu1
       |
-      +- vm3.libvirt-qemu
+      +- qemu-3-vm3.libvirt-qemu
       |   |
       |   +- emulator
       |   +- vcpu0
@@ -195,15 +198,15 @@ $ROOT
       |   |
       |   +- testing.partition
       |   |   |
-      |   |   +- container1.libvirt-lxc
+      |   |   +- lxc-11111-container1.libvirt-lxc
       |   |
       |   +- production.partition
       |       |
-      |       +- container2.libvirt-lxc
+      |       +- lxc-22222-container2.libvirt-lxc
       |
       +- marketing.partition
           |
-          +- container3.libvirt-lxc
+          +- lxc-33333-container3.libvirt-lxc
     </pre>
 
     <h2><a id="customPartiton">Using custom partitions</a></h2>

docs/compiling.html.in

@@ -125,7 +125,7 @@ $ make
     <pre>
 $ su -
 # service libvirtd stop  (or systemctl stop libvirtd.service)
-# /home/to/your/checkout/daemon/libvirtd
+# /home/to/your/checkout/src/libvirtd
     </pre>
 
     <p>

docs/drvqemu.html.in

@@ -8,7 +8,7 @@
 
     <p>
       The libvirt KVM/QEMU driver can manage any QEMU emulator from
-      version 0.12.0 or later.
+      version 1.5.0 or later.
     </p>
 
     <h2><a id="project">Project Links</a></h2>

docs/drvxen.html.in

@@ -8,7 +8,7 @@
 
     <p>
       The libvirt libxl driver provides the ability to manage virtual
-      machines on any Xen release from 4.4.0 onwards.
+      machines on any Xen release from 4.6.0 onwards.
     </p>
 
     <h2><a id="project">Project Links</a></h2>

docs/formatcaps.html.in

@@ -74,11 +74,14 @@
         is able to run. Possible values are:
         <dl>
           <dt><code>xen</code></dt>
-          <dd>for XEN</dd>
+          <dd>for XEN PV</dd>
 
           <dt><code>linux</code></dt>
           <dd>legacy alias for <code>xen</code></dd>
 
+          <dt><code>xenpvh</code></dt>
+          <dd>for XEN PVH</dd>
+
           <dt><code>hvm</code></dt>
           <dd>Unmodified operating system</dd>
 
@@ -91,7 +94,27 @@
         </dd>
 
         <dt><code>arch</code></dt>
-        <dd>This element brings some information on supported guest architecture.</dd>
+        <dd>This element brings some information on supported guest
+          architecture. Possible subelements are:
+          <dl>
+            <dt><code>wordsize</code></dt><dd>Size of CPU word in bits, for example 64.</dd>
+            <dt><code>emulator</code></dt><dd>Emulator (device model) path, for
+              use in <a href="formatdomain.html#elementEmulator">emulator</a>
+              element of domain XML.</dd>
+            <dt><code>loader</code></dt><dd>Loader path, for use in
+              <a href="formatdomain.html#elementLoader">loader</a> element of domain
+              XML.</dd>
+            <dt><code>machine</code></dt><dd>Machine type, for use in
+              <a href="formatdomain.html#attributeOSTypeMachine">machine</a>
+              attribute of os/type element in domain XML. For example Xen
+              supports <code>xenfv</code> for HVM, <code>xenpv</code> for
+              PV, or <code>xenpvh</code> for PVH.</dd>
+            <dt><code>domain</code></dt><dd>The <code>type</code> attribute of
+              this element specifies the type of hypervisor required to run the
+              domain. Use in <a href="formatdomain.html#attributeDomainType">type</a>
+              attribute of the domain root element.</dd>
+          </dl>
+        </dd>
 
         <dt><code>features</code></dt>
         <dd>This optional element encases possible features that can be used

docs/formatdomain.html.in

@@ -19,7 +19,8 @@
     <p>
       The root element required for all virtual machines is
       named <code>domain</code>. It has two attributes, the
-      <code>type</code> specifies the hypervisor used for running
+      <a id="attributeDomainType"><code>type</code></a>
+      specifies the hypervisor used for running
       the domain. The allowed values are driver specific, but
       include "xen", "kvm", "qemu", "lxc" and "kqemu". The
       second attribute is <code>id</code> which is a unique
@@ -148,11 +149,11 @@
         (badly named!) refers to an OS that supports the Xen 3 hypervisor
         guest ABI. There are also two optional attributes, <code>arch</code>
         specifying the CPU architecture to virtualization,
-        and <code>machine</code> referring to the machine
-        type. The <a href="formatcaps.html">Capabilities XML</a>
+        and <a id="attributeOSTypeMachine"><code>machine</code></a> referring
+        to the machine type. The <a href="formatcaps.html">Capabilities XML</a>
         provides details on allowed values for
         these. <span class="since">Since 0.0.1</span></dd>
-      <dt><code>loader</code></dt>
+      <dt><a id="elementLoader"><code>loader</code></a></dt>
       <dd>The optional <code>loader</code> tag refers to a firmware blob,
         which is specified by absolute path,
         used to assist the domain creation process. It is used by Xen
@@ -631,45 +632,45 @@
       </dd>
       <dt><code>vcpus</code></dt>
       <dd>
-        The vcpus element allows to control state of individual vcpus.
+        The vcpus element allows to control state of individual vCPUs.
 
         The <code>id</code> attribute specifies the vCPU id as used by libvirt
-        in other places such as vcpu pinning, scheduler information and NUMA
-        assignment. Note that the vcpu ID as seen in the guest may differ from
-        libvirt ID in certain cases. Valid IDs are from 0 to the maximum vcpu
+        in other places such as vCPU pinning, scheduler information and NUMA
+        assignment. Note that the vCPU ID as seen in the guest may differ from
+        libvirt ID in certain cases. Valid IDs are from 0 to the maximum vCPU
         count as set by the <code>vcpu</code> element minus 1.
 
         The <code>enabled</code> attribute allows to control the state of the
-        vcpu. Valid values are <code>yes</code> and <code>no</code>.
+        vCPU. Valid values are <code>yes</code> and <code>no</code>.
 
-        <code>hotpluggable</code> controls whether given vcpu can be hotplugged
-        and hotunplugged in cases when the cpu is enabled at boot. Note that
-        all disabled vcpus must be hotpluggable. Valid values are
+        <code>hotpluggable</code> controls whether given vCPU can be hotplugged
+        and hotunplugged in cases when the CPU is enabled at boot. Note that
+        all disabled vCPUs must be hotpluggable. Valid values are
         <code>yes</code> and <code>no</code>.
 
-        <code>order</code> allows to specify the order to add the online vcpus.
-        For hypervisors/platforms that require to insert multiple vcpus at once
-        the order may be duplicated across all vcpus that need to be
-        enabled at once. Specifying order is not necessary, vcpus are then
+        <code>order</code> allows to specify the order to add the online vCPUs.
+        For hypervisors/platforms that require to insert multiple vCPUs at once
+        the order may be duplicated across all vCPUs that need to be
+        enabled at once. Specifying order is not necessary, vCPUs are then
         added in an arbitrary order. If order info is used, it must be used for
-        all online vcpus. Hypervisors may clear or update ordering information
+        all online vCPUs. Hypervisors may clear or update ordering information
         during certain operations to assure valid configuration.
 
-        Note that hypervisors may create hotpluggable vcpus differently from
-        boot vcpus thus special initialization may be necessary.
+        Note that hypervisors may create hotpluggable vCPUs differently from
+        boot vCPUs thus special initialization may be necessary.
 
-        Hypervisors may require that vcpus enabled on boot which are not
+        Hypervisors may require that vCPUs enabled on boot which are not
         hotpluggable are clustered at the beginning starting with ID 0. It may
-        be also required that vcpu 0 is always present and non-hotpluggable.
+        be also required that vCPU 0 is always present and non-hotpluggable.
 
-        Note that providing state for individual cpus may be necessary to enable
+        Note that providing state for individual CPUs may be necessary to enable
         support of addressable vCPU hotplug and this feature may not be
         supported by all hypervisors.
 
-        For QEMU the following conditions are required. Vcpu 0 needs to be
-        enabled and non-hotpluggable. On PPC64 along with it vcpus that are in
-        the same core need to be enabled as well. All non-hotpluggable cpus
-        present at boot need to be grouped after vcpu 0.
+        For QEMU the following conditions are required. vCPU 0 needs to be
+        enabled and non-hotpluggable. On PPC64 along with it vCPUs that are in
+        the same core need to be enabled as well. All non-hotpluggable CPUs
+        present at boot need to be grouped after vCPU 0.
         <span class="since">Since 2.2.0 (QEMU only)</span>
       </dd>
     </dl>
@@ -747,6 +748,8 @@
     &lt;shares&gt;2048&lt;/shares&gt;
     &lt;period&gt;1000000&lt;/period&gt;
     &lt;quota&gt;-1&lt;/quota&gt;
+    &lt;global_period&gt;1000000&lt;/global_period&gt;
+    &lt;global_quota&gt;-1&lt;/global_quota&gt;
     &lt;emulator_period&gt;1000000&lt;/emulator_period&gt;
     &lt;emulator_quota&gt;-1&lt;/emulator_quota&gt;
     &lt;iothread_period&gt;1000000&lt;/iothread_period&gt;
@@ -756,7 +759,17 @@
     &lt;cachetune vcpus='0-3'&gt;
       &lt;cache id='0' level='3' type='both' size='3' unit='MiB'/&gt;
       &lt;cache id='1' level='3' type='both' size='3' unit='MiB'/&gt;
+      &lt;monitor level='3' vcpus='1'/&gt;
+      &lt;monitor level='3' vcpus='0-3'/&gt;
     &lt;/cachetune&gt;
+    &lt;cachetune vcpus='4-5'&gt;
+      &lt;monitor level='3' vcpus='4'/&gt;
+      &lt;monitor level='3' vcpus='5'/&gt;
+    &lt;/cachetune&gt;
+    &lt;memorytune vcpus='0-3'&gt;
+      &lt;node id='0' bandwidth='60'/&gt;
+    &lt;/memorytune&gt;
+
   &lt;/cputune&gt;
   ...
 &lt;/domain&gt;
@@ -766,17 +779,17 @@
       <dt><code>cputune</code></dt>
       <dd>
          The optional <code>cputune</code> element provides details
-         regarding the cpu tunable parameters for the domain.
+         regarding the CPU tunable parameters for the domain.
          <span class="since">Since 0.9.0</span>
       </dd>
       <dt><code>vcpupin</code></dt>
       <dd>
         The optional <code>vcpupin</code> element specifies which of host's
-        physical CPUs the domain VCPU will be pinned to. If this is omitted,
+        physical CPUs the domain vCPU will be pinned to. If this is omitted,
         and attribute <code>cpuset</code> of element <code>vcpu</code> is
         not specified, the vCPU is pinned to all the physical CPUs by default.
         It contains two required attributes, the attribute <code>vcpu</code>
-        specifies vcpu id, and the attribute <code>cpuset</code> is same as
+        specifies vCPU id, and the attribute <code>cpuset</code> is same as
         attribute <code>cpuset</code> of element <code>vcpu</code>.
         (NB: Only qemu driver support)
         <span class="since">Since 0.9.0</span>
@@ -784,7 +797,7 @@
        <dt><code>emulatorpin</code></dt>
        <dd>
          The optional <code>emulatorpin</code> element specifies which of host
-         physical CPUs the "emulator", a subset of a domain not including vcpu
+         physical CPUs the "emulator", a subset of a domain not including vCPU
          or iothreads will be pinned to. If this is omitted, and attribute
          <code>cpuset</code> of element <code>vcpu</code> is not specified,
          "emulator" is pinned to all the physical CPUs by default. It contains
@@ -818,7 +831,7 @@
       <dt><code>period</code></dt>
       <dd>
         The optional <code>period</code> element specifies the enforcement
-        interval(unit: microseconds). Within <code>period</code>, each vcpu of
+        interval (unit: microseconds). Within <code>period</code>, each vCPU of
         the domain will not be allowed to consume more than <code>quota</code>
         worth of runtime. The value should be in range [1000, 1000000]. A period
         with value 0 means no value.
@@ -828,21 +841,41 @@
       <dt><code>quota</code></dt>
       <dd>
         The optional <code>quota</code> element specifies the maximum allowed
-        bandwidth(unit: microseconds). A domain with <code>quota</code> as any
-        negative value indicates that the domain has infinite bandwidth, which
-        means that it is not bandwidth controlled. The value should be in range
-        [1000, 18446744073709551] or less than 0. A quota with value 0 means no
-        value. You can use this feature to ensure that all vcpus run at the same
-        speed.
+        bandwidth (unit: microseconds). A domain with <code>quota</code> as any
+        negative value indicates that the domain has infinite bandwidth for
+        vCPU threads, which means that it is not bandwidth controlled. The value
+        should be in range [1000, 18446744073709551] or less than 0. A quota
+        with value 0 means no value. You can use this feature to ensure that all
+        vCPUs run at the same speed.
         <span class="since">Only QEMU driver support since 0.9.4, LXC since
         0.9.10</span>
       </dd>
+      <dt><code>global_period</code></dt>
+      <dd>
+        The optional <code>global_period</code> element specifies the
+        enforcement CFS scheduler interval (unit: microseconds) for the whole
+        domain in contrast with <code>period</code> which enforces the interval
+        per vCPU. The value should be in range 1000, 1000000]. A
+        <code>global_period</code> with value 0 means no value.
+        <span class="since">Only QEMU driver support since 1.3.3</span>
+      </dd>
+      <dt><code>global_quota</code></dt>
+      <dd>
+        The optional <code>global_quota</code> element specifies the maximum
+        allowed bandwidth (unit: microseconds) within a period for the whole
+        domain. A domain with <code>global_quota</code> as any negative
+        value indicates that the domain has infinite bandwidth, which means that
+        it is not bandwidth controlled. The value should be in range
+        [1000, 18446744073709551] or less than 0. A <code>global_quota</code>
+        with value 0 means no value.
+        <span class="since">Only QEMU driver support since 1.3.3</span>
+      </dd>
 
       <dt><code>emulator_period</code></dt>
       <dd>
         The optional <code>emulator_period</code> element specifies the enforcement
-        interval(unit: microseconds). Within <code>emulator_period</code>, emulator
-        threads(those excluding vcpus) of the domain will not be allowed to consume
+        interval (unit: microseconds). Within <code>emulator_period</code>, emulator
+        threads (those excluding vCPUs) of the domain will not be allowed to consume
         more than <code>emulator_quota</code> worth of runtime. The value should be
         in range [1000, 1000000]. A period with value 0 means no value.
         <span class="since">Only QEMU driver support since 0.10.0</span>
@@ -850,10 +883,10 @@
       <dt><code>emulator_quota</code></dt>
       <dd>
         The optional <code>emulator_quota</code> element specifies the maximum
-        allowed bandwidth(unit: microseconds) for domain's emulator threads(those
-        excluding vcpus). A domain with <code>emulator_quota</code> as any negative
+        allowed bandwidth (unit: microseconds) for domain's emulator threads (those
+        excluding vCPUs). A domain with <code>emulator_quota</code> as any negative
         value indicates that the domain has infinite bandwidth for emulator threads
-        (those excluding vcpus), which means that it is not bandwidth controlled.
+        (those excluding vCPUs), which means that it is not bandwidth controlled.
         The value should be in range [1000, 18446744073709551] or less than 0. A
         quota with value 0 means no value.
         <span class="since">Only QEMU driver support since 0.10.0</span>
@@ -862,7 +895,7 @@
       <dt><code>iothread_period</code></dt>
       <dd>
         The optional <code>iothread_period</code> element specifies the
-        enforcement interval(unit: microseconds) for IOThreads. Within
+        enforcement interval (unit: microseconds) for IOThreads. Within
         <code>iothread_period</code>, each IOThread of the domain will
         not be allowed to consume more than <code>iothread_quota</code>
         worth of runtime. The value should be in range [1000, 1000000].
@@ -872,7 +905,7 @@
       <dt><code>iothread_quota</code></dt>
       <dd>
         The optional <code>iothread_quota</code> element specifies the maximum
-        allowed bandwidth(unit: microseconds) for IOThreads. A domain with
+        allowed bandwidth (unit: microseconds) for IOThreads. A domain with
         <code>iothread_quota</code> as any negative value indicates that the
         domain IOThreads have infinite bandwidth, which means that it is
         not bandwidth controlled. The value should be in range
@@ -910,12 +943,14 @@
         size and required granularity are reported as well. The required
         attribute <code>vcpus</code> specifies to which vCPUs this allocation
         applies. A vCPU can only be member of one <code>cachetune</code> element
-        allocations. Supported subelements are:
+        allocation. The vCPUs specified by cachetune can be identical with those
+        in memorytune, however they are not allowed to overlap.
+        Supported subelements are:
         <dl>
           <dt><code>cache</code></dt>
           <dd>
-            This element controls the allocation of CPU cache and has the
-            following attributes:
+            This optional element controls the allocation of CPU cache and has
+            the following attributes:
             <dl>
               <dt><code>level</code></dt>
               <dd>
@@ -949,8 +984,59 @@
               </dd>
             </dl>
           </dd>
+          <dt><code>monitor</code><span class="since">Since 4.10.0</span></dt>
+          <dd>
+            The optional element <code>monitor</code> creates the cache
+            monitor(s) for current cache allocation and has the following
+            required attributes:
+            <dl>
+              <dt><code>level</code></dt>
+              <dd>
+                Host cache level the monitor belongs to.
+              </dd>
+              <dt><code>vcpus</code></dt>
+              <dd>
+                vCPU list the monitor applies to. A monitor's vCPU list
+                can only be the member(s) of the vCPU list of the associated
+                allocation. The default monitor has the same vCPU list as the
+                associated allocation. For non-default monitors, overlapping
+                vCPUs are not permitted.
+              </dd>
+            </dl>
+          </dd>
         </dl>
+      </dd>
 
+      <dt><code>memorytune</code><span class="since">Since 4.7.0</span></dt>
+      <dd>
+        Optional <code>memorytune</code> element can control allocations for
+        memory bandwidth using the resctrl on the host. Whether or not is this
+        supported can be gathered from capabilities where some limitations like
+        minimum bandwidth and required granularity are reported as well. The
+        required attribute <code>vcpus</code> specifies to which vCPUs this
+        allocation applies. A vCPU can only be member of one
+        <code>memorytune</code> element allocation. The <code>vcpus</code> specified
+        by <code>memorytune</code> can be identical to those specified by
+        <code>cachetune</code>. However they are not allowed to overlap each other.
+        Supported subelements are:
+        <dl>
+          <dt><code>node</code></dt>
+          <dd>
+            This element controls the allocation of CPU memory bandwidth and has the
+            following attributes:
+            <dl>
+              <dt><code>id</code></dt>
+              <dd>
+                Host node id from which to allocate memory bandwidth.
+              </dd>
+              <dt><code>bandwidth</code></dt>
+              <dd>
+                The memory bandwidth to allocate from this node. The value by default
+                is in percentage.
+              </dd>
+            </dl>
+          </dd>
+        </dl>
       </dd>
     </dl>
 
@@ -1040,7 +1126,7 @@
     &lt;/hugepages&gt;
     &lt;nosharepages/&gt;
     &lt;locked/&gt;
-    &lt;source type="file|anonymous"/&gt;
+    &lt;source type="file|anonymous|memfd"/&gt;
     &lt;access mode="shared|private"/&gt;
     &lt;allocation mode="immediate|ondemand"/&gt;
     &lt;discard/&gt;
@@ -1091,13 +1177,17 @@
         suitable for the specific environment at the same time to mitigate
         the risks described above. <span class="since">Since 1.0.6</span></dd>
        <dt><code>source</code></dt>
-       <dd>In this attribute you can switch to file memorybacking or keep
-         default anonymous.</dd>
+       <dd>Using the <code>type</code> attribute, it's possible to
+       provide "file" to utilize file memorybacking or keep the
+       default "anonymous". <span class="since">Since 4.10.0</span>,
+       you may choose "memfd" backing. (QEMU/KVM only)</dd>
        <dt><code>access</code></dt>
-       <dd>Specify if memory is shared or private. This can be overridden per
-         numa node by <code>memAccess</code></dd>
+       <dd>Using the <code>mode</code> attribute, specify if the memory is
+         to be "shared" or "private". This can be overridden per numa node by
+         <code>memAccess</code>.</dd>
        <dt><code>allocation</code></dt>
-       <dd>Specify when allocate the memory</dd>
+       <dd>Using the <code>mode</code> attribute, specify when to allocate
+         the memory by supplying either "immediate" or "ondemand".</dd>
        <dt><code>discard</code></dt>
        <dd>When set and supported by hypervisor the memory
          content is discarded just before guest shuts down (or
@@ -1915,6 +2005,11 @@
     &lt;synic state='on'/&gt;
     &lt;reset state='on'/&gt;
     &lt;vendor_id state='on' value='KVM Hv'/&gt;
+    &lt;frequencies state='on'/&gt;
+    &lt;reenlightenment state='on'/&gt;
+    &lt;tlbflush state='on'/&gt;
+    &lt;ipi state='on'/&gt;
+    &lt;evmcs state='on'/&gt;
   &lt;/hyperv&gt;
   &lt;kvm&gt;
     &lt;hidden state='on'/&gt;
@@ -1929,6 +2024,7 @@
   &lt;smm state='on'&gt;
     &lt;tseg unit='MiB'&gt;48&lt;/tseg&gt;
   &lt;/smm&gt;
+  &lt;htm state='on'/&gt;
 &lt;/features&gt;
 ...</pre>
 
@@ -1985,7 +2081,7 @@
         <tr>
           <td>relaxed</td>
           <td>Relax constraints on timers</td>
-          <td> on, off</td>
+          <td>on, off</td>
           <td><span class="since">1.0.0 (QEMU 2.0)</span></td>
         </tr>
         <tr>
@@ -2003,31 +2099,31 @@
         <tr>
           <td>vpindex</td>
           <td>Virtual processor index</td>
-          <td> on, off</td>
+          <td>on, off</td>
           <td><span class="since">1.3.3 (QEMU 2.5)</span></td>
         </tr>
         <tr>
           <td>runtime</td>
           <td>Processor time spent on running guest code and on behalf of guest code</td>
-          <td> on, off</td>
+          <td>on, off</td>
           <td><span class="since">1.3.3 (QEMU 2.5)</span></td>
         </tr>
         <tr>
           <td>synic</td>
           <td>Enable Synthetic Interrupt Controller (SyNIC)</td>
-          <td> on, off</td>
+          <td>on, off</td>
           <td><span class="since">1.3.3 (QEMU 2.6)</span></td>
         </tr>
         <tr>
           <td>stimer</td>
           <td>Enable SyNIC timers</td>
-          <td> on, off</td>
+          <td>on, off</td>
           <td><span class="since">1.3.3 (QEMU 2.6)</span></td>
         </tr>
         <tr>
           <td>reset</td>
           <td>Enable hypervisor reset</td>
-          <td> on, off</td>
+          <td>on, off</td>
           <td><span class="since">1.3.3 (QEMU 2.5)</span></td>
         </tr>
         <tr>
@@ -2036,6 +2132,36 @@
           <td>on, off; value - string, up to 12 characters</td>
           <td><span class="since">1.3.3 (QEMU 2.5)</span></td>
         </tr>
+        <tr>
+          <td>frequencies</td>
+          <td>Expose frequency MSRs</td>
+          <td>on, off</td>
+          <td><span class="since">4.7.0 (QEMU 2.12)</span></td>
+        </tr>
+        <tr>
+          <td>reenlightenment</td>
+          <td>Enable re-enlightenment notification on migration</td>
+          <td>on, off</td>
+          <td><span class="since">4.7.0 (QEMU 3.0)</span></td>
+        </tr>
+        <tr>
+          <td>tlbflush</td>
+          <td>Enable PV TLB flush support</td>
+          <td>on, off</td>
+          <td><span class="since">4.7.0 (QEMU 3.0)</span></td>
+        </tr>
+        <tr>
+          <td>ipi</td>
+          <td>Enable PV IPI support</td>
+          <td>on, off</td>
+          <td><span class="since">4.10.0 (QEMU 3.1)</span></td>
+        </tr>
+        <tr>
+          <td>evmcs</td>
+          <td>Enable Enlightened VMCS</td>
+          <td>on, off</td>
+          <td><span class="since">4.10.0 (QEMU 3.1)</span></td>
+        </tr>
       </table>
       </dd>
       <dt><code>pvspinlock</code></dt>
@@ -2108,13 +2234,13 @@
           QEMU, the user-configurable extended TSEG feature was unavailable up
           to and including <code>pc-q35-2.9</code>. Starting with
           <code>pc-q35-2.10</code> the feature is available, with default size
-          16 MiB.  That should suffice for up to roughly 272 VCPUs, 5 GiB guest
+          16 MiB.  That should suffice for up to roughly 272 vCPUs, 5 GiB guest
           RAM in total, no hotplug memory range, and 32 GiB of 64-bit PCI MMIO
-          aperture.  Or for 48 VCPUs, with 1TB of guest RAM, no hotplug DIMM
+          aperture.  Or for 48 vCPUs, with 1TB of guest RAM, no hotplug DIMM
           range, and 32GB of 64-bit PCI MMIO aperture. The values may also vary
           based on the loader the VM is using.
         </p><p>
-          Additional size might be needed for significantly higher VCPU counts
+          Additional size might be needed for significantly higher vCPU counts
           or increased address space (that can be memory, maxMemory, 64-bit PCI
           MMIO aperture size; roughly 8 MiB of TSEG per 1 TiB of address space)
           which can also be rounded up.
@@ -2124,7 +2250,7 @@
           documentation of the guest OS or loader (if there is any), or test
           this by trial-and-error changing the value until the VM boots
           successfully.  Yet another guiding value for users might be the fact
-          that 48 MiB should be enough for pretty large guests (240 VCPUs and
+          that 48 MiB should be enough for pretty large guests (240 vCPUs and
           4TB guest RAM), but it is on purpose not set as default as 48 MiB of
           unavailable RAM might be too much for small guests (e.g. with 512 MiB
           of RAM).
@@ -2162,6 +2288,25 @@
       <dd>Enable QEMU vmcoreinfo device to let the guest kernel save debug
           details. <span class="since">Since 4.4.0</span> (QEMU only)
       </dd>
+      <dt><code>htm</code></dt>
+      <dd>Configure HTM (Hardware Transational Memory) availability for
+          pSeries guests. Possible values for the <code>state</code> attribute
+          are <code>on</code> and <code>off</code>. If the attribute is not
+          defined, the hypervisor default will be used.
+          <span class="since">Since 4.6.0</span> (QEMU/KVM only)
+      </dd>
+      <dt><code>nested-hv</code></dt>
+      <dd>Configure nested HV availability for pSeries guests. This needs to
+          be enabled from the host (L0) in order to be effective; having HV
+          support in the (L1) guest is very desiderable if it's planned to
+          run nested (L2) guests inside it, because it will result in those
+          nested guests having much better performance than they would when
+          using KVM PR or TCG.
+          Possible values for the <code>state</code> attribute are
+          <code>on</code> and <code>off</code>. If the attribute is not
+          defined, the hypervisor default will be used.
+          <span class="since">Since 4.10.0</span> (QEMU/KVM only)
+      </dd>
     </dl>
 
     <h3><a id="elementsTime">Time keeping</a></h3>
@@ -2395,7 +2540,7 @@
     </tr>
     <tr>
       <td><code>cpu_cycles</code></td>
-      <td>the count of cpu cycles (total/elapsed)</td>
+      <td>the count of CPU cycles (total/elapsed)</td>
       <td><code>perf.cpu_cycles</code></td>
     </tr>
     <tr>
@@ -2430,25 +2575,25 @@
     </tr>
     <tr>
       <td><code>stalled_cycles_frontend</code></td>
-      <td>the count of stalled cpu cycles in the frontend of the instruction
+      <td>the count of stalled CPU cycles in the frontend of the instruction
           processor pipeline by applications running on the platform</td>
       <td><code>perf.stalled_cycles_frontend</code></td>
     </tr>
     <tr>
       <td><code>stalled_cycles_backend</code></td>
-      <td>the count of stalled cpu cycles in the backend of the instruction
+      <td>the count of stalled CPU cycles in the backend of the instruction
           processor pipeline by applications running on the platform</td>
       <td><code>perf.stalled_cycles_backend</code></td>
     </tr>
     <tr>
       <td><code>ref_cpu_cycles</code></td>
-      <td>the count of total cpu cycles not affected by CPU frequency scaling
+      <td>the count of total CPU cycles not affected by CPU frequency scaling
          by applications running on the platform</td>
       <td><code>perf.ref_cpu_cycles</code></td>
     </tr>
     <tr>
       <td><code>cpu_clock</code></td>
-      <td>the count of cpu clock time, as measured by a monotonic
+      <td>the count of CPU clock time, as measured by a monotonic
           high-resolution per-CPU timer, by applications running on
           the platform</td>
       <td><code>perf.cpu_clock</code></td>
@@ -2475,7 +2620,7 @@
     </tr>
     <tr>
       <td><code>cpu_migrations</code></td>
-      <td>the count of cpu migrations, that is, where the process
+      <td>the count of CPU migrations, that is, where the process
           moved from one logical processor to another, by
           applications running on the platform</td>
       <td><code>perf.cpu_migrations</code></td>
@@ -2530,7 +2675,7 @@
 ...</pre>
 
     <dl>
-      <dt><code>emulator</code></dt>
+      <dt><a id="elementEmulator"><code>emulator</code></a></dt>
       <dd>
         The contents of the <code>emulator</code> element specify
         the fully qualified path to the device model emulator binary.
@@ -2703,6 +2848,16 @@
     &lt;/source&gt;
     &lt;target dev='sdb' bus='scsi'/&gt;
   &lt;/disk&gt;
+  &lt;disk type='network' device='lun'&gt;
+    &lt;driver name='qemu' type='raw'/&gt;
+    &lt;source protocol='iscsi' name='iqn.2013-07.com.example:iscsi-nopool/0'&gt;
+      &lt;host name='example.com' port='3260'/&gt;
+      &lt;initiator&gt;
+        &lt;iqn name='iqn.2013-07.com.example:client'/&gt;
+      &lt;/initiator&gt;
+    &lt;/source&gt;
+    &lt;target dev='sdb' bus='scsi'/&gt;
+  &lt;/disk&gt;
   &lt;disk type='volume' device='disk'&gt;
     &lt;driver name='qemu' type='raw'/&gt;
     &lt;source pool='iscsi-pool' volume='unit:0:0:1' mode='host'/&gt;
@@ -2921,6 +3076,11 @@
         is only valid when the specified storage volume is of 'file' or
         'block' type).
         <p>
+        The <code>source</code> element may also have the <code>index</code>
+        attribute with same semantics the <a href='#elementsDiskBackingStoreIndex'>
+        <code>index</code></a> attribute of <code>backingStore</code>
+        </p>
+        <p>
         The <code>source</code> element may contain the following sub elements:
         </p>
 
@@ -3060,6 +3220,15 @@
             It's recommended to allow libvirt manage the persistent
             reservations.
           </dd>
+          <dt><code>initiator</code></dt>
+          <dd><span class="since">Since libvirt 4.7.0</span>, the
+            <code>initiator</code> element is supported for a disk
+            <code>type</code> "network" that is using a <code>source</code>
+            element with the <code>protocol</code> attribute "iscsi".
+            If present, the <code>initiator</code> element provides the
+            initiator IQN needed to access the source via mandatory
+            attribute <code>name</code>.
+          </dd>
         </dl>
 
         <p>
@@ -3120,7 +3289,7 @@
             by the backing store, see disk type attribute above for more
             details and possible values.
           </dd>
-          <dt><code>index</code></dt>
+          <dt><code><a id="elementsDiskBackingStoreIndex">index</a></code></dt>
           <dd>
             This attribute is only valid in output (and ignored on input) and
             it can be used to refer to a specific part of the disk chain when
@@ -3808,7 +3977,15 @@
         (<span class="since">since 0.9.7, requires QEMU
         0.13</span>). <code>multifunction</code> defaults to 'off',
         but should be set to 'on' for function 0 of a slot that will
-        have multiple functions used.<br/>
+        have multiple functions used.
+        (<span class="since">Since 4.10.0</span>), PCI address extensions
+        depending on the architecture are supported. For example, PCI
+        addresses for S390 guests will have a <code>zpci</code> child
+        element, with two attributes: <code>uid</code> (a hex value
+        between 0x0001 and 0xffff, inclusive), and <code>fid</code> (a
+        hex value between 0x00000000 and 0xffffffff, inclusive) used by
+        PCI devices on S390 for User-defined Identifiers and Function
+        Identifiers.<br/>
         <span class="since">Since 1.3.5</span>, some hypervisor
         drivers may accept an <code>&lt;address type='pci'/&gt;</code>
         element with no other attributes as an explicit request to
@@ -4355,8 +4532,8 @@
     <p>
       USB, PCI and SCSI devices attached to the host can be passed through
       to the guest using the <code>hostdev</code> element.
-      <span class="since">since after 0.4.4 for USB, 0.6.0 for PCI(KVM only)
-        and 1.0.6 for SCSI(KVM only)</span>:
+      <span class="since">since after 0.4.4 for USB, 0.6.0 for PCI (KVM only)
+        and 1.0.6 for SCSI (KVM only)</span>:
     </p>
 
 <pre>
@@ -4499,12 +4676,28 @@
           <dd>For mediated devices (<span class="since">Since 3.2.0</span>)
           the <code>model</code> attribute specifies the device API which
           determines how the host's vfio driver will expose the device to the
-          guest. Currently, <code>model='vfio-pci'</code> and
+          guest. Currently, <code>model='vfio-pci'</code>,
           <code>model='vfio-ccw'</code> (<span class="since">Since 4.4.0</span>)
-          is supported. Refer <a href="drvnodedev.html#MDEV">MDEV</a> to create
-          a mediated device on the host. There are also some implications on the
-          usage of guest's address type depending on the <code>model</code>
-          attribute, see the <code>address</code> element below.
+          and <code>model='vfio-ap'</code> (<span class="since">Since 4.9.0</span>)
+          is supported. <a href="drvnodedev.html#MDEV">MDEV</a> section
+          provides more information about mediated devices as well as how to
+          create mediated devices on the host.
+          <span class="since">Since 4.6.0 (QEMU 2.12)</span> an optional
+          <code>display</code> attribute may be used to enable or disable
+          support for an accelerated remote desktop backed by a mediated
+          device (such as NVIDIA vGPU or Intel GVT-g) as an alternative to
+          emulated <a href="#elementsVideo">video devices</a>. This attribute
+          is limited to <code>model='vfio-pci'</code> only. Supported values
+          are either <code>on</code> or <code>off</code> (default is 'off').
+          It is required to use a
+          <a href="#elementsGraphics">graphical framebuffer</a> in order to
+          use this attribute, currently only supported with VNC, Spice and
+          egl-headless graphics devices.
+          <p>
+            Note: There are also some implications on the usage of guest's
+            address type depending on the <code>model</code> attribute,
+            see the <code>address</code> element below.
+          </p>
           </dd>
         </dl>
         <p>
@@ -5035,7 +5228,6 @@
     &lt;virtualport&gt;
       &lt;parameters instanceid='09b11c53-8b5c-4eeb-8f00-d84eaa0aaa4f'/&gt;
     &lt;/virtualport&gt;
-
   &lt;/interface&gt;
 &lt;/devices&gt;
 ...</pre>
@@ -5528,8 +5720,7 @@ qemu-kvm -net nic,model=? /dev/null
       &lt;host csum='off' gso='off' tso4='off' tso6='off' ecn='off' ufo='off' mrg_rxbuf='off'/&gt;
       &lt;guest csum='off' tso4='off' tso6='off' ecn='off' ufo='off'/&gt;
     &lt;/driver&gt;
-    </b>
-  &lt;/interface&gt;
+    </b>&lt;/interface&gt;
 &lt;/devices&gt;
 ...</pre>
 
@@ -5591,8 +5782,8 @@ qemu-kvm -net nic,model=? /dev/null
         The resulting difference, according to the qemu developer who
         added the option is: "bh makes tx more asynchronous and reduces
         latency, but potentially causes more processor bandwidth
-        contention since the cpu doing the tx isn't necessarily the
-        cpu where the guest generated the packets."<br/><br/>
+        contention since the CPU doing the tx isn't necessarily the
+        CPU where the guest generated the packets."<br/><br/>
 
         <b>In general you should leave this option alone, unless you
         are very certain you know what you are doing.</b>
@@ -6031,7 +6222,7 @@ qemu-kvm -net nic,model=? /dev/null
     <b>&lt;route family='ipv4' address='192.168.122.0' prefix='24' gateway='192.168.122.1'/&gt;</b>
     <b>&lt;route family='ipv4' address='192.168.122.8' gateway='192.168.122.1'/&gt;</b>
   &lt;/hostdev&gt;
-
+  ...
 &lt;/devices&gt;
 ...
 </pre>
@@ -6291,7 +6482,8 @@ qemu-kvm -net nic,model=? /dev/null
         <p>
           The <code>graphics</code> element has a mandatory <code>type</code>
           attribute which takes the value <code>sdl</code>, <code>vnc</code>,
-          <code>spice</code>, <code>rdp</code> or <code>desktop</code>:
+          <code>spice</code>, <code>rdp</code>, <code>desktop</code> or
+          <code>egl-headless</code>:
         </p>
         <dl>
           <dt><code>sdl</code></dt>
@@ -6350,6 +6542,11 @@ qemu-kvm -net nic,model=? /dev/null
               auto-allocation and <code>autoport</code> having no effect due to
               security reasons) <span class="since">Since 1.0.6</span>.
             </p>
+            <p>
+              Although VNC doesn't support OpenGL natively, it can be paired
+              with graphics type <code>egl-headless</code> (see below) which
+              will instruct QEMU to open and use drm nodes for OpenGL rendering.
+            </p>
           </dd>
           <dt><code>spice</code> <span class="since">Since 0.8.6</span></dt>
           <dd>
@@ -6455,6 +6652,12 @@ qemu-kvm -net nic,model=? /dev/null
               You can enable or disable OpenGL support explicitly with
               the <code>gl</code> element, by setting the <code>enable</code>
               property. (QEMU only, <span class="since">since 1.3.3</span>).
+              Note that this only works locally, since this requires usage of
+              UNIX sockets, i.e. using <code>listen</code> types 'socket' or
+              'none'. For accelerated OpenGL with remote support, consider
+              pairing this element with type <code>egl-headless</code>
+              (see below). However, this will deliver weaker performance
+              compared to native Spice OpenGL support.
             </p>
             <p>
               By default, QEMU will pick the first available GPU DRM render node.
@@ -6490,6 +6693,25 @@ qemu-kvm -net nic,model=? /dev/null
               <code>fullscreen</code>.
             </p>
           </dd>
+          <dt><code>egl-headless</code><span class="since">Since 4.6.0</span></dt>
+          <dd>
+            <p>
+              This display type provides support for an OpenGL accelerated
+              display accessible both locally and remotely (for comparison,
+              Spice's native OpenGL support only works locally using UNIX
+              sockets at the moment, but has better performance). Since this
+              display type doesn't provide any window or graphical console like
+              the other types, for practical reasons it should be paired with
+              either <code>vnc</code> or <code>spice</code> graphics types.
+              This display type is only supported by QEMU domains
+              (needs QEMU <span class="since">2.10</span> or newer) and doesn't
+              accept any attributes.
+            </p>
+            <pre>
+&lt;graphics type='spice' autoport='yes'/&gt;
+&lt;graphics type='egl-headless'/&gt;
+            </pre>
+          </dd>
         </dl>
       </dd>
     </dl>
@@ -6612,9 +6834,18 @@ qemu-kvm -net nic,model=? /dev/null
           The <code>model</code> element has a mandatory <code>type</code>
           attribute which takes the value "vga", "cirrus", "vmvga", "xen",
           "vbox", "qxl" (<span class="since">since 0.8.6</span>),
-          "virtio" (<span class="since">since 1.3.0</span>)
-          or "gop" (<span class="since">since 3.2.0</span>)
+          "virtio" (<span class="since">since 1.3.0</span>),
+          "gop" (<span class="since">since 3.2.0</span>), or
+          "none" (<span class="since">since 4.6.0</span>)
           depending on the hypervisor features available.
+          The purpose of the type <code>none</code> is to instruct libvirt not
+          to add a default video device in the guest (see the paragraph above).
+          This legacy behaviour can be inconvenient in cases where GPU mediated
+          devices are meant to be the only rendering device within a guest and
+          so specifying another <code>video</code> device along with type
+          <code>none</code>.
+          Refer to <a id="elementsHostDev">Host device assignment</a> to see
+          how to add a mediated device into a guest.
         </p>
         <p>
           You can provide the amount of video memory in kibibytes (blocks of
@@ -6843,7 +7074,8 @@ qemu-kvm -net nic,model=? /dev/null
       is available) and <code>pci-serial</code> (usable whenever PCI support
       is available); <span class="since">since 3.10.0</span>,
       <code>spapr-vio-serial</code> (usable with ppc64/pseries guests),
-      <code>system-serial</code> (usable with aarch64/virt guests) and
+      <code>system-serial</code> (usable with aarch64/virt and,
+      <span class="since">since 4.7.0</span>, riscv/virt guests) and
       <code>sclp-serial</code> (usable with s390 and s390x guests) are
       available as well.
     </p>
@@ -6857,10 +7089,11 @@ qemu-kvm -net nic,model=? /dev/null
       target type); <code>pci-serial</code>
       (usable with the <code>pci-serial</code> target type);
       <code>spapr-vty</code> (usable with the <code>spapr-vio-serial</code>
-      target type); <code>pl011</code> (usable with the
-      <code>system-serial</code> target type); <code>sclpconsole</code> and
-      <code>sclplmconsole</code> (usable with the <code>sclp-serial</code>
-      target type).
+      target type); <code>pl011</code> and,
+      <span class="since">since 4.7.0</span>, <code>16550a</code> (usable
+      with the <code>system-serial</code> target type);
+      <code>sclpconsole</code> and <code>sclplmconsole</code> (usable with
+      the <code>sclp-serial</code> target type).
     </p>
 
     <p>
@@ -8009,7 +8242,9 @@ qemu-kvm -net nic,model=? /dev/null
     <dt><code>shmem</code></dt>
     <dd>
       The <code>shmem</code> element has one mandatory attribute,
-      <code>name</code> to identify the shared memory.
+      <code>name</code> to identify the shared memory. This attribute cannot
+      be directory specific to <code>.</code> or <code>..</code> as well as
+      it cannot involve path separator <code>/</code>.
     </dd>
     <dt><code>model</code></dt>
     <dd>

docs/hacking.html.in

@@ -1121,22 +1121,22 @@
     <p>
       Do not use the strncpy function.  According to the man page, it
       does <b>not</b> guarantee a NULL-terminated buffer, which makes
-      it extremely dangerous to use.  Instead, use one of the
-      functionally equivalent functions:
+      it extremely dangerous to use.  Instead, use one of the replacement
+      functions provided by libvirt:
     </p>
 
 <pre>
   virStrncpy(char *dest, const char *src, size_t n, size_t destbytes)
 </pre>
     <p>
-      The first three arguments have the same meaning as for strncpy;
-      namely the destination, source, and number of bytes to copy,
-      respectively.  The last argument is the number of bytes
-      available in the destination string; if a copy of the source
-      string (including a \0) will not fit into the destination, no
-      bytes are copied and the routine returns NULL.  Otherwise, n
-      bytes from the source are copied into the destination and a
-      trailing \0 is appended.
+      The first two arguments have the same meaning as for strncpy,
+      namely the destination and source of the copy operation.  Unlike
+      strncpy, the function will always copy exactly the number of bytes
+      requested and make sure the destination is NULL-terminated, as the
+      source is required to be; sanity checks are performed to ensure the
+      size of the destination, as specified by the last argument, is
+      sufficient for the operation to succeed.  On success, 0 is returned;
+      on failure, a value &lt;0 is returned instead.
     </p>
 
 <pre>
@@ -1144,10 +1144,8 @@
 </pre>
     <p>
       Use this variant if you know you want to copy the entire src
-      string into dest.  Note that this is a macro, so arguments could
-      be evaluated more than once.  This is equivalent to
-      virStrncpy(dest, src, strlen(src), destbytes)
-      </p>
+      string into dest.
+    </p>
 
 <pre>
   virStrcpyStatic(char *dest, const char *src)
@@ -1157,8 +1155,7 @@
       string into dest <b>and</b> you know that your destination string is
       a static string (i.e. that sizeof(dest) returns something
       meaningful).  Note that this is a macro, so arguments could be
-      evaluated more than once.  This is equivalent to
-      virStrncpy(dest, src, strlen(src), sizeof(dest)).
+      evaluated more than once.
     </p>
 
 <pre>

docs/libvirt.css

@@ -393,6 +393,7 @@ table.acl {
 
 table.acl tr, table.acl td {
     padding: 0.3em;
+    border: 1px solid #ccc;
 }
 
 table.acl thead {

docs/news.xml

@@ -33,7 +33,387 @@
      -->
 
 <libvirt>
-  <release version="v4.5.0" date="unreleased">
+  <release version="v4.10.0" date="2018-12-03">
+    <section title="New features">
+      <change>
+        <summary>
+          qemu: Add Hyper-V PV IPI and Enlightened VMCS support
+        </summary>
+        <description>
+          The QEMU driver now has support for Hyper-V PV IPI and Enlightened VMCS
+          for Windows and Hyper-V guests.
+        </description>
+      </change>
+      <change>
+        <summary>
+          qemu: Added support for PCI devices on S390
+        </summary>
+        <description>
+          PCI addresses can now include the new zpci element which contains
+          uid (user-defined identifier) and fid (PCI function identifier)
+          attributes and makes the corresponding devices usable by S390
+          guests.
+        </description>
+      </change>
+      <change>
+        <summary>
+          Support changing IOThread polling parameters for a live guest
+        </summary>
+        <description>
+          Introduced virDomainSetIOThreadParams which allows dynamically
+          setting the IOThread polling parameters used by QEMU to manage
+          the thread polling interval and the algorithm for growth or
+          shrink of the polling time. The values only affect a running
+          guest with IOThreads. The guest's IOThread polling values can
+          be viewed via the domain statistics.
+        </description>
+      </change>
+      <change>
+        <summary>
+          Xen: Add support for PVH
+        </summary>
+        <description>
+          The libxl driver now supports Xen's PVH virtual machine type.
+          PVH machines are enabled with the new "xenpvh" OS type, e.g.
+          <code>&lt;os&gt;&lt;type&gt;xenpvh&lt;/type&gt;&lt;/os&gt;</code>
+        </description>
+      </change>
+      <change>
+        <summary>
+          qemu: Added support for CMT (Cache Monitoring Technology)
+        </summary>
+        <description>
+          Introduced cache monitoring using the <code>monitor</code>
+          element in <code>cachetune</code> for vCPU threads. Added
+          interfaces to get and display the cache utilization statistics
+          through the command 'virsh domstats' via the
+          virConnectGetAllDomainStats API.
+        </description>
+      </change>
+      <change>
+        <summary>
+          qemu: Add support for nested HV for pSeries guests
+        </summary>
+        <description>
+          Nested HV support makes it possible to run nested (L2) guests
+          with minimal performance penalty when compared to regular (L1)
+          guests on ppc64 hardware.
+        </description>
+      </change>
+    </section>
+    <section title="Improvements">
+    </section>
+    <section title="Bug fixes">
+      <change>
+        <summary>
+          Xen: Handle soft reset shutdown event
+        </summary>
+        <description>
+          The pvops Linux kernel uses soft reset to handle the crash
+          machine operation. The libxl driver now supports the soft
+          reset shutdown event, allowing proper crash handling of
+          pvops-based HVM domains.
+        </description>
+      </change>
+    </section>
+  </release>
+  <release version="v4.9.0" date="2018-11-04">
+    <section title="New features">
+      <change>
+        <summary>
+          util: Add cgroup v2 support
+        </summary>
+        <description>
+          cgroup v2 support has been implemented in libvirt, with both
+          "unified" (v2 only) and "hybrid" (v2 + v1) setups being usable;
+          existing "legacy" (v1 only) setups will keep working.
+        </description>
+      </change>
+      <change>
+        <summary>
+          qemu: Add vfio AP support
+        </summary>
+        <description>
+          The QEMU driver now has support to passthrough adjunct processors
+          into QEMU guests on S390.
+        </description>
+      </change>
+    </section>
+    <section title="Improvements">
+      <change>
+        <summary>
+          rpc: Make 'genprotocol' output reproducible
+        </summary>
+        <description>
+          This is another step towards making libvirt builds fully
+          reproducible.
+        </description>
+      </change>
+    </section>
+    <section title="Bug fixes">
+      <change>
+        <summary>
+          security: Fix permissions for UNIX sockets
+        </summary>
+        <description>
+          Since 4.5.0, libvirt is using FD passing to hand sockets over to
+          QEMU, which in theory removes the need for them to be accessible by
+          the user under which the QEMU process is running; however, other
+          processes such as vdsm need to access the sockets as well, which
+          means adjusting permissions is still necessary.
+        </description>
+      </change>
+      <change>
+        <summary>
+          cpu_map: Add Icelake model definitions
+        </summary>
+        <description>
+          These CPU models will be available in the upcoming 3.1.0 QEMU
+          release.
+        </description>
+      </change>
+      <change>
+        <summary>
+          util: Properly parse URIs with missing trailing slash
+        </summary>
+        <description>
+          Some storage URIs were not parsed correctly, in which case libvirt
+          ended up emitting XML that it would then refuse to parse back.
+        </description>
+      </change>
+    </section>
+  </release>
+  <release version="v4.8.0" date="2018-10-01">
+    <section title="New features">
+      <change>
+        <summary>
+          Xen: Support PM Suspend and Wakeup
+        </summary>
+        <description>
+          The libxl driver now supports the virDomainPMSuspendForDuration
+          and virDomainPMWakeup APIs.
+        </description>
+      </change>
+    </section>
+    <section title="Removed features">
+      <change>
+        <summary>
+          Xen: Drop support for Xen 4.4 and 4.5
+        </summary>
+        <description>
+          Xen 4.4 and 4.5 are no longer supported by the Xen community.
+          Drop support for these older versions and require Xen >= 4.6.
+        </description>
+      </change>
+      <change>
+        <summary>
+          nwfilter: Disallow binding creation in session mode
+        </summary>
+        <description>
+          Ensure that a filter binding creation is not attempted in session
+          mode and generates a proper error message.
+        </description>
+      </change>
+    </section>
+    <section title="Improvements">
+      <change>
+        <summary>
+          qemu: Retrieve guest hostname through QEMU Guest Agent command
+        </summary>
+	<description>
+          QEMU is now able to retrieve the guest hostname using a new QEMU-GA
+	  command called 'guest-get-host-name'. Virsh users can execute
+          'domhostname' for QEMU driver for domains configured to use the
+          Guest Agent.
+        </description>
+      </change>
+      <change>
+        <summary>
+          virsh: Implement vsh-table in virsh and virsh-admin
+        </summary>
+        <description>
+          The new API fixes problems with table-alignment, making the tables
+          more readable and deals with unicode.
+        </description>
+      </change>
+    </section>
+    <section title="Bug fixes">
+      <change>
+        <summary>
+          storage: Allow inputvol to be encrypted
+        </summary>
+        <description>
+          When creating a storage volume based on another volume, the base
+          input volume is allowed to be encrypted.
+        </description>
+      </change>
+      <change>
+        <summary>
+          virsh: Require explicit --domain for domxml-to-native
+        </summary>
+        <description>
+          The --domain option for domxml-to-native virsh command has always
+          been documented as required, but commit v4.3.0-127-gd86531daf2
+          accidentally made it optional.
+        </description>
+      </change>
+      <change>
+        <summary>
+          lxc_monitor: Avoid AB / BA lock race
+        </summary>
+        <description>
+          A deadlock situation could occur when autostarting a LXC domain
+          'guest' due to two threads attempting to take opposing locks while
+          holding opposing locks (AB BA problem).
+        </description>
+      </change>
+    </section>
+  </release>
+  <release version="v4.7.0" date="2018-09-03">
+    <section title="New features">
+      <change>
+        <summary>
+          storage: add storage pool iscsi-direct
+        </summary>
+        <description>
+          Introduce a new storage pool backend that uses libiscsi instead of
+          iscsiadm. It support basic pool operations: checkPool and refreshPool.
+        </description>
+      </change>
+      <change>
+        <summary>
+          Add support for MBA (Memory Bandwidth Allocation technology)
+        </summary>
+        <description>
+          Domain vCPU threads can now have allocated some parts of host memory
+          bandwidth by using the <code>memorytune</code> element in <code>cputune</code>.
+        </description>
+      </change>
+      <change>
+        <summary>
+          qemu: Add support for RISC-V guests
+        </summary>
+        <description>
+          riscv32 and riscv64 guest architectures are now supported.
+        </description>
+      </change>
+    </section>
+    <section title="Improvements">
+      <change>
+        <summary>
+          qemu: Add ccw support for vhost-vsock
+        </summary>
+        <description>
+          Support the vhost-vsock-ccw device on S390.
+        </description>
+      </change>
+      <change>
+        <summary>
+          qemu: Make default machine type independent of QEMU
+        </summary>
+        <description>
+          We can't control whether or not QEMU will change its default
+          machine type in the future, or whether downstream distributions
+          will decide to compile out some machine types, so our only option
+          to provide a predictable behavior is taking care of the default
+          ourselves; management applications and users are encouraged to
+          explicitly pick a machine type when creating new guests.
+        </description>
+      </change>
+      <change>
+        <summary>
+          apparmor: Various improvements
+        </summary>
+        <description>
+          Rules have been added to deal with a number of scenarios that
+          didn't work correctly.
+        </description>
+      </change>
+    </section>
+    <section title="Bug fixes">
+      <change>
+        <summary>
+          esx: Truncate CPU model name
+        </summary>
+        <description>
+          Some CPU model names are too long to be stored into the
+          corresponding property, and should be explicitly truncated
+          to avoid unexpected behavior in users of the
+          <code>virNodeGetInfo()</code> API such as
+          <code>virsh nodeinfo</code>.
+        </description>
+      </change>
+      <change>
+        <summary>
+          utils: Remove arbitrary limit on socket_id/core_id
+        </summary>
+        <description>
+          Both values were assumed to be smaller than 4096, but in fact
+          they are entirely hardware-dependent and there have been reports
+          of machines presenting much bigger values, preventing libvirt from
+          working correctly; all such limits have now been removed.
+        </description>
+      </change>
+    </section>
+  </release>
+  <release version="v4.6.0" date="2018-08-06">
+    <section title="New features">
+      <change>
+        <summary>
+          qemu: Implement the HTM pSeries feature
+        </summary>
+        <description>
+          Users can now decide whether HTM (Hardware Transactional Memory)
+          support should be available to the guest.
+        </description>
+      </change>
+      <change>
+        <summary>
+          qemu: Enable VNC console for mediated devices
+        </summary>
+        <description>
+          Host devices now support a new atribute 'display' which can be used
+          to turn on frame buffer rendering on a vgpu mediated device instead of
+          on an emulated GPU, like QXL.
+        </description>
+      </change>
+    </section>
+    <section title="Improvements">
+      <change>
+        <summary>
+          qemu: Introduce a new video model of type 'none'
+        </summary>
+        <description>
+          Introduce a new video model type that disables the automatic addition
+          of a video device to domains with 'graphics' specified in their XML.
+          This can be useful with GPU mediated devices which can serve as the
+          only rendering devices within the guest.
+        </description>
+      </change>
+      <change>
+        <summary>
+          virsh: Add --alias to attach-disk and attach-interface commands
+        </summary>
+        <description>
+          Add option --alias to set customized device alias name when
+          using attach-disk or attach-interface commands.
+        </description>
+      </change>
+      <change>
+        <summary>
+          virsh: Support usb and sata address to attach-disk
+        </summary>
+        <description>
+          Usb or sata address could be used when attach-disk with --address.
+          For example, use usb address as usb:&lt;bus&gt;.&lt;port&gt;, use
+          sata address as &lt;controller&gt;.&lt;bus&gt;.&lt;unit&gt;.
+        </description>
+      </change>
+    </section>
+    <section title="Bug fixes">
+    </section>
+  </release>
+  <release version="v4.5.0" date="2018-07-02">
     <section title="New features">
       <change>
         <summary>
@@ -61,6 +441,16 @@
           Support specifying extended TSEG size for SMM in QEMU.
         </description>
       </change>
+      <change>
+        <summary>
+          qemu: Add support for SEV guests
+        </summary>
+        <description>
+          SEV (Secure Encrypted Virtualization) is a feature available on AMD
+          CPUs that encrypts the guest memory and makes it inaccessible even
+          to the host OS.
+        </description>
+      </change>
     </section>
     <section title="Removed features">
       <change>
@@ -76,6 +466,24 @@
           secret objects, but that support was never added to libvirt.
         </description>
       </change>
+      <change>
+        <summary>
+          Make GnuTLS mandatory
+        </summary>
+        <description>
+          Building without GnuTLS is no longer possible.
+        </description>
+      </change>
+      <change>
+        <summary>
+          qemu: Remove allow_disk_format_probing configuration option
+        </summary>
+        <description>
+          The option represented a security risk when used with malicious
+          disk images, so users were recommended against enabling it; with
+          this release, it's been removed altogether.
+        </description>
+      </change>
     </section>
     <section title="Improvements">
       <change>
@@ -130,6 +538,39 @@
           or virStorageVolCreateXMLFrom.
         </description>
       </change>
+      <change>
+        <summary>
+          qemu: Add support for vsock hot (un)plug and cold (un)plug
+        </summary>
+      </change>
+      <change>
+        <summary>
+          qemu: Add support for NBD over TLS
+        </summary>
+        <description>
+          NBD volumes can now be accessed securely.
+        </description>
+      </change>
+      <change>
+        <summary>
+          qemu: Implement FD passing for Unix sockets
+        </summary>
+        <description>
+          Instead of having QEMU open the socket and then connecting to it,
+          which is inherently racy, starting with QEMU 2.12 we can open the
+          socket ourselves and pass it to QEMU, avoiding race conditions.
+        </description>
+      </change>
+      <change>
+        <summary>
+          virsh: Introduce --nowait option for domstat command
+        </summary>
+        <description>
+          When this option is specified, virsh will try to fetch the guest
+          stats but abort instead of stalling if they can't be retrieved right
+          away.
+        </description>
+      </change>
     </section>
     <section title="Bug fixes">
       <change>
@@ -143,6 +584,26 @@
           us getting to the worker pool initialization.
         </description>
       </change>
+      <change>
+        <summary>
+          qemu: Fix domain resume after failed migration
+        </summary>
+        <description>
+          Recent versions of QEMU activate block devices before the guest CPU
+          has been started, which makes it impossible to roll back a failed
+          migration. Use the <code>late-block-activate</code> migration
+          capability if supported to avoid the issue.
+        </description>
+      </change>
+      <change>
+        <summary>
+          vmx: Permit guests to have an odd number of vCPUs
+        </summary>
+        <description>
+          An odd number of vCPUs greater than 1 was forbidden in the past,
+          but current versions of ESXi have lifted that restriction.
+        </description>
+      </change>
     </section>
   </release>
   <release version="v4.4.0" date="2018-06-04">

docs/platforms.html.in

@@ -39,7 +39,7 @@
     <ul>
       <li><a href="https://repology.org/metapackage/libvirt/versions">libvirt</a></li>
       <li><a href="https://repology.org/metapackage/qemu/versions">qemu</a></li>
-      <li><a href="https://repology.org/metapackage/qemu/versions">qemu-kvm</a></li>
+      <li><a href="https://repology.org/metapackage/qemu-kvm/versions">qemu-kvm</a></li>
     </ul>
 
 

docs/schemas/basictypes.rng

@@ -65,6 +65,17 @@
       </data>
     </choice>
   </define>
+  <define name="uint32">
+    <choice>
+      <data type="string">
+        <param name="pattern">(0x)?[0-9a-fA-F]{1,8}</param>
+      </data>
+      <data type="unsignedInt">
+        <param name="minInclusive">0</param>
+        <param name="maxInclusive">4294967295</param>
+      </data>
+    </choice>
+  </define>
 
   <define name="UUID">
     <choice>
@@ -111,6 +122,22 @@
       </attribute>
     </optional>
   </define>
+  <define name="zpciaddress">
+    <optional>
+      <element name="zpci">
+        <optional>
+          <attribute name="uid">
+            <ref name="uint16"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="fid">
+            <ref name="uint32"/>
+          </attribute>
+        </optional>
+      </element>
+    </optional>
+  </define>
 
   <!-- a 6 byte MAC address in ASCII-hex format, eg "12:34:56:78:9A:BC" -->
   <!-- The lowest bit of the 1st byte is the "multicast" bit. a         -->
@@ -398,6 +425,8 @@
       <value>ppc64</value>
       <value>ppc64le</value>
       <value>ppcemb</value>
+      <value>riscv32</value>
+      <value>riscv64</value>
       <value>s390</value>
       <value>s390x</value>
       <value>sh4</value>

docs/schemas/capability.rng

@@ -51,6 +51,9 @@
       <optional>
         <ref name='cache'/>
       </optional>
+      <optional>
+        <ref name='memory_bandwidth'/>
+      </optional>
       <zeroOrMore>
         <ref name='secmodel'/>
       </zeroOrMore>
@@ -313,6 +316,9 @@
           </zeroOrMore>
         </element>
       </oneOrMore>
+      <optional>
+        <ref name='cpuMonitor'/>
+      </optional>
     </element>
   </define>
 
@@ -326,6 +332,68 @@
     </attribute>
   </define>
 
+  <define name='memory_bandwidth'>
+    <element name='memory_bandwidth'>
+      <oneOrMore>
+        <element name='node'>
+          <attribute name='id'>
+            <ref name='unsignedInt'/>
+          </attribute>
+          <attribute name='cpus'>
+            <ref name='cpuset'/>
+          </attribute>
+          <zeroOrMore>
+            <element name='control'>
+              <attribute name='granularity'>
+                <ref name='unsignedInt'/>
+              </attribute>
+            <optional>
+              <attribute name='min'>
+                <ref name='unsignedInt'/>
+              </attribute>
+            </optional>
+              <attribute name='maxAllocs'>
+                <ref name='unsignedInt'/>
+              </attribute>
+            </element>
+          </zeroOrMore>
+        </element>
+      </oneOrMore>
+      <optional>
+        <ref name='cpuMonitor'/>
+      </optional>
+    </element>
+  </define>
+
+  <define name='cpuMonitor'>
+    <element name='monitor'>
+      <optional>
+        <attribute name='level'>
+          <ref name='unsignedInt'/>
+        </attribute>
+        <attribute name='reuseThreshold'>
+          <ref name='unsignedInt'/>
+        </attribute>
+      </optional>
+      <attribute name='maxMonitors'>
+        <ref name='unsignedInt'/>
+      </attribute>
+      <oneOrMore>
+        <element name='feature'>
+          <attribute name='name'>
+            <ref name='monitorFeature'/>
+          </attribute>
+        </element>
+      </oneOrMore>
+    </element>
+  </define>
+
+  <define name='monitorFeature'>
+    <data type='string'>
+      <param name='pattern'>(llc_|mbm_)[a-zA-Z0-9\-_]+</param>
+    </data>
+  </define>
+
   <define name='guestcaps'>
     <element name='guest'>
       <ref name='ostype'/>

docs/schemas/domaincommon.rng

@@ -340,13 +340,15 @@
         <attribute name="machine">
           <choice>
             <value>xenpv</value>
-            <value>xenner</value>
+            <value>xenfv</value>
+            <value>xenpvh</value>
           </choice>
         </attribute>
       </optional>
       <choice>
         <value>xen</value>
         <value>linux</value>
+        <value>xenpvh</value>
       </choice>
     </element>
   </define>
@@ -655,6 +657,7 @@
                   <choice>
                     <value>file</value>
                     <value>anonymous</value>
+                    <value>memfd</value>
                   </choice>
                 </attribute>
               </element>
@@ -956,7 +959,7 @@
             <attribute name="vcpus">
               <ref name='cpuset'/>
             </attribute>
-            <oneOrMore>
+            <zeroOrMore>
               <element name="cache">
                 <attribute name="id">
                   <ref name='unsignedInt'/>
@@ -980,6 +983,33 @@
                   </attribute>
                 </optional>
               </element>
+            </zeroOrMore>
+            <zeroOrMore>
+              <element name="monitor">
+                <attribute name="level">
+                  <ref name='unsignedInt'/>
+                </attribute>
+                <attribute name="vcpus">
+                  <ref name='cpuset'/>
+                </attribute>
+              </element>
+            </zeroOrMore>
+          </element>
+        </zeroOrMore>
+        <zeroOrMore>
+          <element name="memorytune">
+            <attribute name="vcpus">
+              <ref name='cpuset'/>
+            </attribute>
+            <oneOrMore>
+              <element name="node">
+                <attribute name="id">
+                  <ref name='unsignedInt'/>
+                </attribute>
+                <attribute name="bandwidth">
+                  <ref name='unsignedInt'/>
+                </attribute>
+              </element>
             </oneOrMore>
           </element>
         </zeroOrMore>
@@ -1528,6 +1558,14 @@
     </optional>
   </define>
 
+  <define name="diskSourceCommon">
+    <optional>
+      <attribute name="index">
+        <ref name="positiveInteger"/>
+      </attribute>
+    </optional>
+  </define>
+
   <define name="diskSource">
     <choice>
       <ref name="diskSourceFile"/>
@@ -1551,6 +1589,7 @@
             <ref name="absFilePath"/>
           </attribute>
         </optional>
+        <ref name="diskSourceCommon"/>
         <optional>
           <ref name="storageStartupPolicy"/>
         </optional>
@@ -1575,6 +1614,7 @@
             <ref name="absFilePath"/>
           </attribute>
         </optional>
+        <ref name="diskSourceCommon"/>
         <optional>
           <ref name="storageStartupPolicy"/>
         </optional>
@@ -1600,6 +1640,7 @@
         <attribute name="dir">
           <ref name="absFilePath"/>
         </attribute>
+        <ref name="diskSourceCommon"/>
         <optional>
           <ref name="storageStartupPolicy"/>
         </optional>
@@ -1653,6 +1694,7 @@
         <attribute name="protocol">
           <value>rbd</value>
         </attribute>
+        <ref name="diskSourceCommon"/>
         <optional>
           <attribute name="name"/>
         </optional>
@@ -1692,6 +1734,7 @@
         <value>iscsi</value>
       </attribute>
       <attribute name="name"/>
+      <ref name="diskSourceCommon"/>
       <ref name="diskSourceNetworkHost"/>
       <optional>
         <ref name="diskAuth"/>
@@ -1699,6 +1742,9 @@
       <optional>
         <ref name="encryption"/>
       </optional>
+      <optional>
+        <ref name="initiatorinfo"/>
+      </optional>
     </element>
   </define>
 
@@ -1711,6 +1757,7 @@
         </choice>
       </attribute>
       <attribute name="name"/>
+      <ref name="diskSourceCommon"/>
       <ref name="diskSourceNetworkHost"/>
       <optional>
         <ref name="encryption"/>
@@ -1729,6 +1776,7 @@
         </choice>
       </attribute>
       <attribute name="name"/>
+      <ref name="diskSourceCommon"/>
       <ref name="diskSourceNetworkHost"/>
       <optional>
         <ref name="encryption"/>
@@ -1749,6 +1797,7 @@
           <ref name="virYesNo"/>
         </attribute>
       </optional>
+      <ref name="diskSourceCommon"/>
       <ref name="diskSourceNetworkHost"/>
       <optional>
         <ref name="encryption"/>
@@ -1762,6 +1811,7 @@
         <value>gluster</value>
       </attribute>
       <attribute name="name"/>
+      <ref name="diskSourceCommon"/>
       <oneOrMore>
         <ref name="diskSourceNetworkHost"/>
       </oneOrMore>
@@ -1779,6 +1829,7 @@
         </choice>
       </attribute>
       <attribute name="name"/>
+      <ref name="diskSourceCommon"/>
       <optional>
         <attribute name="tls">
           <ref name="virYesNo"/>
@@ -1823,6 +1874,7 @@
             </choice>
           </attribute>
         </optional>
+        <ref name="diskSourceCommon"/>
         <optional>
           <ref name="storageStartupPolicy"/>
         </optional>
@@ -3366,6 +3418,9 @@
             </attribute>
           </optional>
         </group>
+        <attribute name="type">
+          <value>egl-headless</value>
+        </attribute>
       </choice>
     </element>
   </define>
@@ -3451,6 +3506,7 @@
                 <value>vbox</value>
                 <value>virtio</value>
                 <value>gop</value>
+                <value>none</value>
               </choice>
             </attribute>
             <group>
@@ -3690,6 +3746,7 @@
           <value>pci-serial</value>
           <value>spapr-vty</value>
           <value>pl011</value>
+          <value>16550a</value>
           <value>sclpconsole</value>
           <value>sclplmconsole</value>
         </choice>
@@ -4234,6 +4291,9 @@
         <optional>
           <ref name="address"/>
         </optional>
+        <optional>
+          <ref name="alias"/>
+        </optional>
       </interleave>
     </element>
   </define>
@@ -4571,8 +4631,14 @@
       <choice>
         <value>vfio-pci</value>
         <value>vfio-ccw</value>
+        <value>vfio-ap</value>
       </choice>
     </attribute>
+    <optional>
+      <attribute name="display">
+        <ref name="virOnOff"/>
+      </attribute>
+    </optional>
     <element name="source">
       <ref name="mdevaddress"/>
     </element>
@@ -4907,6 +4973,16 @@
           <optional>
             <ref name="vmcoreinfo"/>
           </optional>
+          <optional>
+            <element name="htm">
+              <ref name="featurestate"/>
+            </element>
+          </optional>
+          <optional>
+            <element name="nested-hv">
+              <ref name="featurestate"/>
+            </element>
+          </optional>
         </interleave>
       </element>
     </optional>
@@ -5163,6 +5239,7 @@
             <value>pci</value>
           </attribute>
           <ref name="pciaddress"/>
+          <ref name="zpciaddress"/>
         </group>
         <group>
           <attribute name="type">
@@ -5696,6 +5773,31 @@
             </optional>
           </element>
         </optional>
+        <optional>
+          <element name="frequencies">
+            <ref name="featurestate"/>
+          </element>
+        </optional>
+        <optional>
+          <element name="reenlightenment">
+            <ref name="featurestate"/>
+          </element>
+        </optional>
+        <optional>
+          <element name="tlbflush">
+            <ref name="featurestate"/>
+          </element>
+        </optional>
+        <optional>
+          <element name="ipi">
+            <ref name="featurestate"/>
+          </element>
+        </optional>
+        <optional>
+          <element name="evmcs">
+            <ref name="featurestate"/>
+          </element>
+        </optional>
       </interleave>
     </element>
   </define>

docs/schemas/storagecommon.rng

@@ -39,6 +39,17 @@
     </element>
   </define>
 
+  <define name='initiatorinfo'>
+    <element name='initiator'>
+      <element name='iqn'>
+        <attribute name='name'>
+          <text/>
+        </attribute>
+        <empty/>
+      </element>
+    </element>
+  </define>
+
   <define name="reconnect">
     <element name="reconnect">
       <attribute name="enabled">

docs/schemas/storagepool.rng

@@ -18,6 +18,7 @@
         <ref name='poollogical'/>
         <ref name='pooldisk'/>
         <ref name='pooliscsi'/>
+        <ref name='pooliscsidirect'/>
         <ref name='poolscsi'/>
         <ref name='poolmpath'/>
         <ref name='poolrbd'/>
@@ -101,6 +102,19 @@
     </interleave>
   </define>
 
+  <define name='pooliscsidirect'>
+    <attribute name='type'>
+      <value>iscsi-direct</value>
+    </attribute>
+    <interleave>
+      <ref name='commonmetadata'/>
+      <optional>
+        <ref name='sizing'/>
+      </optional>
+      <ref name='sourceiscsidirect'/>
+    </interleave>
+  </define>
+
   <define name='poolscsi'>
     <attribute name='type'>
       <value>scsi</value>
@@ -314,14 +328,11 @@
     </element>
   </define>
 
-  <define name='initiatorinfo'>
-    <element name='initiator'>
-      <element name='iqn'>
-        <attribute name='name'>
-          <text/>
-        </attribute>
-        <empty/>
-      </element>
+  <define name='sourceinfodeviscsidirect'>
+    <element name='device'>
+      <attribute name='path'>
+        <ref name='IscsiQualifiedName'/>
+      </attribute>
     </element>
   </define>
 
@@ -595,6 +606,19 @@
     </element>
   </define>
 
+  <define name='sourceiscsidirect'>
+    <element name='source'>
+      <interleave>
+        <ref name='sourceinfohost'/>
+        <ref name='sourceinfodeviscsidirect'/>
+        <ref name='initiatorinfo'/>
+        <optional>
+          <ref name='sourceinfoauth'/>
+        </optional>
+      </interleave>
+    </element>
+  </define>
+
   <define name='sourcescsi'>
     <element name='source'>
       <interleave>

docs/schemas/storagevol.rng

@@ -139,6 +139,7 @@
         </element>
         <ref name='format'/>
         <ref name='permissions'/>
+        <ref name='timestamps'/>
       </interleave>
     </element>
   </define>

docs/storage.html.in

@@ -310,7 +310,7 @@
       on the size and placement of volumes. The 'free extents'
       information will detail the regions which are available for creating
       new volumes. A volume cannot span across 2 different free extents.
-      It will default to using <code>msdos</code> as the pool source format.
+      It will default to using <code>dos</code> as the pool source format.
     </p>
 
     <h3>Example pool input</h3>
@@ -357,8 +357,10 @@
       </li>
     </ul>
     <p>
-      The <code>dos</code> or <code>gpt</code> formats are recommended for
-      best portability - the latter is needed for disks larger than 2TB.
+      The formats <code>dos</code> ("msdos" in parted terminology,
+      good for BIOS systems) or <code>gpt</code> (good for UEFI
+      systems) are recommended for best portability - the latter is
+      needed for disks larger than 2TB.
     </p>
 
     <h3>Valid volume format types</h3>
@@ -433,6 +435,36 @@
       The iSCSI volume pool does not use the volume format type element.
     </p>
 
+    <h2><a id="StorageBackendISCSIDirect">iSCSI direct pool</a></h2>
+    <p>
+      This is a variant of the iSCSI pool. Instead of unsing iscsiadm, it uses
+      libiscsi.
+      It require a host, a path which is the target iqn and an initiator iqn.
+    </p>
+
+    <h3>Example pool input</h3>
+    <pre>
+&lt;pool type="iscsi-direct"&gt;
+  &lt;name&gt;virtimages&lt;/name&gt;
+  &lt;source&gt;
+    &lt;host name="iscsi.example.com"/&gt;
+    &lt;device path="iqn.2013-06.com.example:iscsi-pool"/&gt;
+    &lt;initiator&gt;
+      &lt;iqn name="iqn.2013-06.com.example:iscsi-initiator"/&gt;
+    &lt;/initiator&gt;
+  &lt;/source&gt;
+&lt;/pool&gt;</pre>
+
+    <h3>Valid pool format types</h3>
+    <p>
+      The iSCSI volume pool does not use the pool format type element.
+    </p>
+
+    <h3>Valid volume format types</h3>
+    <p>
+      The iSCSI volume pool does not use the volume format type element.
+    </p>
+
     <h2><a id="StorageBackendSCSI">SCSI pool</a></h2>
     <p>
       This provides a pool based on a SCSI HBA. Volumes are preexisting SCSI

examples/Makefile.am

@@ -94,7 +94,11 @@ install-apparmor-local:
 	$(MKDIR_P) "$(APPARMOR_LOCAL_DIR)"
 	echo "# Site-specific additions and overrides for \
 		'usr.lib.libvirt.virt-aa-helper'" \
-		>$(APPARMOR_LOCAL_DIR)/usr.lib.libvirt.virt-aa-helper
+		>"$(APPARMOR_LOCAL_DIR)/usr.lib.libvirt.virt-aa-helper"
+
+uninstall-apparmor-local:
+	rm -f "$(APPARMOR_LOCAL_DIR)/usr.lib.libvirt.virt-aa-helper"
+	rmdir "$(APPARMOR_LOCAL_DIR)" || :
 
 INSTALL_DATA_LOCAL += install-apparmor-local
 UNINSTALL_LOCAL += uninstall-apparmor-local

examples/apparmor/libvirt-qemu

@@ -180,6 +180,19 @@
   # for rbd
   /etc/ceph/ceph.conf r,
 
+  # Various functions will need to enumerate /tmp (e.g. ceph), allow the base
+  # dir and a few known functions like samba support.
+  # We want to avoid to give blanket rw permission to everything under /tmp,
+  # users are expected to add site specific addons for more uncommon cases.
+  # Qemu processes usually all run as the same users, so the "owner"
+  # restriction prevents access to other services files, but not across
+  # different instances.
+  # This is a tradeoff between usability and security - if paths would be more
+  # predictable that would be preferred - at least for write rules we would
+  # want more unique paths per rule.
+  /{,var/}tmp/ r,
+  owner /{,var/}tmp/**/ r,
+
   # for file-posix getting limits since 9103f1ce
   /sys/devices/**/block/*/queue/max_segments r,
 
@@ -188,6 +201,9 @@
   @{PROC}/device-tree/** r,
   /sys/firmware/devicetree/** r,
 
+  # allow connect with openGraphicsFD to work
+  unix (send, receive) type=stream addr=none peer=(label=/usr/sbin/libvirtd),
+
   # for gathering information about available host resources
   /sys/devices/system/cpu/ r,
   /sys/devices/system/node/ r,

examples/apparmor/usr.lib.libvirt.virt-aa-helper

@@ -50,7 +50,7 @@ profile virt-aa-helper /usr/{lib,lib64}/libvirt/virt-aa-helper {
   @{HOME}/** r,
   /var/lib/libvirt/images/ r,
   /var/lib/libvirt/images/** r,
-  /var/lib/nova/instances/_base/* r
+  /var/lib/nova/instances/_base/* r,
   /{media,mnt,opt,srv}/** r,
   # For virt-sandbox
   /{,var/}run/libvirt/**/[sv]d[a-z] r,

examples/apparmor/usr.sbin.libvirtd

@@ -33,17 +33,11 @@
   mount options=(rw,rslave)  -> /,
   mount options=(rw, nosuid) -> /{var/,}run/libvirt/qemu/*.dev/,
 
-  mount options=(rw, move) /dev/           -> /{var/,}run/libvirt/qemu/*.dev/,
-  mount options=(rw, move) /dev/hugepages/ -> /{var/,}run/libvirt/qemu/*.hugepages/,
-  mount options=(rw, move) /dev/mqueue/    -> /{var/,}run/libvirt/qemu/*.mqueue/,
-  mount options=(rw, move) /dev/pts/       -> /{var/,}run/libvirt/qemu/*.pts/,
-  mount options=(rw, move) /dev/shm/       -> /{var/,}run/libvirt/qemu/*.shm/,
-
-  mount options=(rw, move) /{var/,}run/libvirt/qemu/*.dev/       -> /dev/,
-  mount options=(rw, move) /{var/,}run/libvirt/qemu/*.hugepages/ -> /dev/hugepages/,
-  mount options=(rw, move) /{var/,}run/libvirt/qemu/*.mqueue/    -> /dev/mqueue/,
-  mount options=(rw, move) /{var/,}run/libvirt/qemu/*.pts/       -> /dev/pts/,
-  mount options=(rw, move) /{var/,}run/libvirt/qemu/*.shm/       -> /dev/shm/,
+  # libvirt provides any mounts under /dev to qemu namespaces
+  mount options=(rw, move) /dev/ -> /{,var/}run/libvirt/qemu/*.dev/,
+  mount options=(rw, move) /dev/** -> /{,var/}run/libvirt/qemu/*{,/},
+  mount options=(rw, move) /{,var/}run/libvirt/qemu/*.dev/ -> /dev/,
+  mount options=(rw, move) /{,var/}run/libvirt/qemu/*{,/} -> /dev/**,
 
   network inet stream,
   network inet dgram,
@@ -56,10 +50,10 @@
   # for --p2p migrations
   unix (send, receive) type=stream addr=none peer=(label=unconfined addr=none),
 
-  ptrace (trace) peer=unconfined,
-  ptrace (trace) peer=/usr/sbin/libvirtd,
-  ptrace (trace) peer=/usr/sbin/dnsmasq,
-  ptrace (trace) peer=libvirt-*,
+  ptrace (read,trace) peer=unconfined,
+  ptrace (read,trace) peer=/usr/sbin/libvirtd,
+  ptrace (read,trace) peer=/usr/sbin/dnsmasq,
+  ptrace (read,trace) peer=libvirt-*,
 
   signal (send) peer=/usr/sbin/dnsmasq,
   signal (read, send) peer=libvirt-*,
@@ -69,6 +63,14 @@
   unix (send, receive) type=stream addr=none peer=(label=/usr/sbin/libvirtd//qemu_bridge_helper),
   signal (send) set=("term") peer=/usr/sbin/libvirtd//qemu_bridge_helper,
 
+  # allow connect with openGraphicsFD, direction reversed in newer versions
+  unix (send, receive) type=stream addr=none peer=(label=libvirt-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*),
+  # unconfined also required if guests run without security module
+  unix (send, receive) type=stream addr=none peer=(label=unconfined),
+
+  # required if guests run unconfined seclabel type='none' but libvirtd is confined
+  signal (read, send) peer=unconfined,
+
   # Very lenient profile for libvirtd since we want to first focus on confining
   # the guests. Guests will have a very restricted profile.
   / r,

examples/hellolibvirt/hellolibvirt.c

@@ -2,8 +2,6 @@
  * hypervisor and gather a few bits of information about domains.
  * Similar API's exist for storage pools, networks, and interfaces. */
 
-#include <config.h>
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <libvirt/libvirt.h>

examples/openauth/openauth.c

@@ -1,8 +1,6 @@
 /* This is a copy of the hellolibvirt example demonstaring how to use
  * virConnectOpenAuth with a custom auth callback */
 
-#include <config.h>
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

examples/systemtap/lock-debug.stp

@@ -11,7 +11,7 @@
 # Document usage with uninstalled daemon and libs. Assuming CWD is toplevel
 # source git directory, it should be only slight modification to the following:
 #
-#     ./run stap --ldd -c daemon/libvirtd -d daemon/libvirtd
+#     ./run stap --ldd -c src/libvirtd -d src/libvirtd
 #       examples/systemtap/lock-debug.stp src/.libs/libvirt.so
 #
 # Debug RWLock mechanisms as well.

examples/xml/nwfilter/clean-traffic-gateway.xml

@@ -0,0 +1,34 @@
+<filter name='clean-traffic-gateway'>
+    <!-- An example of a traffic filter enforcing clean traffic
+            from a VM by
+              - preventing MAC spoofing -->
+    <filterref filter='no-mac-spoofing'/>
+
+    <!-- preventing IP spoofing on outgoing -->
+    <filterref filter='no-ip-spoofing'/>
+
+    <!-- preventing ARP spoofing/poisoning -->
+    <filterref filter='no-arp-spoofing'/>
+
+    <!-- accept all other incoming and outgoing ARP traffic -->
+    <rule action='accept' direction='inout' priority='-500'>
+        <mac protocolid='arp'/>
+    </rule>
+
+    <!-- accept traffic only from specified MAC address -->
+    <rule action='accept' direction='in'>
+        <mac match='yes' srcmacaddr='$GATEWAY_MAC'/>
+    </rule>
+
+    <!-- allow traffic only to specified MAC address -->
+    <rule action='accept' direction='out'>
+        <mac match='yes' dstmacaddr='$GATEWAY_MAC'/>
+    </rule>
+
+    <!-- preventing any other traffic than between specified MACs
+    and ARP -->
+    <filterref filter='no-other-l2-traffic'/>
+
+    <!-- allow qemu to send a self-announce upon migration end -->
+    <filterref filter='qemu-announce-self'/>
+</filter>

include/libvirt/libvirt-domain.h

@@ -145,6 +145,8 @@ typedef enum {
     VIR_DOMAIN_SHUTOFF_FAILED = 6,      /* domain failed to start */
     VIR_DOMAIN_SHUTOFF_FROM_SNAPSHOT = 7, /* restored from a snapshot which was
                                            * taken while domain was shutoff */
+    VIR_DOMAIN_SHUTOFF_DAEMON = 8,      /* daemon decides to kill domain
+                                           during reconnection processing */
 # ifdef VIR_ENUM_SENTINELS
     VIR_DOMAIN_SHUTOFF_LAST
 # endif
@@ -628,11 +630,18 @@ typedef enum {
     /* Timestamp of the last update of statistics, in seconds. */
     VIR_DOMAIN_MEMORY_STAT_LAST_UPDATE     = 9,
 
+    /*
+     * The amount of memory, that can be quickly reclaimed without
+     * additional I/O (in kB). Typically these pages are used for caching files
+     * from disk.
+     */
+    VIR_DOMAIN_MEMORY_STAT_DISK_CACHES     = 10,
+
     /*
      * The number of statistics supported by this version of the interface.
      * To add new statistics, add them to the enum and increase this value.
      */
-    VIR_DOMAIN_MEMORY_STAT_NR              = 10,
+    VIR_DOMAIN_MEMORY_STAT_NR              = 11,
 
 # ifdef VIR_ENUM_SENTINELS
     VIR_DOMAIN_MEMORY_STAT_LAST = VIR_DOMAIN_MEMORY_STAT_NR
@@ -1904,6 +1913,50 @@ int                  virDomainDelIOThread(virDomainPtr domain,
                                           unsigned int iothread_id,
                                           unsigned int flags);
 
+/* IOThread set parameters */
+
+/**
+ * VIR_DOMAIN_IOTHREAD_POLL_MAX_NS:
+ *
+ * The maximum polling time that can be used by polling algorithm in ns.
+ * The polling time starts at 0 (zero) and is the time spent by the guest
+ * to process IOThread data before returning the CPU to the host. The
+ * polling time will be dynamically modified over time based on the
+ * poll_grow and poll_shrink parameters provided. A value set too large
+ * will cause more CPU time to be allocated the guest. A value set too
+ * small will not provide enough cycles for the guest to process data.
+ * The polling interval is not available for statistical purposes.
+ */
+# define VIR_DOMAIN_IOTHREAD_POLL_MAX_NS "poll_max_ns"
+
+/**
+ * VIR_DOMAIN_IOTHREAD_POLL_GROW:
+ *
+ * This provides a value for the dynamic polling adjustment algorithm to
+ * use to grow its polling interval up to the poll_max_ns value. A value
+ * of 0 (zero) allows the hypervisor to choose its own value. The algorithm
+ * to use for adjustment is hypervisor specific.
+ */
+# define VIR_DOMAIN_IOTHREAD_POLL_GROW "poll_grow"
+
+/**
+ * VIR_DOMAIN_IOTHREAD_POLL_SHRINK:
+ *
+ * This provides a value for the dynamic polling adjustment algorithm to
+ * use to shrink its polling interval when the polling interval exceeds
+ * the poll_max_ns value. A value of 0 (zero) allows the hypervisor to
+ * choose its own value. The algorithm to use for adjustment is hypervisor
+ * specific.
+ */
+# define VIR_DOMAIN_IOTHREAD_POLL_SHRINK "poll_shrink"
+
+int                  virDomainSetIOThreadParams(virDomainPtr domain,
+                                                unsigned int iothread_id,
+                                                virTypedParameterPtr params,
+                                                int nparams,
+                                                unsigned int flags);
+
+
 /**
  * VIR_USE_CPU:
  * @cpumap: pointer to a bit map of real CPUs (in 8-bit bytes) (IN/OUT)
@@ -2041,6 +2094,7 @@ typedef enum {
     VIR_DOMAIN_STATS_INTERFACE = (1 << 4), /* return domain interfaces info */
     VIR_DOMAIN_STATS_BLOCK = (1 << 5), /* return domain block info */
     VIR_DOMAIN_STATS_PERF = (1 << 6), /* return domain perf event info */
+    VIR_DOMAIN_STATS_IOTHREAD = (1 << 7), /* return iothread poll info */
 } virDomainStatsTypes;
 
 typedef enum {

libvirt.spec.in

@@ -3,8 +3,8 @@
 # This spec file assumes you are building on a Fedora or RHEL version
 # that's still supported by the vendor. It may work on other distros
 # or versions, but no effort will be made to ensure that going forward.
-%define min_rhel 6
-%define min_fedora 26
+%define min_rhel 7
+%define min_fedora 28
 
 %if (0%{?fedora} && 0%{?fedora} >= %{min_fedora}) || (0%{?rhel} && 0%{?rhel} >= %{min_rhel})
     %define supported_platform 1
@@ -34,10 +34,7 @@
 
 %if 0%{?rhel}
     %define with_qemu_tcg 0
-    %define qemu_kvm_arches x86_64
-    %if 0%{?rhel} >= 7
-        %define qemu_kvm_arches x86_64 %{power64} aarch64 s390x
-    %endif
+    %define qemu_kvm_arches x86_64 %{power64} aarch64 s390x
 %endif
 
 %ifarch %{qemu_kvm_arches}
@@ -58,11 +55,7 @@
 %define with_hyperv        0%{!?_without_hyperv:1}
 
 # Then the secondary host drivers, which run inside libvirtd
-%if 0%{?fedora} || 0%{?rhel} >= 7
-    %define with_storage_rbd      0%{!?_without_storage_rbd:1}
-%else
-    %define with_storage_rbd      0
-%endif
+%define with_storage_rbd      0%{!?_without_storage_rbd:1}
 %if 0%{?fedora}
     %define with_storage_sheepdog 0%{!?_without_storage_sheepdog:1}
 %else
@@ -78,18 +71,22 @@
     %define with_storage_zfs      0
 %endif
 
+# We need a recent enough libiscsi (>= 1.18.0)
+%if 0%{?fedora} || 0%{?rhel} > 7
+    %define with_storage_iscsi_direct 0%{!?_without_storage_iscsi_direct:1}
+%else
+    %define with_storage_iscsi_direct 0
+%endif
+
 # A few optional bits off by default, we enable later
 %define with_fuse          0%{!?_without_fuse:0}
-%define with_cgconfig      0%{!?_without_cgconfig:0}
 %define with_sanlock       0%{!?_without_sanlock:0}
-%define with_systemd       0%{!?_without_systemd:0}
 %define with_numad         0%{!?_without_numad:0}
 %define with_firewalld     0%{!?_without_firewalld:0}
 %define with_libssh2       0%{!?_without_libssh2:0}
 %define with_wireshark     0%{!?_without_wireshark:0}
 %define with_libssh        0%{!?_without_libssh:0}
 %define with_bash_completion  0%{!?_without_bash_completion:0}
-%define with_pm_utils      1
 
 # Finally set the OS / architecture specific special cases
 
@@ -103,27 +100,13 @@
     %define with_vbox 0
 %endif
 
-# Numactl is not available on s390[x] and ARM
-%ifarch s390 s390x %{arm}
+# Numactl is not available on many non-x86 archs
+%ifarch s390 s390x %{arm} riscv64
     %define with_numactl 0
 %endif
 
-# libgfapi is built only on x86_64 on rhel
-%ifnarch x86_64
-    %if 0%{?rhel}
-        %define with_storage_gluster 0
-    %endif
-%endif
-
-# librados and librbd are built only on x86_64 on rhel
-%ifnarch x86_64
-    %if 0%{?rhel} >= 7
-        %define with_storage_rbd 0
-    %endif
-%endif
-
 # zfs-fuse is not available on some architectures
-%ifarch s390 s390x aarch64
+%ifarch s390 s390x aarch64 riscv64
     %define with_storage_zfs 0
 %endif
 
@@ -147,20 +130,10 @@
     %endif
 %endif
 
-# Fedora 17 / RHEL-7 are first where we use systemd. Although earlier
-# Fedora has systemd, libvirt still used sysvinit there.
-%if 0%{?fedora} || 0%{?rhel} >= 7
-    %define with_systemd 1
-    %define with_pm_utils 0
-%endif
-
-# Fedora 18 / RHEL-7 are first where firewalld support is enabled
-%if 0%{?fedora} || 0%{?rhel} >= 7
-    %define with_firewalld 1
-%endif
+%define with_firewalld 1
 
 # fuse is used to provide virtualized /proc for LXC
-%if %{with_lxc} && 0%{?rhel} != 6
+%if %{with_lxc}
     %define with_fuse      0%{!?_without_fuse:1}
 %endif
 
@@ -195,10 +168,7 @@
     %define with_libssh 0%{!?_without_libssh:1}
 %endif
 
-# Enable bash-completion for new enough distros
-%if 0%{?fedora} || 0%{?rhel} >= 7
-    %define with_bash_completion  0%{!?_without_bash_completion:1}
-%endif
+%define with_bash_completion  0%{!?_without_bash_completion:1}
 
 # Use Python 3 when possible, Python 2 otherwise
 %if 0%{?fedora} || 0%{?rhel} > 7
@@ -210,29 +180,17 @@
 
 %if %{with_qemu} || %{with_lxc} || %{with_uml}
 # numad is used to manage the CPU and memory placement dynamically,
-# it's not available on s390[x] and ARM.
-    %ifnarch s390 s390x %{arm}
+# it's not available on many non-x86 architectures.
+    %ifnarch s390 s390x %{arm} riscv64
         %define with_numad    0%{!?_without_numad:1}
     %endif
 %endif
 
-# Pull in cgroups config system
-%if %{with_qemu} || %{with_lxc}
-    %define with_cgconfig 0%{!?_without_cgconfig:1}
-%endif
-
 # Force QEMU to run as non-root
 %define qemu_user  qemu
 %define qemu_group  qemu
 
 
-%if 0%{?fedora} || 0%{?rhel} >= 7
-    %define with_systemd_macros 1
-%else
-    %define with_systemd_macros 0
-%endif
-
-
 # RHEL releases provide stable tool chains and so it is safe to turn
 # compiler warning into errors without being worried about frequent
 # changes in reported warnings
@@ -242,10 +200,10 @@
     %define enable_werror --disable-werror
 %endif
 
-%if 0%{?fedora}
-    %define tls_priority "@LIBVIRT,SYSTEM"
-%else
+%if 0%{?rhel} == 7
     %define tls_priority "NORMAL"
+%else
+    %define tls_priority "@LIBVIRT,SYSTEM"
 %endif
 
 
@@ -300,15 +258,13 @@ BuildRequires: /usr/bin/pod2man
 %endif
 BuildRequires: gcc
 BuildRequires: git
-%if 0%{?fedora} >= 27 || 0%{?rhel} > 7
+%if 0%{?fedora} || 0%{?rhel} > 7
 BuildRequires: perl-interpreter
 %else
 BuildRequires: perl
 %endif
 BuildRequires: %{python}
-%if %{with_systemd}
 BuildRequires: systemd-units
-%endif
 %if %{with_libxl}
 BuildRequires: xen-devel
 %endif
@@ -321,47 +277,29 @@ BuildRequires: bash-completion >= 2.0
 BuildRequires: ncurses-devel
 BuildRequires: gettext
 BuildRequires: libtasn1-devel
-%if (0%{?rhel} && 0%{?rhel} < 7)
-BuildRequires: libgcrypt-devel
-%endif
 BuildRequires: gnutls-devel
 BuildRequires: libattr-devel
 # For pool-build probing for existing pools
 BuildRequires: libblkid-devel >= 2.17
 # for augparse, optionally used in testing
 BuildRequires: augeas
-%if 0%{?fedora} || 0%{?rhel} >= 7
 BuildRequires: systemd-devel >= 185
-%else
-BuildRequires: libudev-devel >= 145
-%endif
 BuildRequires: libpciaccess-devel >= 0.10.9
 BuildRequires: yajl-devel
 %if %{with_sanlock}
 BuildRequires: sanlock-devel >= 2.4
 %endif
 BuildRequires: libpcap-devel
-%if 0%{?rhel} && 0%{?rhel} < 7
-BuildRequires: libnl-devel
-%else
 BuildRequires: libnl3-devel
-%endif
 BuildRequires: avahi-devel
 BuildRequires: libselinux-devel
 BuildRequires: dnsmasq >= 2.41
 BuildRequires: iptables
-%if 0%{?rhel} && 0%{?rhel} < 7
-BuildRequires: iptables-ipv6
-%endif
 BuildRequires: radvd
 BuildRequires: ebtables
 BuildRequires: module-init-tools
 BuildRequires: cyrus-sasl-devel
-%if 0%{?fedora} || 0%{?rhel} >= 7
 BuildRequires: polkit >= 0.112
-%else
-BuildRequires: polkit >= 0.93
-%endif
 # For mount/umount in FS driver
 BuildRequires: util-linux
 %if %{with_qemu}
@@ -372,19 +310,19 @@ BuildRequires: /usr/bin/qemu-img
 %endif
 # For LVM drivers
 BuildRequires: lvm2
-# For ISCSI driver
+# For pool type=iscsi
 BuildRequires: iscsi-initiator-utils
+%if %{with_storage_iscsi_direct}
+# For pool type=iscsi-direct
+BuildRequires: libiscsi-devel
+%endif
 # For disk driver
 BuildRequires: parted-devel
 # For Multipath support
 BuildRequires: device-mapper-devel
 %if %{with_storage_rbd}
-    %if 0%{?fedora} || 0%{?rhel} >= 7
 BuildRequires: librados2-devel
 BuildRequires: librbd1-devel
-    %else
-BuildRequires: ceph-devel
-    %endif
 %endif
 %if %{with_storage_gluster}
 BuildRequires: glusterfs-api-devel >= 3.4.1
@@ -411,11 +349,7 @@ BuildRequires: fuse-devel >= 2.8.6
 BuildRequires: libssh2-devel >= 1.3.0
 %endif
 
-%if 0%{?fedora} || 0%{?rhel} >= 7
 BuildRequires: netcf-devel >= 0.2.2
-%else
-BuildRequires: netcf-devel >= 0.1.8
-%endif
 %if %{with_esx}
 BuildRequires: libcurl-devel
 %endif
@@ -452,7 +386,7 @@ BuildRequires: wireshark-devel >= 2.1.0
 BuildRequires: libssh-devel >= 0.7.0
 %endif
 
-%if 0%{?fedora} > 27 || 0%{?rhel} > 7
+%if 0%{?fedora} || 0%{?rhel} > 7
 BuildRequires: rpcgen
 BuildRequires: libtirpc-devel
 %endif
@@ -491,25 +425,16 @@ Requires: iproute-tc
 %endif
 
 Requires: avahi-libs
-%if 0%{?fedora} || 0%{?rhel} >= 7
 Requires: polkit >= 0.112
-%else
-Requires: polkit >= 0.93
-%endif
-%if %{with_cgconfig}
-Requires: libcgroup
-%endif
 %ifarch %{ix86} x86_64 ia64
 # For virConnectGetSysinfo
 Requires: dmidecode
 %endif
 # For service management
-%if %{with_systemd}
 Requires(post): systemd-units
 Requires(post): systemd-sysv
 Requires(preun): systemd-units
 Requires(postun): systemd-units
-%endif
 %if %{with_numad}
 Requires: numad
 %endif
@@ -544,12 +469,10 @@ Network filter configuration files for cleaning guest traffic
 %package daemon-driver-network
 Summary: Network driver plugin for the libvirtd daemon
 Requires: libvirt-daemon = %{version}-%{release}
+Requires: libvirt-libs = %{version}-%{release}
 Requires: dnsmasq >= 2.41
 Requires: radvd
 Requires: iptables
-%if 0%{?rhel} && 0%{?rhel} < 7
-Requires: iptables-ipv6
-%endif
 
 %description daemon-driver-network
 The network driver plugin for the libvirtd daemon, providing
@@ -560,10 +483,8 @@ bridge capabilities.
 %package daemon-driver-nwfilter
 Summary: Nwfilter driver plugin for the libvirtd daemon
 Requires: libvirt-daemon = %{version}-%{release}
+Requires: libvirt-libs = %{version}-%{release}
 Requires: iptables
-%if 0%{?rhel} && 0%{?rhel} < 7
-Requires: iptables-ipv6
-%endif
 Requires: ebtables
 
 %description daemon-driver-nwfilter
@@ -575,12 +496,9 @@ iptables and ip6tables capabilities
 %package daemon-driver-nodedev
 Summary: Nodedev driver plugin for the libvirtd daemon
 Requires: libvirt-daemon = %{version}-%{release}
+Requires: libvirt-libs = %{version}-%{release}
 # needed for device enumeration
-%if 0%{?fedora} || 0%{?rhel} >= 7
 Requires: systemd >= 185
-%else
-Requires: udev >= 145
-%endif
 
 %description daemon-driver-nodedev
 The nodedev driver plugin for the libvirtd daemon, providing
@@ -591,9 +509,8 @@ capabilities.
 %package daemon-driver-interface
 Summary: Interface driver plugin for the libvirtd daemon
 Requires: libvirt-daemon = %{version}-%{release}
-%if (0%{?fedora} || 0%{?rhel} >= 7)
+Requires: libvirt-libs = %{version}-%{release}
 Requires: netcf-libs >= 0.2.2
-%endif
 
 %description daemon-driver-interface
 The interface driver plugin for the libvirtd daemon, providing
@@ -604,6 +521,7 @@ netcf library
 %package daemon-driver-secret
 Summary: Secret driver plugin for the libvirtd daemon
 Requires: libvirt-daemon = %{version}-%{release}
+Requires: libvirt-libs = %{version}-%{release}
 
 %description daemon-driver-secret
 The secret driver plugin for the libvirtd daemon, providing
@@ -612,6 +530,7 @@ an implementation of the secret key APIs.
 %package daemon-driver-storage-core
 Summary: Storage driver plugin including base backends for the libvirtd daemon
 Requires: libvirt-daemon = %{version}-%{release}
+Requires: libvirt-libs = %{version}-%{release}
 Requires: nfs-utils
 # For mkfs
 Requires: util-linux
@@ -628,6 +547,7 @@ iSCSI, and multipath storage.
 %package daemon-driver-storage-logical
 Summary: Storage driver plugin for lvm volumes
 Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
+Requires: libvirt-libs = %{version}-%{release}
 Requires: lvm2
 
 %description daemon-driver-storage-logical
@@ -638,6 +558,7 @@ volumes using lvm.
 %package daemon-driver-storage-disk
 Summary: Storage driver plugin for disk
 Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
+Requires: libvirt-libs = %{version}-%{release}
 Requires: parted
 Requires: device-mapper
 
@@ -649,6 +570,7 @@ volumes using the host disks.
 %package daemon-driver-storage-scsi
 Summary: Storage driver plugin for local scsi devices
 Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
+Requires: libvirt-libs = %{version}-%{release}
 
 %description daemon-driver-storage-scsi
 The storage driver backend adding implementation of the storage APIs for scsi
@@ -658,6 +580,7 @@ host devices.
 %package daemon-driver-storage-iscsi
 Summary: Storage driver plugin for iscsi
 Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
+Requires: libvirt-libs = %{version}-%{release}
 Requires: iscsi-initiator-utils
 
 %description daemon-driver-storage-iscsi
@@ -665,9 +588,23 @@ The storage driver backend adding implementation of the storage APIs for iscsi
 volumes using the host iscsi stack.
 
 
+%if %{with_storage_iscsi_direct}
+%package daemon-driver-storage-iscsi-direct
+Summary: Storage driver plugin for iscsi-direct
+Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
+Requires: libvirt-libs = %{version}-%{release}
+Requires: libiscsi
+
+%description daemon-driver-storage-iscsi-direct
+The storage driver backend adding implementation of the storage APIs for iscsi
+volumes using libiscsi direct connection.
+%endif
+
+
 %package daemon-driver-storage-mpath
 Summary: Storage driver plugin for multipath volumes
 Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
+Requires: libvirt-libs = %{version}-%{release}
 Requires: device-mapper
 
 %description daemon-driver-storage-mpath
@@ -679,6 +616,7 @@ multipath storage using device mapper.
 %package daemon-driver-storage-gluster
 Summary: Storage driver plugin for gluster
 Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
+Requires: libvirt-libs = %{version}-%{release}
     %if 0%{?fedora}
 Requires: glusterfs-client >= 2.0.1
     %endif
@@ -696,6 +634,7 @@ volumes using libgfapi.
 %package daemon-driver-storage-rbd
 Summary: Storage driver plugin for rbd
 Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
+Requires: libvirt-libs = %{version}-%{release}
 
 %description daemon-driver-storage-rbd
 The storage driver backend adding implementation of the storage APIs for rbd
@@ -707,6 +646,7 @@ volumes using the ceph protocol.
 %package daemon-driver-storage-sheepdog
 Summary: Storage driver plugin for sheepdog
 Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
+Requires: libvirt-libs = %{version}-%{release}
 Requires: sheepdog
 
 %description daemon-driver-storage-sheepdog
@@ -719,6 +659,7 @@ sheepdog volumes using.
 %package daemon-driver-storage-zfs
 Summary: Storage driver plugin for ZFS
 Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
+Requires: libvirt-libs = %{version}-%{release}
 # Support any conforming implementation of zfs
 Requires: /sbin/zfs
 Requires: /sbin/zpool
@@ -737,6 +678,9 @@ Requires: libvirt-daemon-driver-storage-logical = %{version}-%{release}
 Requires: libvirt-daemon-driver-storage-scsi = %{version}-%{release}
 Requires: libvirt-daemon-driver-storage-iscsi = %{version}-%{release}
 Requires: libvirt-daemon-driver-storage-mpath = %{version}-%{release}
+%if %{with_storage_iscsi_direct}
+Requires: libvirt-daemon-driver-storage-iscsi-direct = %{version}-%{release}
+%endif
 %if %{with_storage_gluster}
 Requires: libvirt-daemon-driver-storage-gluster = %{version}-%{release}
 %endif
@@ -760,6 +704,7 @@ parted and more.
 %package daemon-driver-qemu
 Summary: QEMU driver plugin for the libvirtd daemon
 Requires: libvirt-daemon = %{version}-%{release}
+Requires: libvirt-libs = %{version}-%{release}
 # There really is a hard cross-driver dependency here
 Requires: libvirt-daemon-driver-network = %{version}-%{release}
 Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
@@ -784,6 +729,7 @@ QEMU
 %package daemon-driver-lxc
 Summary: LXC driver plugin for the libvirtd daemon
 Requires: libvirt-daemon = %{version}-%{release}
+Requires: libvirt-libs = %{version}-%{release}
 # There really is a hard cross-driver dependency here
 Requires: libvirt-daemon-driver-network = %{version}-%{release}
     %if 0%{?fedora} || 0%{?rhel} > 7
@@ -801,6 +747,7 @@ the Linux kernel
 %package daemon-driver-uml
 Summary: Uml driver plugin for the libvirtd daemon
 Requires: libvirt-daemon = %{version}-%{release}
+Requires: libvirt-libs = %{version}-%{release}
 
 %description daemon-driver-uml
 The UML driver plugin for the libvirtd daemon, providing
@@ -813,6 +760,7 @@ User Mode Linux
 %package daemon-driver-vbox
 Summary: VirtualBox driver plugin for the libvirtd daemon
 Requires: libvirt-daemon = %{version}-%{release}
+Requires: libvirt-libs = %{version}-%{release}
 
 %description daemon-driver-vbox
 The vbox driver plugin for the libvirtd daemon, providing
@@ -825,6 +773,7 @@ VirtualBox
 %package daemon-driver-libxl
 Summary: Libxl driver plugin for the libvirtd daemon
 Requires: libvirt-daemon = %{version}-%{release}
+Requires: libvirt-libs = %{version}-%{release}
 Obsoletes: libvirt-daemon-driver-xen < 4.3.0
 
 %description daemon-driver-libxl
@@ -962,10 +911,6 @@ Requires: ncurses
 Requires: gettext
 # Needed by virt-pki-validate script.
 Requires: gnutls-utils
-%if %{with_pm_utils}
-# Needed for probing the power management features of the host.
-Requires: pm-utils
-%endif
 %if %{with_bash_completion}
 Requires: %{name}-bash-completion = %{version}-%{release}
 %endif
@@ -1059,43 +1004,7 @@ Libvirt plugin for NSS for translating domain names into IP addresses.
 
 %prep
 
-%setup -q
-
-# Patches have to be stored in a temporary file because RPM has
-# a limit on the length of the result of any macro expansion;
-# if the string is longer, it's silently cropped
-%{lua:
-    tmp = os.tmpname();
-    f = io.open(tmp, "w+");
-    count = 0;
-    for i, p in ipairs(patches) do
-        f:write(p.."\n");
-        count = count + 1;
-    end;
-    f:close();
-    print("PATCHCOUNT="..count.."\n")
-    print("PATCHLIST="..tmp.."\n")
-}
-
-git init -q
-git config user.name rpm-build
-git config user.email rpm-build
-git config gc.auto 0
-git add .
-git commit -q -a --author 'rpm-build <rpm-build>' \
-           -m '%{name}-%{version} base'
-
-COUNT=$(grep '\.patch$' $PATCHLIST | wc -l)
-if [ $COUNT -ne $PATCHCOUNT ]; then
-    echo "Found $COUNT patches in $PATCHLIST, expected $PATCHCOUNT"
-    exit 1
-fi
-if [ $COUNT -gt 0 ]; then
-    xargs git am <$PATCHLIST || exit 1
-fi
-echo "Applied $COUNT patches"
-rm -f $PATCHLIST
-rm -rf .git
+%autosetup -S git_am
 
 %build
 %if ! %{supported_platform}
@@ -1225,10 +1134,10 @@ exit 1
     %define arg_wireshark --without-wireshark-dissector
 %endif
 
-%if %{with_pm_utils}
-    %define arg_pm_utils --with-pm-utils
+%if %{with_storage_iscsi_direct}
+    %define arg_storage_iscsi_direct --with-storage-iscsi-direct
 %else
-    %define arg_pm_utils --without-pm-utils
+    %define arg_storage_iscsi_direct --without-storage-iscsi-direct
 %endif
 
 %define when  %(date +"%%F-%%T")
@@ -1237,27 +1146,26 @@ exit 1
 %define arg_packager --with-packager="%{who}, %{when}, %{where}"
 %define arg_packager_version --with-packager-version="%{release}"
 
-%if %{with_systemd}
-    %define arg_init_script --with-init-script=systemd
-%else
-    %define arg_init_script --with-init-script=redhat
-%endif
-
-%if 0%{?fedora} || 0%{?rhel} >= 7
-    %define arg_selinux_mount --with-selinux-mount="/sys/fs/selinux"
-%else
-    %define arg_selinux_mount --with-selinux-mount="/selinux"
-%endif
+%define arg_selinux_mount --with-selinux-mount="/sys/fs/selinux"
 
 %if 0%{?fedora}
-    # Nightly firmware repo x86/OVMF
+    # Nightly edk2.git-ovmf-x64
     LOADERS="/usr/share/edk2.git/ovmf-x64/OVMF_CODE-pure-efi.fd:/usr/share/edk2.git/ovmf-x64/OVMF_VARS-pure-efi.fd"
-    # Nightly firmware repo aarch64/AAVMF
+    # Nightly edk2.git-ovmf-ia32
+    LOADERS="$LOADERS:/usr/share/edk2.git/ovmf-ia32/OVMF_CODE-pure-efi.fd:/usr/share/edk2.git/ovmf-ia32/OVMF_VARS-pure-efi.fd"
+    # Nightly edk2.git-aarch64
     LOADERS="$LOADERS:/usr/share/edk2.git/aarch64/QEMU_EFI-pflash.raw:/usr/share/edk2.git/aarch64/vars-template-pflash.raw"
-    # Fedora official x86/OVMF
+    # Nightly edk2.git-arm
+    LOADERS="$LOADERS:/usr/share/edk2.git/arm/QEMU_EFI-pflash.raw:/usr/share/edk2.git/arm/vars-template-pflash.raw"
+
+    # Fedora edk2-ovmf
     LOADERS="$LOADERS:/usr/share/edk2/ovmf/OVMF_CODE.fd:/usr/share/edk2/ovmf/OVMF_VARS.fd"
-    # Fedora official aarch64/AAVMF
+    # Fedora edk2-ovmf-ia32
+    LOADERS="$LOADERS:/usr/share/edk2/ovmf-ia32/OVMF_CODE.fd:/usr/share/edk2/ovmf-ia32/OVMF_VARS.fd"
+    # Fedora edk2-aarch64
     LOADERS="$LOADERS:/usr/share/edk2/aarch64/QEMU_EFI-pflash.raw:/usr/share/edk2/aarch64/vars-template-pflash.raw"
+    # Fedora edk2-arm
+    LOADERS="$LOADERS:/usr/share/edk2/arm/QEMU_EFI-pflash.raw:/usr/share/edk2/arm/vars-template-pflash.raw"
     %define arg_loader_nvram --with-loader-nvram="$LOADERS"
 %endif
 
@@ -1292,6 +1200,7 @@ rm -f po/stamp-po
            --with-storage-fs \
            --with-storage-lvm \
            --with-storage-iscsi \
+           %{?arg_storage_iscsi_direct} \
            --with-storage-scsi \
            --with-storage-disk \
            --with-storage-mpath \
@@ -1319,7 +1228,7 @@ rm -f po/stamp-po
            --with-driver-modules \
            %{?arg_firewalld} \
            %{?arg_wireshark} \
-           %{?arg_pm_utils} \
+           --without-pm-utils \
            --with-nss-plugin \
            %{arg_packager} \
            %{arg_packager_version} \
@@ -1329,7 +1238,7 @@ rm -f po/stamp-po
            %{?arg_loader_nvram} \
            %{?enable_werror} \
            --enable-expensive-tests \
-           %{arg_init_script} \
+           --with-init-script=systemd \
            %{?arg_login_shell}
 make %{?_smp_mflags} V=1
 gzip -9 ChangeLog
@@ -1339,10 +1248,7 @@ rm -fr %{buildroot}
 
 export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/%{name}.spec)
 
-# Avoid using makeinstall macro as it changes prefixes rather than setting
-# DESTDIR. Newer make_install macro would be better but it's not available
-# on RHEL 5, thus we need to expand it here.
-make %{?_smp_mflags} install DESTDIR=%{?buildroot} SYSTEMD_UNIT_DIR=%{_unitdir} V=1
+%make_install %{?_smp_mflags} SYSTEMD_UNIT_DIR=%{_unitdir} V=1
 
 make %{?_smp_mflags} -C examples distclean V=1
 
@@ -1453,93 +1359,25 @@ exit 0
 
 %post daemon
 
-%if %{with_systemd}
-    %if %{with_systemd_macros}
-        %systemd_post virtlockd.socket virtlockd-admin.socket
-        %systemd_post virtlogd.socket virtlogd-admin.socket
-        %systemd_post libvirtd.service
-    %else
-if [ $1 -eq 1 ] ; then
-    # Initial installation
-    /bin/systemctl enable \
-        virtlockd.socket \
-        virtlockd-admin.socket \
-        virtlogd.socket \
-        virtlogd-admin.socket \
-        libvirtd.service >/dev/null 2>&1 || :
-fi
-    %endif
-%else
-    %if %{with_cgconfig}
-# Starting with Fedora 16/RHEL-7, systemd automounts all cgroups,
-# and cgconfig is no longer a necessary service.
-        %if 0%{?rhel} && 0%{?rhel} < 7
-if [ "$1" -eq "1" ]; then
-/sbin/chkconfig cgconfig on
-fi
-        %endif
-    %endif
-
-/sbin/chkconfig --add libvirtd
-/sbin/chkconfig --add virtlogd
-/sbin/chkconfig --add virtlockd
-%endif
+%systemd_post virtlockd.socket virtlockd-admin.socket
+%systemd_post virtlogd.socket virtlogd-admin.socket
+%systemd_post libvirtd.service
 
 # request daemon restart in posttrans
 mkdir -p %{_localstatedir}/lib/rpm-state/libvirt || :
 touch %{_localstatedir}/lib/rpm-state/libvirt/restart || :
 
 %preun daemon
-%if %{with_systemd}
-    %if %{with_systemd_macros}
-        %systemd_preun libvirtd.service
-        %systemd_preun virtlogd.socket virtlogd-admin.socket virtlogd.service
-        %systemd_preun virtlockd.socket virtlockd-admin.socket virtlockd.service
-    %else
-if [ $1 -eq 0 ] ; then
-    # Package removal, not upgrade
-    /bin/systemctl --no-reload disable \
-        libvirtd.service \
-        virtlogd.socket \
-        virtlogd-admin.socket \
-        virtlogd.service \
-        virtlockd.socket \
-        virtlockd-admin.socket \
-        virtlockd.service > /dev/null 2>&1 || :
-    /bin/systemctl stop \
-        libvirtd.service \
-        virtlogd.socket \
-        virtlogd-admin.socket \
-        virtlogd.service \
-        virtlockd.socket \
-        virtlockd-admin.socket \
-        virtlockd.service > /dev/null 2>&1 || :
-fi
-    %endif
-%else
-if [ $1 = 0 ]; then
-    /sbin/service libvirtd stop 1>/dev/null 2>&1
-    /sbin/chkconfig --del libvirtd
-    /sbin/service virtlogd stop 1>/dev/null 2>&1
-    /sbin/chkconfig --del virtlogd
-    /sbin/service virtlockd stop 1>/dev/null 2>&1
-    /sbin/chkconfig --del virtlockd
-fi
-%endif
+%systemd_preun libvirtd.service
+%systemd_preun virtlogd.socket virtlogd-admin.socket virtlogd.service
+%systemd_preun virtlockd.socket virtlockd-admin.socket virtlockd.service
 
 %postun daemon
-%if %{with_systemd}
 /bin/systemctl daemon-reload >/dev/null 2>&1 || :
 if [ $1 -ge 1 ] ; then
     /bin/systemctl reload-or-try-restart virtlockd.service >/dev/null 2>&1 || :
     /bin/systemctl reload-or-try-restart virtlogd.service >/dev/null 2>&1 || :
 fi
-%else
-if [ $1 -ge 1 ]; then
-    /sbin/service virtlockd reload > /dev/null 2>&1 || :
-    /sbin/service virtlogd reload > /dev/null 2>&1 || :
-fi
-%endif
 
 # In upgrade scenario we must explicitly enable virtlockd/virtlogd
 # sockets, if libvirtd is already enabled and start them if
@@ -1547,28 +1385,15 @@ fi
 # guests
 %triggerpostun daemon -- libvirt-daemon < 1.3.0
 if [ $1 -ge 1 ] ; then
-%if %{with_systemd}
     /bin/systemctl is-enabled libvirtd.service 1>/dev/null 2>&1 &&
         /bin/systemctl enable virtlogd.socket virtlogd-admin.socket || :
     /bin/systemctl is-active libvirtd.service 1>/dev/null 2>&1 &&
         /bin/systemctl start virtlogd.socket virtlogd-admin.socket || :
-%else
-    /sbin/chkconfig libvirtd 1>/dev/null 2>&1 &&
-        /sbin/chkconfig virtlogd on || :
-    /sbin/service libvirtd status 1>/dev/null 2>&1 &&
-        /sbin/service virtlogd start || :
-    /sbin/service virtlockd reload > /dev/null 2>&1 || :
-    /sbin/service virtlogd reload > /dev/null 2>&1 || :
-%endif
 fi
 
 %posttrans daemon
 if [ -f %{_localstatedir}/lib/rpm-state/libvirt/restart ]; then
-%if %{with_systemd}
     /bin/systemctl try-restart libvirtd.service >/dev/null 2>&1 || :
-%else
-    /sbin/service libvirtd condrestart > /dev/null 2>&1 || :
-%endif
 fi
 rm -rf %{_localstatedir}/lib/rpm-state/libvirt || :
 
@@ -1616,11 +1441,7 @@ fi
 
 %posttrans daemon-config-network
 if [ -f %{_localstatedir}/lib/rpm-state/libvirt/restart ]; then
-%if %{with_systemd}
     /bin/systemctl try-restart libvirtd.service >/dev/null 2>&1 || :
-%else
-    /sbin/service libvirtd condrestart > /dev/null 2>&1 || :
-%endif
 fi
 rm -rf %{_localstatedir}/lib/rpm-state/libvirt || :
 
@@ -1632,16 +1453,11 @@ touch %{_localstatedir}/lib/rpm-state/libvirt/restart || :
 
 %posttrans daemon-config-nwfilter
 if [ -f %{_localstatedir}/lib/rpm-state/libvirt/restart ]; then
-%if %{with_systemd}
     /bin/systemctl try-restart libvirtd.service >/dev/null 2>&1 || :
-%else
-    /sbin/service libvirtd condrestart > /dev/null 2>&1 || :
-%endif
 fi
 rm -rf %{_localstatedir}/lib/rpm-state/libvirt || :
 
 
-%if %{with_systemd}
 %triggerun -- libvirt < 0.9.4
 %{_bindir}/systemd-sysv-convert --save libvirtd >/dev/null 2>&1 ||:
 
@@ -1651,7 +1467,6 @@ rm -rf %{_localstatedir}/lib/rpm-state/libvirt || :
 # Run these because the SysV package being removed won't do them
 /sbin/chkconfig --del libvirtd >/dev/null 2>&1 || :
 /bin/systemctl try-restart libvirtd.service >/dev/null 2>&1 || :
-%endif
 
 %if %{with_qemu}
 %pre daemon-driver-qemu
@@ -1672,35 +1487,18 @@ exit 0
 
 %preun client
 
-%if %{with_systemd}
-    %if %{with_systemd_macros}
-        %systemd_preun libvirt-guests.service
-    %endif
-%else
-if [ $1 = 0 ]; then
-    /sbin/chkconfig --del libvirt-guests
-    rm -f /var/lib/libvirt/libvirt-guests
-fi
-%endif
+%systemd_preun libvirt-guests.service
 
 %post client
 
 /sbin/ldconfig
-%if %{with_systemd}
-    %if %{with_systemd_macros}
-        %systemd_post libvirt-guests.service
-    %endif
-%else
-/sbin/chkconfig --add libvirt-guests
-%endif
+%systemd_post libvirt-guests.service
 
 %postun client
 
 /sbin/ldconfig
-%if %{with_systemd}
-    %if %{with_systemd_macros}
-        %systemd_postun libvirt-guests.service
-    %endif
+%systemd_postun libvirt-guests.service
+
 %triggerun client -- libvirt < 0.9.4
 %{_bindir}/systemd-sysv-convert --save libvirt-guests >/dev/null 2>&1 ||:
 
@@ -1709,7 +1507,6 @@ fi
 
 # Run this because the SysV package being removed won't do them
 /sbin/chkconfig --del libvirt-guests >/dev/null 2>&1 || :
-%endif
 
 %if %{with_sanlock}
 %post lock-sanlock
@@ -1753,7 +1550,6 @@ exit 0
 
 %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/
 
-%if %{with_systemd}
 %{_unitdir}/libvirtd.service
 %{_unitdir}/virt-guest-shutdown.target
 %{_unitdir}/virtlogd.service
@@ -1762,11 +1558,6 @@ exit 0
 %{_unitdir}/virtlockd.service
 %{_unitdir}/virtlockd.socket
 %{_unitdir}/virtlockd-admin.socket
-%else
-%{_sysconfdir}/rc.d/init.d/libvirtd
-%{_sysconfdir}/rc.d/init.d/virtlogd
-%{_sysconfdir}/rc.d/init.d/virtlockd
-%endif
 %config(noreplace) %{_sysconfdir}/sysconfig/libvirtd
 %config(noreplace) %{_sysconfdir}/sysconfig/virtlogd
 %config(noreplace) %{_sysconfdir}/sysconfig/virtlockd
@@ -1875,6 +1666,11 @@ exit 0
 %files daemon-driver-storage-iscsi
 %{_libdir}/%{name}/storage-backend/libvirt_storage_backend_iscsi.so
 
+%if %{with_storage_iscsi_direct}
+%files daemon-driver-storage-iscsi-direct
+%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_iscsi-direct.so
+%endif
+
 %files daemon-driver-storage-mpath
 %{_libdir}/%{name}/storage-backend/libvirt_storage_backend_mpath.so
 
@@ -2018,17 +1814,11 @@ exit 0
 %endif
 
 
-%if %{with_systemd}
 %{_unitdir}/libvirt-guests.service
-%else
-%{_sysconfdir}/rc.d/init.d/libvirt-guests
-%endif
 %config(noreplace) %{_sysconfdir}/sysconfig/libvirt-guests
 %attr(0755, root, root) %{_libexecdir}/libvirt-guests.sh
 
 %files libs -f %{name}.lang
-# RHEL6 doesn't have 'license' macro
-%{!?_licensedir:%global license %%doc}
 %license COPYING COPYING.LESSER
 %config(noreplace) %{_sysconfdir}/libvirt/libvirt.conf
 %config(noreplace) %{_sysconfdir}/libvirt/libvirt-admin.conf
@@ -2059,7 +1849,7 @@ exit 0
 %{_datadir}/libvirt/schemas/storagepool.rng
 %{_datadir}/libvirt/schemas/storagevol.rng
 
-%{_datadir}/libvirt/cpu_map.xml
+%{_datadir}/libvirt/cpu_map/*.xml
 
 %{_datadir}/libvirt/test-screenshot.png
 

m4/virt-attr.m4

@@ -5,7 +5,7 @@ AC_DEFUN([LIBVIRT_ARG_ATTR],[
 ])
 
 AC_DEFUN([LIBVIRT_CHECK_ATTR],[
-  LIBVIRT_CHECK_LIB([ATTR], [attr], [getxattr], [attr/xattr.h])
+  LIBVIRT_CHECK_LIB([ATTR], [attr], [getxattr], [sys/xattr.h])
 ])
 
 AC_DEFUN([LIBVIRT_RESULT_ATTR],[

m4/virt-driver-libxl.m4

@@ -26,40 +26,34 @@ AC_DEFUN([LIBVIRT_DRIVER_CHECK_LIBXL], [
   LIBXL_CFLAGS=""
   LIBXL_FIRMWARE_DIR=""
   LIBXL_EXECBIN_DIR=""
-  LIBXL_API_VERSION="-DLIBXL_API_VERSION=0x040400"
+  LIBXL_API_VERSION="-DLIBXL_API_VERSION=0x040500"
 
   dnl search for libxl, aka libxenlight
-  dnl Xen > 4.5 introduced a pkgconfig file, check for it first
   old_with_libxl="$with_libxl"
-  LIBVIRT_CHECK_PKG([LIBXL], [xenlight], [4.4.0], [true])
+  LIBVIRT_CHECK_PKG([LIBXL], [xenlight], [4.6.0], [true])
   if test "x$with_libxl" = "xyes" ; then
     LIBXL_FIRMWARE_DIR=$($PKG_CONFIG --variable xenfirmwaredir xenlight)
     LIBXL_EXECBIN_DIR=$($PKG_CONFIG --variable libexec_bin xenlight)
   fi
 
-  dnl pkgconfig file not found, fallback to lib probe
+  dnl In Fedora <= 28, the xenlight pkgconfig file is in the -runtime package
+  dnl https://bugzilla.redhat.com/show_bug.cgi?id=1629643
+  dnl Until Fedora 28 reaches EOL, fallback to lib probe if xenlight.pc is
+  dnl not found
   if test "x$with_libxl" = "xno" ; then
     with_libxl="$old_with_libxl"
 
-    dnl LIBXL_API_VERSION 4.4.0 introduced a new parameter to
-    dnl libxl_domain_create_restore for specifying restore parameters.
-    dnl The libxl driver will make use of this new parameter for specifying
-    dnl the Xen migration stream version. Specify LIBXL_API_VERSION to trigger
-    dnl an error if there is too old xenlight
-    old_CFLAGS="$CFLAGS"
+    save_CFLAGS="$CFLAGS"
     CFLAGS="$CFLAGS $LIBXL_API_VERSION"
-    LIBVIRT_CHECK_LIB([LIBXL], [xenlight], [libxl_ctx_alloc], [libxl.h], [fail="1"])
-    CFLAGS="$old_CFLAGS"
+    LIBVIRT_CHECK_LIB([LIBXL], [xenlight], [libxl_cpupool_cpuadd_cpumap], [libxl.h], [fail="1"])
+    CFLAGS="$save_CFLAGS"
 
     if test $fail = 1; then
-      AC_MSG_ERROR([You must install the libxl Library from Xen >= 4.4 to compile libxenlight driver with -lxl])
+      AC_MSG_ERROR([You must install the libxl Library from Xen >= 4.6 to compile libxenlight driver with -lxl])
     fi
   fi
 
   if test "$with_libxl" = "yes"; then
-    old_LIBS="$LIBS"
-    old_CFLAGS="$CFLAGS"
-
     LIBXL_CFLAGS="$LIBXL_CFLAGS $LIBXL_API_VERSION"
 
     dnl If building with libxl, use the libxl utility header and lib too
@@ -79,15 +73,11 @@ AC_DEFUN([LIBVIRT_DRIVER_CHECK_LIBXL], [
     ],[
       LIBXL_LIBS="$LIBXL_LIBS -lxenstore -lxenctrl"
     ])
-
-    dnl Check if libxl_domain_config_from_json is available for domXML to
-    dnl libxl_domain_config tests
-    LIBS="$LIBS -lxenlight -lxenctrl"
-    AC_CHECK_FUNCS([libxl_domain_config_from_json])
-    CFLAGS="$old_CFLAGS"
-    LIBS="$old_LIBS"
   fi
 
+  dnl Check if Xen has support for PVH
+  AC_CHECK_DECL(LIBXL_DOMAIN_TYPE_PVH, [AC_DEFINE([HAVE_XEN_PVH], [1], [Define to 1 if Xen has PVH support.])], [], [#include <libxl.h>])
+
   AC_SUBST([LIBXL_CFLAGS])
   AC_SUBST([LIBXL_LIBS])
 ])

m4/virt-libiscsi.m4

@@ -0,0 +1,30 @@
+dnl Libiscsi library
+dnl
+dnl Copyright (C) 2018 Clementine Hayat.
+dnl
+dnl This library is free software; you can redistribute it and/or
+dnl modify it under the terms of the GNU Lesser General Public
+dnl License as published by the Free Software Foundation; either
+dnl version 2.1 of the License, or (at your option) any later version.
+dnl
+dnl This library is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+dnl Lesser General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU Lesser General Public
+dnl License along with this library.  If not, see
+dnl <http://www.gnu.org/licenses/>.
+dnl
+
+AC_DEFUN([LIBVIRT_ARG_LIBISCSI],[
+  LIBVIRT_ARG_WITH_FEATURE([LIBISCSI], [libiscsi], [check], [1.18.0])
+])
+
+AC_DEFUN([LIBVIRT_CHECK_LIBISCSI],[
+  LIBVIRT_CHECK_PKG([LIBISCSI], [libiscsi], [1.18.0])
+])
+
+AC_DEFUN([LIBVIRT_RESULT_LIBISCSI],[
+  LIBVIRT_RESULT_LIB(LIBISCSI)
+])

m4/virt-storage-iscsi-direct.m4

@@ -0,0 +1,44 @@
+dnl Iscsi-direct storage
+dnl
+dnl Copyright (C) 2018 Clementine Hayat.
+dnl
+dnl This library is free software; you can redistribute it and/or
+dnl modify it under the terms of the GNU Lesser General Public
+dnl License as published by the Free Software Foundation; either
+dnl version 2.1 of the License, or (at your option) any later version.
+dnl
+dnl This library is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+dnl Lesser General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU Lesser General Public
+dnl License along with this library.  If not, see
+dnl <http://www.gnu.org/licenses/>.
+dnl
+
+AC_DEFUN([LIBVIRT_STORAGE_ARG_ISCSI_DIRECT], [
+  LIBVIRT_ARG_WITH_FEATURE([STORAGE_ISCSI_DIRECT],
+                           [iscsi-direct backend for the storage driver],
+                           [check])
+])
+
+AC_DEFUN([LIBVIRT_STORAGE_CHECK_ISCSI_DIRECT], [
+  AC_REQUIRE([LIBVIRT_CHECK_LIBISCSI])
+  if test "$with_storage_iscsi_direct" = "check"; then
+    with_storage_iscsi_direct=$with_libiscsi
+  fi
+  if test "$with_storage_iscsi_direct" = "yes"; then
+    if test "$with_libiscsi" = "no"; then
+      AC_MSG_ERROR([Need libiscsi for iscsi-direct storage driver])
+    fi
+    AC_DEFINE_UNQUOTED([WITH_STORAGE_ISCSI_DIRECT], [1],
+                       [whether iSCSI backend for storage driver is enabled])
+  fi
+  AM_CONDITIONAL([WITH_STORAGE_ISCSI_DIRECT],
+                 [test "$with_storage_iscsi_direct" = "yes"])
+])
+
+AC_DEFUN([LIBVIRT_STORAGE_RESULT_ISCSI_DIRECT], [
+  LIBVIRT_RESULT([iscsi-direct], [$with_storage_iscsi_direct])
+])

mingw-libvirt.spec.in

@@ -248,6 +248,8 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt-guests.sh
 %{mingw32_datadir}/libvirt/schemas/networkcommon.rng
 %{mingw32_datadir}/libvirt/schemas/nodedev.rng
 %{mingw32_datadir}/libvirt/schemas/nwfilter.rng
+%{mingw32_datadir}/libvirt/schemas/nwfilter_params.rng
+%{mingw32_datadir}/libvirt/schemas/nwfilterbinding.rng
 %{mingw32_datadir}/libvirt/schemas/secret.rng
 %{mingw32_datadir}/libvirt/schemas/storagecommon.rng
 %{mingw32_datadir}/libvirt/schemas/storagepool.rng
@@ -258,7 +260,7 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt-guests.sh
 %{mingw32_datadir}/libvirt/api/libvirt-qemu-api.xml
 %{mingw32_datadir}/libvirt/api/libvirt-admin-api.xml
 
-%{mingw32_datadir}/libvirt/cpu_map.xml
+%{mingw32_datadir}/libvirt/cpu_map/*.xml
 
 %{mingw32_datadir}/libvirt/test-screenshot.png
 
@@ -333,6 +335,8 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt-guests.sh
 %{mingw64_datadir}/libvirt/schemas/networkcommon.rng
 %{mingw64_datadir}/libvirt/schemas/nodedev.rng
 %{mingw64_datadir}/libvirt/schemas/nwfilter.rng
+%{mingw64_datadir}/libvirt/schemas/nwfilter_params.rng
+%{mingw64_datadir}/libvirt/schemas/nwfilterbinding.rng
 %{mingw64_datadir}/libvirt/schemas/secret.rng
 %{mingw64_datadir}/libvirt/schemas/storagecommon.rng
 %{mingw64_datadir}/libvirt/schemas/storagepool.rng
@@ -343,7 +347,7 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt-guests.sh
 %{mingw64_datadir}/libvirt/api/libvirt-qemu-api.xml
 %{mingw64_datadir}/libvirt/api/libvirt-admin-api.xml
 
-%{mingw64_datadir}/libvirt/cpu_map.xml
+%{mingw64_datadir}/libvirt/cpu_map/*.xml
 
 %{mingw64_datadir}/libvirt/test-screenshot.png
 

po/af.mini.po

@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libvirt 4.3.0\n"
+"Project-Id-Version: libvirt 4.10.0\n"
 "Report-Msgid-Bugs-To: https://libvirt.org/bugs.html\n"
-"POT-Creation-Date: 2018-04-24 12:51+0100\n"
+"POT-Creation-Date: 2018-11-28 16:52+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Afrikaans\n"
@@ -16,4 +16,4 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"X-Generator: Zanata 3.9.6\n"
+"X-Generator: Zanata 4.6.2\n"

po/am.mini.po

@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libvirt 4.3.0\n"
+"Project-Id-Version: libvirt 4.10.0\n"
 "Report-Msgid-Bugs-To: https://libvirt.org/bugs.html\n"
-"POT-Creation-Date: 2018-04-24 12:51+0100\n"
+"POT-Creation-Date: 2018-11-28 16:52+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Amharic\n"
@@ -16,4 +16,4 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
-"X-Generator: Zanata 3.9.6\n"
+"X-Generator: Zanata 4.6.2\n"

po/anp.mini.po

@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libvirt 4.3.0\n"
+"Project-Id-Version: libvirt 4.10.0\n"
 "Report-Msgid-Bugs-To: https://libvirt.org/bugs.html\n"
-"POT-Creation-Date: 2018-04-24 12:51+0100\n"
+"POT-Creation-Date: 2018-11-28 16:52+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Angika\n"
@@ -16,4 +16,4 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"X-Generator: Zanata 3.9.6\n"
+"X-Generator: Zanata 4.6.2\n"

po/ar.mini.po

@@ -7,10 +7,10 @@
 # Daniel Berrange <dan-zanata@berrange.com>, 2018. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: libvirt 4.3.0\n"
+"Project-Id-Version: libvirt 4.10.0\n"
 "Report-Msgid-Bugs-To: https://libvirt.org/bugs.html\n"
-"POT-Creation-Date: 2018-04-24 12:51+0100\n"
-"PO-Revision-Date: 2018-04-24 04:33-0400\n"
+"POT-Creation-Date: 2018-11-28 16:52+0000\n"
+"PO-Revision-Date: 2018-04-24 04:33+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/fedora/language/"
 "ar/)\n"
@@ -20,4 +20,4 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
 "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-"X-Generator: Zanata 3.9.6\n"
+"X-Generator: Zanata 4.6.2\n"

po/ast.mini.po

@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libvirt 4.3.0\n"
+"Project-Id-Version: libvirt 4.10.0\n"
 "Report-Msgid-Bugs-To: https://libvirt.org/bugs.html\n"
-"POT-Creation-Date: 2018-04-24 12:51+0100\n"
+"POT-Creation-Date: 2018-11-28 16:52+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Asturian\n"
@@ -16,4 +16,4 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"X-Generator: Zanata 3.9.6\n"
+"X-Generator: Zanata 4.6.2\n"

po/bal.mini.po

@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libvirt 4.3.0\n"
+"Project-Id-Version: libvirt 4.10.0\n"
 "Report-Msgid-Bugs-To: https://libvirt.org/bugs.html\n"
-"POT-Creation-Date: 2018-04-24 12:51+0100\n"
+"POT-Creation-Date: 2018-11-28 16:52+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Baluchi\n"
@@ -16,4 +16,4 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0\n"
-"X-Generator: Zanata 3.9.6\n"
+"X-Generator: Zanata 4.6.2\n"

po/be.mini.po

@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libvirt 4.3.0\n"
+"Project-Id-Version: libvirt 4.10.0\n"
 "Report-Msgid-Bugs-To: https://libvirt.org/bugs.html\n"
-"POT-Creation-Date: 2018-04-24 12:51+0100\n"
+"POT-Creation-Date: 2018-11-28 16:52+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Belarusian\n"
@@ -17,4 +17,4 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
-"X-Generator: Zanata 3.9.6\n"
+"X-Generator: Zanata 4.6.2\n"

po/bg.mini.po

@@ -7,10 +7,10 @@
 # Miroslav Ivanov <kiro.kopeleto@gmail.com>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: libvirt 4.3.0\n"
+"Project-Id-Version: libvirt 4.10.0\n"
 "Report-Msgid-Bugs-To: https://libvirt.org/bugs.html\n"
-"POT-Creation-Date: 2018-04-24 12:51+0100\n"
-"PO-Revision-Date: 2015-02-26 07:16-0500\n"
+"POT-Creation-Date: 2018-11-28 16:52+0000\n"
+"PO-Revision-Date: 2015-02-26 07:16+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Bulgarian (http://www.transifex.com/projects/p/fedora/"
 "language/bg/)\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Zanata 3.9.6\n"
+"X-Generator: Zanata 4.6.2\n"
 
 msgid ""
 "\n"
@@ -702,9 +702,6 @@ msgstr "информацията за домейна е непълна, vbd ня
 msgid "domain name or uuid"
 msgstr "име на домейн или uuid"
 
-msgid "domain name, id or uuid"
-msgstr "име на домейн, id или uuid"
-
 msgid "domain state"
 msgstr "състояние на домейна"
 

po/bn.mini.po

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libvirt 4.3.0\n"
 "Report-Msgid-Bugs-To: https://libvirt.org/bugs.html\n"
-"POT-Creation-Date: 2018-04-24 12:51+0100\n"
-"PO-Revision-Date: 2018-04-24 06:13-0400\n"
+"POT-Creation-Date: 2018-11-28 16:52+0000\n"
+"PO-Revision-Date: 2018-04-24 06:13+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Bengali (http://www.transifex.com/projects/p/fedora/language/"
 "bn/)\n"
@@ -18,4 +18,4 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Zanata 3.9.6\n"
+"X-Generator: Zanata 4.6.2\n"

po/bn_IN.mini.po

@@ -8,19 +8,19 @@
 # runab <runab@redhat.com>, 2006-2010
 msgid ""
 msgstr ""
-"Project-Id-Version: libvirt 4.3.0\n"
+"Project-Id-Version: libvirt 4.10.0\n"
 "Report-Msgid-Bugs-To: https://libvirt.org/bugs.html\n"
-"POT-Creation-Date: 2018-04-24 12:51+0100\n"
-"PO-Revision-Date: 2015-02-26 07:10-0500\n"
+"POT-Creation-Date: 2018-11-28 16:52+0000\n"
+"PO-Revision-Date: 2015-02-26 07:10+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Bengali (India) (http://www.transifex.com/projects/p/libvirt/"
 "language/bn_IN/)\n"
-"Language: bn-IN\n"
+"Language: bn_IN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Zanata 3.9.6\n"
+"X-Generator: Zanata 4.6.2\n"
 
 msgid ""
 "\n"
@@ -191,9 +191,6 @@ msgstr ""
 msgid "'floor' attribute allowed only in <inbound> element"
 msgstr "'floor' অ্যাট্রিবিউট শুধুমাত্র <inbound> উপাদানে অনুমোদিত"
 
-msgid "'info blockstats' not supported by this qemu"
-msgstr "'info blockstats' কমান্ড এই qemu দ্বারা সমর্থিত নয়"
-
 msgid "'peak' and 'burst' require 'average' attribute"
 msgstr "'peak' এবং 'burst' এর 'average' অ্যাট্রিবিউটের প্রয়োজন"
 
@@ -734,10 +731,6 @@ msgstr "ডোমেইনের কোর তথ্য সংরক্ষণ
 msgid "Core(s) per socket:"
 msgstr "প্রতি সকেটে কোর সংখ্যা:"
 
-#, c-format
-msgid "Could not allocate memory for output of '%s'"
-msgstr "'%s'-র আউটপুটের জন্য মেমরি বরাদ্দ করা যায়নি"
-
 msgid "Could not configure network"
 msgstr "নেটওয়ার্ক কনফিগার করতে ব্যর্থ"
 
@@ -834,10 +827,6 @@ msgstr "usb ফাইল %s পার্স করতে ব্যর্থ"
 msgid "Could not parse version number from '%s'"
 msgstr "সংস্করণ নম্বর '%s' থেকে পার্জ করা যায়নি"
 
-#, c-format
-msgid "Could not put variable '%s' into hashmap"
-msgstr "পরিবর্তনশীল '%s' hashmap এ রাখা যায়নি"
-
 #, c-format
 msgid "Could not read 'IP_ADDRESS' from config for container %d"
 msgstr "ধারণকারী %d-র কনফিগ তথ্য থেকে 'IP_ADDRESS' পাঠ করা সম্ভব হয়নি"
@@ -1224,10 +1213,6 @@ msgstr "প্রোফাইল মাইগ্রেট না করতে
 msgid "Failed"
 msgstr "বিফল"
 
-#, c-format
-msgid "Failed module registration %s"
-msgstr "মডিউল নিবন্ধন ব্যর্থ হয়েছে %s"
-
 #, c-format
 msgid "Failed to add PCI device ID '%s' to %s"
 msgstr "PCI ডিভাইসের ID '%s', %s-এ যোগ করতে ব্যর্থ"
@@ -1586,11 +1571,6 @@ msgstr "'%s' ফাইল খুলতে ব্যর্থ"
 msgid "Failed to open storage volume with path '%s'"
 msgstr "'%s' পাথ সহ সংরক্ষণের ভলিউম খুলতে ব্যর্থ"
 
-#, c-format
-msgid ""
-"Failed to open stream for file descriptor when reading output from '%s': '%s'"
-msgstr "'%s' থেকে আউটপুট পড়ার সময় ফাইল ডেসক্রিপ্টরের জন্য স্ট্রিম খুলতে ব্যর্থ: '%s'"
-
 #, c-format
 msgid "Failed to open tty %s"
 msgstr "tty %s খুলতে ব্যর্থ"
@@ -2311,9 +2291,6 @@ msgstr "CPU বৈশিষ্ট্যের নাম অনুপস্থি
 msgid "Missing CPU model name"
 msgstr "CPU-র মডেলের নাম অনুপস্থিত"
 
-msgid "Missing CPU vendor name"
-msgstr "CPU ভেন্ডার নাম অনুপস্থিত"
-
 #, c-format
 msgid "Missing IP address in network '%s' DNS HOST record"
 msgstr "নেটওয়ার্ক '%s' DNS HOST রেকর্ডে IP ঠিকানা অনুপস্থিত"
@@ -2344,10 +2321,6 @@ msgstr "নেটওয়ার্ক '%s' DNS HOST রেকর্ডে ip
 msgid "Missing mandatory average or floor attributes"
 msgstr "বাধ্যতামূলক গড় বা ফ্লোর অ্যাট্রিবিউট অনুপস্থিত"
 
-#, c-format
-msgid "Missing module registration symbol %s"
-msgstr "মডিউল নিবন্ধন সংকেত %s অনুপস্থিত"
-
 msgid "Missing or empty 'hostName' property"
 msgstr "'hostName' বিশিষ্টতা অনুপস্থিত বা খালি"
 
@@ -2369,9 +2342,6 @@ msgstr ""
 msgid "Missing or invalid PVR value in CPU model %s"
 msgstr "CPU মডেল %s এ PVR মান অনুপস্থিত বা অবৈধ"
 
-msgid "Missing or invalid auth pointer"
-msgstr "auth পয়েন্টার হয় অনুপস্থিত বা অবৈধ"
-
 #, c-format
 msgid "Missing required address attribute in network '%s'"
 msgstr "'%s' নেটওয়ার্কে প্রয়োজনীয় ঠিকানা অ্যাট্রিবিউট অনুপস্থিত"
@@ -2393,9 +2363,6 @@ msgstr "portgroup এ প্রয়োজনীয় নাম অ্যা
 msgid "Missing required name or value in DNS TXT record of network %s"
 msgstr "%s নেটওয়ার্কের DNS TXT রেকর্ডে প্রয়োজনীয় নাম বা মান অনুপস্থিত"
 
-msgid "Missing server name in phyp:// URI"
-msgstr "phyp:// URI-র মধ্যে সার্ভারের নাম অনুপস্থিত"
-
 msgid "Missing source host attribute for char device"
 msgstr "ক্যারেক্টার ডিভাইসের ক্ষেত্রে সোর্স হোস্ট বৈশিষ্ট্য অনুপস্থিত"
 
@@ -2549,9 +2516,6 @@ msgstr ""
 msgid "No <source> 'port' attribute specified with socket interface"
 msgstr "সকেট ইন্টার-ফেসের সাথে <source> 'port' বৈশিষ্ট্য উল্লিখিত হয়নি।"
 
-msgid "No CPUs given"
-msgstr "কোনো CPU উল্লিখিত হয়নি"
-
 msgid "No JSON parser implementation is available"
 msgstr "কোনো JSON পার্সারের বাস্তবায়ন উপলব্ধ নেই"
 
@@ -2561,9 +2525,6 @@ msgstr "কোনো UNIX প্রক্রিয়া অাইডি উপ
 msgid "No address associated with hostname"
 msgstr "হোস্টনামের সংগে কোনো ঠিকানা সংশ্লিষ্ট নেই"
 
-msgid "No authentication callback provided."
-msgstr "অনুমোদনের কোনো কল-ব্যাক উপলব্ধ করা হয়নি।"
-
 msgid "No data supplied for <initarg> element"
 msgstr "<initarg> উপাদানের জন্য কোনো ডেটা সরবরাহ করা হয়নি"
 
@@ -2579,17 +2540,9 @@ msgstr "ID %d দিয়ে কোনো ডোমেন নেই"
 msgid "No domain with matching uuid '%s'"
 msgstr "uuid '%s'-র সাথে সুসংগত ডোমেইন অনুপস্থিত"
 
-#, c-format
-msgid "No domain with name '%s'"
-msgstr "'%s'নাম দিয়ে কোনো ডোমেন নেই"
-
 msgid "No error message provided"
 msgstr "কোনো ত্রুটির বার্তা উপস্থিত নেই"
 
-#, c-format
-msgid "No host CPU specified in '%s'"
-msgstr "'%s'-র মধ্যে কোনো হোস্ট CPU নির্ধারণ করা হয়নি"
-
 msgid "No master USB controller specified"
 msgstr "কোনো মাস্টার USB কন্ট্রোলার নির্দিষ্ট করা হয়নি"
 
@@ -3490,9 +3443,6 @@ msgstr "ডোমেইন বর্তমানে সক্রিয় নয়"
 msgid "This host is not managed by a vCenter"
 msgstr "এই হোস্ট একটি vCenter দ্বারা পরিচালিত নয়"
 
-msgid "This libvirtd build does not support TLS"
-msgstr "এই libvirtd বিল্ড TLS সমর্থন করে না"
-
 msgid "This type of device cannot be hot unplugged"
 msgstr "এই ধরনের ডিভাইস হট-আনপ্লাগ করা সম্ভব নয়"
 
@@ -3664,12 +3614,6 @@ msgstr "অপ্রত্যাশিত ডিস্ক sgio মোড '%d'"
 msgid "Unexpected hostdev mode %d"
 msgstr "অপ্রত্যাশিত hostdev মোড %d"
 
-#, c-format
-msgid "Unexpected line > %d characters when parsing output of '%s'"
-msgstr ""
-"%d থেকে বেশি অক্ষর বিশিষ্ট একটি পংক্তি, '%s'-র আউটপুট পার্স করার সময় "
-"অপ্রত্যাশিতভাবে প্রাপ্ত হয়েছে"
-
 #, c-format
 msgid "Unix path %s too long for destination"
 msgstr "গন্তব্যের ক্ষেত্রে Unix পাথ %s অত্যাধিক লম্বা"
@@ -4197,9 +4141,6 @@ msgstr "পাথ '%s' নির্মাণ করতে ব্যর্থ"
 msgid "cannot create pipe"
 msgstr "পাইপ নির্মাণ করতে ব্যর্থ"
 
-msgid "cannot create virtual FAT disks in read-write mode"
-msgstr "পড়া-লেখার মোডে ভার্চিয়াল FAT ডিস্ক নির্মাণ করা সম্ভব নয়"
-
 #, c-format
 msgid "cannot decode CPU data for %s architecture"
 msgstr "%s আর্কিটেকচারের জন্য CPU-র জন্য ডি-কোড করা সম্ভব নয়"
@@ -4374,10 +4315,6 @@ msgstr "সকেট খুলতে ব্যর্থ: %s"
 msgid "cannot open volume '%s'"
 msgstr "ভলিউম '%s' খুলতে ব্যর্থ"
 
-#, c-format
-msgid "cannot parse CPU map for %s architecture"
-msgstr "%s আর্কিটেকচারের জন্য CPU ম্যাপ পার্স করা সম্ভব নয়"
-
 #, c-format
 msgid "cannot parse CPU topology '%s'"
 msgstr "CPU-র টোপোলজি '%s' পার্স করতে ব্যর্থ"
@@ -4454,18 +4391,6 @@ msgstr "instanceid প্যারামিটার uuid হিসাবে প
 msgid "cannot parse json %s: %s"
 msgstr "json %s পার্স করা সম্ভব নয়: %s"
 
-#, c-format
-msgid "cannot parse migration data remaining statistic %s"
-msgstr "মাইগ্রেট করা তথ্যের অবশিষ্ট অংশের পরিসংখ্যান %s পার্শ করতে ব্যর্থ"
-
-#, c-format
-msgid "cannot parse migration data total statistic %s"
-msgstr "মাইগ্রেট করা তথ্যের সম্পূর্ণ পরিমানের পরিসংখ্যান %s পার্শ করতে ব্যর্থ"
-
-#, c-format
-msgid "cannot parse migration data transferred statistic %s"
-msgstr "মাইগ্রেট করা পরিবাহিত তথ্যের পরিসংখ্যান %s পার্শ করতে ব্যর্থ"
-
 #, c-format
 msgid "cannot parse partition number from target '%s'"
 msgstr "'%s' টার্গেট থেকে পার্টিশনের সংখ্যা পার্স করা সম্ভব নয়"
@@ -4807,10 +4732,6 @@ msgstr "%s কনফিগের মান ত্রুটিপূর্ণ"
 msgid "config value %s was missing"
 msgstr "%s কনফিগ মান অনুপস্থিত"
 
-#, c-format
-msgid "config value %s was not a string"
-msgstr "%s কনফিগের মান স্ট্রিং প্রকৃতির নয়"
-
 msgid "configuration file syntax error"
 msgstr "কনফিগারেশন ফাইলের মধ্যে সিন্টেক্স সংক্রান্ত সমস্যা"
 
@@ -4884,10 +4805,6 @@ msgstr "ব্যান্ডউইথ সর্বোচ্চ মান '%s'
 msgid "could not determine max vcpus for the domain"
 msgstr "ডোমেইনের ক্ষেত্রে প্রযোজ্য সর্বাধিক vcpu নির্ধারণ করা যায়নি"
 
-#, c-format
-msgid "could not eject media on %s: %s"
-msgstr "%s-র মধ্যে উপস্থিত মিডিয়া বের করে নেওয়া যায়নি: %s"
-
 msgid "could not find libvirtd"
 msgstr "libvirtd অনুসন্ধান করতে ব্যর্থ"
 
@@ -5043,10 +4960,6 @@ msgstr "ডিস্ক ডিভাইস বিচ্ছিন্ন করু
 msgid "detach network interface"
 msgstr "নেটওয়ার্ক ইন্টারফেস বিচ্ছিন্ন করুন"
 
-#, c-format
-msgid "detaching %s device failed: %s"
-msgstr "%s ডিভাইস বিচ্ছিন্ন করতে ব্যর্থ: %s"
-
 #, c-format
 msgid "device %s is not a PCI device"
 msgstr "%s ডিভাইসটি PCI ডিভাইস নয়"
@@ -5079,10 +4992,6 @@ msgstr "স্বয়ংক্রিয় প্রারম্ভকরণ নি
 msgid "discover potential storage pool sources"
 msgstr "সম্ভাব্য সংগ্রহের পুলের সোর্স অনুসন্ধান করুন"
 
-#, c-format
-msgid "disk %s does not have any encryption information"
-msgstr "%s ডিস্কের ক্ষেত্রে এনক্রিপশন সংক্রান্ত কোনো তথ্য উপস্থিত নেই"
-
 #, c-format
 msgid "disk %s not found"
 msgstr "%s ডিস্ক পাওয়া যায়নি"
@@ -5211,9 +5120,6 @@ msgstr "ডোমেইনের কর্ম সংক্রান্ত তথ
 msgid "domain name or uuid"
 msgstr "ডোমেইনের নাম অথবা uuid"
 
-msgid "domain name, id or uuid"
-msgstr "ডোমেইনের নাম, id অথবা uuid"
-
 msgid "domain state"
 msgstr "ডোমেইনের অবস্থা"
 
@@ -5442,10 +5348,6 @@ msgstr "ভলিউম '%s' প্রাপ্ত করতে ব্যর্
 msgid "failed to initialize SASL library: %d (%s)"
 msgstr "SASL লাইব্রেরি আরম্ভ করতে ব্যর্থ : %d (%s)"
 
-#, c-format
-msgid "failed to load module %s %s"
-msgstr "মডিউল লোড করতে ব্যর্থ %s %s"
-
 #, c-format
 msgid "failed to mark network %s as autostarted"
 msgstr "নেটওয়ার্ক %s, স্বয়ং প্রারম্ভকারী রূপে চিহ্নিত করতে ব্যর্থ"
@@ -5474,9 +5376,6 @@ msgstr "কনফিগারেশন ফাইল পার্স করতে
 msgid "failed to parse configuration file %s"
 msgstr "কনফিগারেশন ফাইল %s পার্স করতে ব্যর্থ"
 
-msgid "failed to parse xml document"
-msgstr "xml নথি পার্স করতে ব্যর্থ"
-
 msgid "failed to read XML"
 msgstr "XML পড়তে ব্যর্থ"
 
@@ -5509,10 +5408,6 @@ msgstr "পুল '%s' মুছে ফেলতে ব্যর্থ"
 msgid "failed to resume domain"
 msgstr "ডোমেইন পুনরারম্ভ করতে ব্যর্থ"
 
-#, c-format
-msgid "failed to save chardev path '%s'"
-msgstr "'%s' chardev পাথ সংরক্ষণ করতে ব্যর্থ"
-
 msgid "failed to save content"
 msgstr "বিষয়বস্তু সংরক্ষণ করতে ব্যর্থ"
 
@@ -5619,12 +5514,6 @@ msgstr "ফ্লোর অ্যাট্রিবিউট এখনও পর
 msgid "forbidden characters in 'compat' attribute"
 msgstr "'compat' অ্যাট্রিবিউটে উপেক্ষিত অক্ষর"
 
-#, c-format
-msgid "format='qcow' passphrase for %s must not contain a '\\0'"
-msgstr ""
-"%s-র পরিচয় পংক্তির ক্ষেত্রে চিহ্নিত format='qcow' বিন্যাসের মধ্যে '\\0' অন্তর্ভুক্ত "
-"করা যাবে না"
-
 #, c-format
 msgid "formatter for %s %s reported error"
 msgstr "formatter %s %s এর জন, ত্রুটি জানিয়েছে"
@@ -5794,10 +5683,6 @@ msgstr ""
 msgid "invalid <address> element found in <forward> of network %s"
 msgstr "অবৈধ <address> উপাদান পাওয়া গেছে <forward> এ, %s নেটওয়ার্কের"
 
-#, c-format
-msgid "invalid <encryption> for volume %s"
-msgstr "%s ভলিউমের জন্য <encryption> বৈধ নয়"
-
 #, c-format
 msgid "invalid <host> element found in <dns> of network %s"
 msgstr "অবৈধ <host> উপাদান <dns> এ পাওয়া গেছে, %s নেটওয়ার্কের"
@@ -6281,14 +6166,6 @@ msgstr "মাইগ্রেট: ডাউন-টাইম বৈধ নয়"
 msgid "migration URI, usually can be omitted"
 msgstr "মাইগ্রেশনের URI, সাধারণত উল্লেখ করা আবশ্যক নয়"
 
-#, c-format
-msgid "migration to '%s' failed: %s"
-msgstr "'%s'-এ মাইগ্রেট করতে ব্যর্থ: %s"
-
-#, c-format
-msgid "migration to '%s' not supported by this qemu: %s"
-msgstr "এই qemu দ্বারা '%s'-এ মাইগ্রেশন সমর্থিত নয়: %s"
-
 msgid "migration was active, but RAM 'remaining' data was missing"
 msgstr "মাইগ্রেশন সক্রিয় অবস্থায়, কিন্তু RAM সংক্রান্ত 'remaining' তথ্য অনুপস্থিত"
 
@@ -6814,9 +6691,6 @@ msgstr "স্বয়ংক্রিয় প্রারম্ভকরণ হব
 msgid "no block device path supplied for '%s'"
 msgstr "'%s'-র জন্য কোনো ব্লক ডিভাইসের পাথ উল্লিখিত হয়নি"
 
-msgid "no callback provided"
-msgstr "কোনো কলব্যাক প্রদান করা হয়নি"
-
 msgid "no client username was found"
 msgstr "ক্লায়েন্টের ব্যবহারকারীর নাম পাওয়া যায়নি"
 
@@ -6832,10 +6706,6 @@ msgstr "'%s'-র জন্য ডিভাইস সংক্রান্ত ক
 msgid "no device found with alias %s"
 msgstr "%s উপনাম দিয়ে কোনো ডিভাইস খুঁজে পাওয়া যায়নি"
 
-#, c-format
-msgid "no disk found with path %s"
-msgstr "%s পাথ সহ কোনো ডিস্ক পাওয়া যায়নি"
-
 #, c-format
 msgid "no disk named '%s'"
 msgstr "'%s' নামের কোনো ডিস্ক নেই"
@@ -7148,14 +7018,6 @@ msgstr "ps2 bus দ্বারা %s ইনপুট ডিভাইস সম
 msgid "pwd: cannot get current directory: %s"
 msgstr "pwd: বর্তমান ডিরেক্টরি প্রাপ্ত করতে ব্যর্থ: %s"
 
-#, c-format
-msgid "qemu does not support closing of file handles: %s"
-msgstr "qemu দ্বারা ফাইল হ্যান্ডেল বন্ধ করার প্রক্রিয়া সমর্থিত হয় না: %s"
-
-#, c-format
-msgid "qemu does not support sending of file handles: %s"
-msgstr "qemu দ্বারা ফাইল হ্যান্ডেল প্রেরণ সমর্থিত হয় না: %s"
-
 #, c-format
 msgid "qemu emulator '%s' does not support xen"
 msgstr "'%s' qemu এমুলেটর দ্বারা xen সমর্থিত হয় না"
@@ -7269,9 +7131,6 @@ msgstr "XML-র মধ্যে গোপনীয় বৈশিষ্ট্য"
 msgid "secret is private"
 msgstr "গোপনীয় তথ্য প্রাইভেট রূপে ধার্য করা হয়েছে"
 
-msgid "secrets already defined"
-msgstr "গোপনীয় তথ্য পূর্বেই নির্ধারিত হয়েছে"
-
 #, c-format
 msgid "security DOI string exceeds max %d bytes"
 msgstr "নিরাপত্তার DOI স্ট্রিং সর্বাধিক %d বাইটের বেশি"
@@ -7307,12 +7166,6 @@ msgstr "গোপনীয় মান নির্ধারণ করুন"
 msgid "set maximum tolerable downtime"
 msgstr "সর্বাধিক সহনীয় ডাউন-টাইম নির্ধারণ করুন"
 
-msgid "setting VNC password failed"
-msgstr "VNC পাসওয়ার্ড নির্ধারণ করতে ব্যর্থ"
-
-msgid "setting disk password is not supported"
-msgstr "ডিস্কের পাসওয়ার্ড নির্ধারণ ব্যবস্থা সমর্থিত নয়"
-
 msgid "sgio is only supported for scsi host device"
 msgstr "sgio শুধুমাত্র scsi হোস্ট ডিভাইসের ক্ষেত্রে সমর্থিত"
 
@@ -7427,12 +7280,6 @@ msgstr "সংরক্ষণের পুল '%s' পূর্বেই সক
 msgid "storage pool '%s' is not active"
 msgstr "সংরক্ষণের পুল '%s' সক্রিয় নয়"
 
-msgid ""
-"storage pool does not support building encrypted volumes from other volumes"
-msgstr ""
-"সংগ্রহের পুল দ্বারা উপস্থিত ভলিউমের ভিত্তিতে এনক্রিপ্ট করার ভলিউম নির্মাণ সমর্থিত হয় "
-"না"
-
 msgid "storage pool does not support encrypted volumes"
 msgstr "সংগ্রহের পুল দ্বারা এনক্রিপ্ট করা ভলিউম সমর্থিত হয় ন"
 
@@ -7540,9 +7387,6 @@ msgstr ""
 "<forward> 'dev' অ্যাট্রিবিউট ব্যবহার করা যাবে না, যখন <address> বা <pf> উপ-"
 "উপাদান %s নেটওয়ার্কে উপস্থিত"
 
-msgid "the disk password is incorrect"
-msgstr "ডিস্কের পাসওয়ার্ড সঠিক নয়"
-
 msgid "the state to restore"
 msgstr "পুনরুদ্ধারের জন্য চিহ্নিত অবস্থা"
 
@@ -7621,9 +7465,6 @@ msgstr "%s-র মধ্যে অত্যাধিক সংখ্যক ড
 msgid "too many memory stats requested: %d > %d"
 msgstr "অত্যাধিক সংখ্যক মেমরির পরিসংখ্যানের অনুরোধ জানানো হয়েছে: %d > %d"
 
-msgid "too many secrets for qcow encryption"
-msgstr "qcow এনক্রিপশনের জন্য অত্যাধিক গোপনীয় তথ্য"
-
 msgid "total and read/write bytes_sec cannot be set at the same time"
 msgstr "total এবং read/write bytes_sec একই সংগে সেট করা যায় না"
 
@@ -7840,18 +7681,10 @@ msgstr "অপ্রত্যাশিত প্রকৃতির ডিস্
 msgid "unexpected disk bus %d"
 msgstr "অপ্রত্যাশিত ডিস্ক বাস %d"
 
-#, c-format
-msgid "unexpected disk cache mode %d"
-msgstr "অপ্রত্যাশিত ডিস্ক ক্যাশে মোড %d"
-
 #, c-format
 msgid "unexpected disk device %d"
 msgstr "অপ্রত্যাশিত ডিস্ক ডিভাইস %d"
 
-#, c-format
-msgid "unexpected disk io mode %d"
-msgstr "অপ্রত্যাশিত ডিস্ক io মোড %d"
-
 #, c-format
 msgid "unexpected disk type %d"
 msgstr "অপ্রত্যাশিত প্রকৃতির ডিস্ক %d"
@@ -8639,10 +8472,6 @@ msgstr "অসমর্থিত ধরনের তথ্য '%c', '%s' আর
 msgid "unsupported disk bus '%s' with device setup"
 msgstr "ডিভাইস প্রস্তুতির সাথে অসমর্থিত ডিস্ক বাস '%s'"
 
-#, c-format
-msgid "unsupported disk driver type for '%s'"
-msgstr "'%s'-র জন্য অসমর্থিত ধরনের ডিস্ক ড্রাইভার"
-
 #, c-format
 msgid "unsupported disk type %s"
 msgstr "%s ধরনের ডিস্ক সমর্থিত নয়"

po/bo.mini.po

@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libvirt 4.3.0\n"
+"Project-Id-Version: libvirt 4.10.0\n"
 "Report-Msgid-Bugs-To: https://libvirt.org/bugs.html\n"
-"POT-Creation-Date: 2018-04-24 12:51+0100\n"
+"POT-Creation-Date: 2018-11-28 16:52+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Tibetan\n"
@@ -16,4 +16,4 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0\n"
-"X-Generator: Zanata 3.9.6\n"
+"X-Generator: Zanata 4.6.2\n"

po/br.mini.po

@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libvirt 4.3.0\n"
+"Project-Id-Version: libvirt 4.10.0\n"
 "Report-Msgid-Bugs-To: https://libvirt.org/bugs.html\n"
-"POT-Creation-Date: 2018-04-24 12:51+0100\n"
+"POT-Creation-Date: 2018-11-28 16:52+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Breton\n"
@@ -16,4 +16,4 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
-"X-Generator: Zanata 3.9.6\n"
+"X-Generator: Zanata 4.6.2\n"

po/brx.mini.po

@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libvirt 4.3.0\n"
+"Project-Id-Version: libvirt 4.10.0\n"
 "Report-Msgid-Bugs-To: https://libvirt.org/bugs.html\n"
-"POT-Creation-Date: 2018-04-24 12:51+0100\n"
+"POT-Creation-Date: 2018-11-28 16:52+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Bodo\n"
@@ -16,4 +16,4 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"X-Generator: Zanata 3.9.6\n"
+"X-Generator: Zanata 4.6.2\n"

po/bs.mini.po

@@ -7,10 +7,10 @@
 # Daniel  <veillard@redhat.com>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: libvirt 4.3.0\n"
+"Project-Id-Version: libvirt 4.10.0\n"
 "Report-Msgid-Bugs-To: https://libvirt.org/bugs.html\n"
-"POT-Creation-Date: 2018-04-24 12:51+0100\n"
-"PO-Revision-Date: 2015-02-26 07:12-0500\n"
+"POT-Creation-Date: 2018-11-28 16:52+0000\n"
+"PO-Revision-Date: 2015-02-26 07:12+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Bosnian (http://www.transifex.com/projects/p/fedora/language/"
 "bs/)\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Zanata 3.9.6\n"
+"X-Generator: Zanata 4.6.2\n"
 
 msgid ""
 "\n"
@@ -427,9 +427,6 @@ msgstr "podaci domene nisu potpuni, vbd nema src"
 msgid "domain name or uuid"
 msgstr "naziv domene ili uuid"
 
-msgid "domain name, id or uuid"
-msgstr "naziv domene, id ili uuid"
-
 msgid "domain state"
 msgstr "stanje domene"
 

po/ca.mini.po

@@ -11,10 +11,10 @@
 # Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2018. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: libvirt 4.3.0\n"
+"Project-Id-Version: libvirt 4.10.0\n"
 "Report-Msgid-Bugs-To: https://libvirt.org/bugs.html\n"
-"POT-Creation-Date: 2018-04-24 12:51+0100\n"
-"PO-Revision-Date: 2018-02-24 11:19-0500\n"
+"POT-Creation-Date: 2018-11-28 16:52+0000\n"
+"PO-Revision-Date: 2018-02-24 11:19+0000\n"
 "Last-Translator: Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/libvirt/language/"
 "ca/)\n"
@@ -23,7 +23,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Zanata 3.9.6\n"
+"X-Generator: Zanata 4.6.2\n"
 
 msgid ""
 "\n"
@@ -967,9 +967,6 @@ msgstr "el domini no s'està executant"
 msgid "domain name or uuid"
 msgstr "nom de domini o uuid"
 
-msgid "domain name, id or uuid"
-msgstr "nom de domini, id o uuid"
-
 msgid "domain state"
 msgstr "estat del domini"
 

po/cs.mini.po

@@ -7,13 +7,14 @@
 # dibalaj <dibalaj@dibalaj.cz>, 2013
 # Milan Kerslager <kerslage@linux.cz>, 2007
 # Zdenek <chmelarz@gmail.com>, 2016. #zanata
+# Pavel Borecki <pavel.borecki@gmail.com>, 2018. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: libvirt 4.3.0\n"
+"Project-Id-Version: libvirt 4.10.0\n"
 "Report-Msgid-Bugs-To: https://libvirt.org/bugs.html\n"
-"POT-Creation-Date: 2018-04-24 12:51+0100\n"
-"PO-Revision-Date: 2016-09-15 06:18-0400\n"
-"Last-Translator: Zdenek <chmelarz@gmail.com>\n"
+"POT-Creation-Date: 2018-11-28 16:52+0000\n"
+"PO-Revision-Date: 2018-11-27 07:08+0000\n"
+"Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>\n"
 "Language-Team: Czech (http://www.transifex.com/projects/p/fedora/language/"
 "cs/)\n"
 "Language: cs\n"
@@ -21,7 +22,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Zanata 3.9.6\n"
+"X-Generator: Zanata 4.6.2\n"
 
 msgid ""
 "\n"
@@ -79,7 +80,7 @@ msgid " %s (help keyword '%s')\n"
 msgstr " %s (klíčové slovo nápovědy '%s')\n"
 
 msgid " Hypervisors:"
-msgstr " Hypervizoři:"
+msgstr " Hypervizory:"
 
 msgid " Miscellaneous:"
 msgstr " Různé:"
@@ -146,6 +147,14 @@ msgstr "%s: selhal zápis do log souboru: %s"
 msgid "%s: initialization failed\n"
 msgstr "%s: inicializace selhala\n"
 
+#, c-format
+msgid "%s: option '%s%s' is ambiguous\n"
+msgstr "%s: volba „%s%s“ není jednoznačná\n"
+
+#, c-format
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: volba „%s%s“ není jednoznačná; možnosti:"
+
 #, c-format
 msgid ""
 "%s: temporary filename contains shell meta or other unacceptable characters "
@@ -154,6 +163,10 @@ msgstr ""
 "%s: jméno dočasného souboru obsahuje nepovolené nebo speciální znaky shellu "
 "(je správně nastavená $TMPDIR?)"
 
+#, c-format
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: nerozpoznaná volba „%s%s“\n"
+
 #, c-format
 msgid "%s: warning: %s%c"
 msgstr "%s: varování: %s%c"
@@ -182,6 +195,9 @@ msgstr "--%s <řetězec>"
 msgid "Active:"
 msgstr "Aktivní:"
 
+msgid "All requests done"
+msgstr "Všechny požadavky dokončeny"
+
 msgid "Allocation"
 msgstr "Alokace"
 
@@ -212,6 +228,10 @@ msgstr "Dostupný"
 msgid "Available:"
 msgstr "Dostupný:"
 
+#, c-format
+msgid "Bad $%s value."
+msgstr "Chybná hodnota $%s."
+
 msgid "Build a given pool."
 msgstr "Sestav dané úložiště."
 
@@ -344,6 +364,15 @@ msgstr ""
 msgid "Change the number of virtual CPUs in the guest domain."
 msgstr "Změnit počet aktivních virtuálních CPU v hostované doméně."
 
+msgid ""
+"Check that CPU and firmware supports virtualization and kvm module is loaded"
+msgstr ""
+"Zkontrolujte zda procesor a (nastavení) firmware podporují virtualizaci a je "
+"načten modul kvm"
+
+msgid "Compiled with support for:"
+msgstr "Sestaveno s podporou pro:"
+
 msgid "Compiled with support for:\n"
 msgstr "Zkompilováno s podporou pro:\n"
 
@@ -415,6 +444,9 @@ msgstr "Nelze smazat svazek: %s"
 msgid "Could not destroy domain: %s"
 msgstr "Nepodařilo se zničit doménu: %s"
 
+msgid "Could not determine home directory"
+msgstr "Nedaří se zjistit domovskou složku"
+
 msgid "Could not find 'active' element"
 msgstr "Nepodařilo se nalézt element 'active'"
 
@@ -473,10 +505,6 @@ msgstr "Nelze parsovat VPS ID %s"
 msgid "Could not parse version number from '%s'"
 msgstr "Nelze parsovat číslo verze z '%s'"
 
-#, c-format
-msgid "Could not put variable '%s' into hashmap"
-msgstr "Nelze vložit proměnnou '%s' do hashmap"
-
 #, c-format
 msgid "Could not resume domain: %s"
 msgstr "Nepodařilo se probudit doménu: %s"
@@ -734,10 +762,6 @@ msgstr "Editovat XML konfiguraci pro úložiště."
 msgid "Error opening file %s"
 msgstr "Chyba otevírání souboru %s"
 
-#, c-format
-msgid "Failed module registration %s"
-msgstr "Selhala registrace modulu %s"
-
 #, c-format
 msgid "Failed opening %s"
 msgstr "Selhalo otevírání %s"
@@ -781,6 +805,9 @@ msgstr "Selhalo porovnání hostitelského CPU s %s"
 msgid "Failed to connect to %s"
 msgstr "Selhalo připojování k %s"
 
+msgid "Failed to connect to the admin server"
+msgstr "Nepodařilo se připojit ke správnímu serveru"
+
 #, c-format
 msgid "Failed to convert '%s' to int"
 msgstr "Selhala konverze '%s' na int"
@@ -930,6 +957,12 @@ msgstr "Nepodařilo se získat informace o rozhraní"
 msgid "Failed to get interface stats %s %s"
 msgstr "Nepodařilo se získat stav rozhraní %s %s"
 
+msgid "Failed to initialize libvirt"
+msgstr "libvirt se nepodařilo inicializovat"
+
+msgid "Failed to initialize mutex"
+msgstr "mutex se nepodařilo inicializovat"
+
 msgid "Failed to list active domains"
 msgstr "Nepodařilo se vypsat aktivní domény"
 
@@ -963,6 +996,9 @@ msgstr "Selhalo vypsání hesel"
 msgid "Failed to list storage volumes"
 msgstr "Nepodařilo se vypsat svazky na úložišti"
 
+msgid "Failed to list volumes"
+msgstr "Nepodařilo se vypsat svazky"
+
 #, c-format
 msgid "Failed to make device %s"
 msgstr "Selhalo vytvoření zařízení %s"
@@ -1155,7 +1191,7 @@ msgid ""
 "Grouped commands:\n"
 "\n"
 msgstr ""
-"Příkazy:\n"
+"Seskupené příkazy:\n"
 "\n"
 
 #, c-format
@@ -1190,6 +1226,9 @@ msgstr "Rozhraní bylo úspěšně připojeno\n"
 msgid "Interface detached successfully\n"
 msgstr "Rozhraní bylo úspěšně odpojeno\n"
 
+msgid "Interrupted by a signal"
+msgstr "Přerušeno signálem"
+
 msgid "Invalid CPU feature name"
 msgstr "Neplatné jméno vlastnosti CPU"
 
@@ -1304,9 +1343,6 @@ msgstr "Chybí jméno vlastnosti CPU"
 msgid "Missing CPU model name"
 msgstr "Chybí jméno modelu CPU"
 
-msgid "Missing CPU vendor name"
-msgstr "Chybí jméno výrobce CPU"
-
 msgid "Missing address"
 msgstr "Chybí adresa"
 
@@ -1329,6 +1365,9 @@ msgstr "Volná paměť NUMA"
 msgid "Name"
 msgstr "Jméno"
 
+msgid "Name or service not known"
+msgstr "Neznámý název nebo služba"
+
 msgid "Name:"
 msgstr "Jméno:"
 
@@ -1399,9 +1438,6 @@ msgstr "Síť nebyla nalezena: %s"
 msgid "Network type %d is not supported"
 msgstr "Typ sítě %d není podporován"
 
-msgid "No CPUs given"
-msgstr "Nebyla zadána CPU"
-
 #, c-format
 msgid "No IP address for host '%s' found: %s"
 msgstr "IP adresa pro hosta '%s' nalezena: %s"
@@ -1422,17 +1458,9 @@ msgstr "Žádná doména odpovídající jménu '%s'"
 msgid "No domain with matching uuid '%s'"
 msgstr "Žádná doména odpovídající uuid '%s'"
 
-#, c-format
-msgid "No domain with name '%s'"
-msgstr "Žádná doména se jménem '%s'"
-
 msgid "No error message provided"
 msgstr "Chybová zpráva nebyla zadána"
 
-#, c-format
-msgid "No host CPU specified in '%s'"
-msgstr "Nebylo specifikováno žádné hostitelské CPU v '%s'"
-
 #, c-format
 msgid "No support for %s in command 'attach-disk'"
 msgstr "Nepodporovaný %s v příkazu 'attach-disk'"
@@ -1588,6 +1616,12 @@ msgstr "uložit stav domény do souboru"
 msgid "Renaming domains on migration not supported"
 msgstr "Přejmenování domén během migrace není podporováno"
 
+msgid "Request canceled"
+msgstr "Požadavek zrušen"
+
+msgid "Request not canceled"
+msgstr "Požadavek nebyl zrušen"
+
 #, c-format
 msgid ""
 "Requested number of virtual CPUs is greater than max allowable number of "
@@ -1720,6 +1754,9 @@ msgstr "Svazek nenalezen: %s"
 msgid "Suspend a running domain."
 msgstr "Uspat běžící doménu."
 
+msgid "System error"
+msgstr "Chyba systému"
+
 msgid "The domain is not running"
 msgstr "Doména neběží"
 
@@ -1731,6 +1768,9 @@ msgstr "Server přesměrovává z '%s'"
 msgid "The server redirects from '%s' to '%s'"
 msgstr "Server přesměrovává z '%s' na '%s'"
 
+msgid "This function is not supported on WIN32 platform"
+msgstr "Tato funkce není na platformě WIN32 podporována"
+
 msgid "This host is not managed by a vCenter"
 msgstr "Tento host není spravován vCenter"
 
@@ -1740,6 +1780,9 @@ msgstr "Vláken na jádro:"
 msgid "Total"
 msgstr "Celkem"
 
+msgid "Try again?"
+msgstr "Zkusit znovu?"
+
 msgid "Type"
 msgstr "Typ"
 
@@ -1797,6 +1840,9 @@ msgstr "Nelze zmigrovat %s na %s"
 msgid "Unable to open %s"
 msgstr "Nelze otevřít %s"
 
+msgid "Unable to open /proc/mounts"
+msgstr "Nelze otevřít /proc/mounts"
+
 msgid "Unable to open UNIX socket"
 msgstr "Nelze otevřít UNIXový socket"
 
@@ -2113,10 +2159,6 @@ msgstr "nelze otevřít cestu '%s'"
 msgid "cannot open volume '%s'"
 msgstr "nelze otevřít svazek '%s'"
 
-#, c-format
-msgid "cannot parse CPU map for %s architecture"
-msgstr "nelze parsovat mapování CPU pro architekturu %s"
-
 #, c-format
 msgid "cannot parse UUID '%s'"
 msgstr "nelze parsovat UUID '%s'"
@@ -2272,6 +2314,9 @@ msgstr "chybná syntaxe konfiguračního souboru"
 msgid "configuration file syntax error: %s"
 msgstr "chybná syntaxe konfiguračního souboru: %s"
 
+msgid "connect to daemon's admin server"
+msgstr "připojit se ke správnímu serveru daného procesu služby"
+
 msgid "connect to the guest console"
 msgstr "připojit se k hostované konzoli"
 
@@ -2476,9 +2521,6 @@ msgstr "doména neběží"
 msgid "domain name or uuid"
 msgstr "uuid nebo jméno domény"
 
-msgid "domain name, id or uuid"
-msgstr "jméno, id nebo uuid domény"
-
 msgid "domain snapshot XML"
 msgstr "XML definice obrazu domény"
 
@@ -2521,6 +2563,9 @@ msgstr "chyba při kopírování UUID"
 msgid "error: "
 msgstr "chyba:"
 
+msgid "error: Out of memory\n"
+msgstr "chyba: došla paměť\n"
+
 #, c-format
 msgid "expected syntax: --%s <%s>"
 msgstr "očekávaná syntaxe: --%s <%s>"
@@ -2625,10 +2670,6 @@ msgstr "nepodařilo se zjistit verzi knihovny"
 msgid "failed to get vol '%s'"
 msgstr "nepodařilo se získat svazek '%s'"
 
-#, c-format
-msgid "failed to load module %s %s"
-msgstr "selhalo nahrání modulu %s %s"
-
 #, c-format
 msgid "failed to mark network %s as autostarted"
 msgstr "Nepodařilo se označit síť %s jako automaticky spouštěnou"
@@ -2661,9 +2702,6 @@ msgstr "chyba při parsování konfigurační souboru"
 msgid "failed to parse configuration file %s"
 msgstr "chyba při parsování konfigurační souboru %s"
 
-msgid "failed to parse xml document"
-msgstr "selhalo parsovaní xml dokumentu"
-
 msgid "failed to read XML"
 msgstr "selhalo čtení XML"
 
@@ -2739,6 +2777,9 @@ msgstr "soubor obsahující XML popis svazku"
 msgid "filter has no name"
 msgstr "filtr nemá jméno"
 
+msgid "for hardware virtualization"
+msgstr "pro hardwarovou virtualizaci"
+
 msgid "force device update"
 msgstr "vynutit aktualizaci zařízení"
 
@@ -2792,6 +2833,9 @@ msgstr "jméno rozhraní"
 msgid "internal error"
 msgstr "vnitřní chyba"
 
+msgid "internal use only"
+msgstr "pouze pro vnitřní použití"
+
 #, c-format
 msgid "invalid '=' after option --%s"
 msgstr "neplatné '=' po volbě --%s"
@@ -3408,6 +3452,12 @@ msgstr "uuid nebo jméno úložiště"
 msgid "print help"
 msgstr "vypsat nápovědu"
 
+msgid "print help for this function"
+msgstr "vypsat nápovědu k této funkci"
+
+msgid "print the admin server URI"
+msgstr "vypsat URI adresu správního serveru"
+
 msgid "print the current directory"
 msgstr "zobrazí jméno adresáře, ve kterém se právě nacházíte"
 
@@ -3549,6 +3599,9 @@ msgstr "cíl diskového zařízení"
 msgid "target type must be specified for %s device"
 msgstr "cíl musí být specifikován pro zařízení %s"
 
+msgid "tcp"
+msgstr "tcp"
+
 #, c-format
 msgid "template '%s' does not exist"
 msgstr "template '%s' neexistuje"
@@ -3565,6 +3618,9 @@ msgstr "tato doména již existuje"
 msgid "this network exists already"
 msgstr "tato síť již existuje"
 
+msgid "tls"
+msgstr "tls"
+
 msgid "too many drivers registered"
 msgstr "registrováno příliš mnoho ovladačů"
 
@@ -3648,24 +3704,16 @@ msgstr "neočekávaný typ řadiče %d"
 
 #, c-format
 msgid "unexpected data '%s'"
-msgstr "neočekávaná data '%s'"
+msgstr "neočekávaná data „%s“"
 
 #, c-format
 msgid "unexpected disk bus %d"
 msgstr "neočekávaná sběrnice disku %d"
 
-#, c-format
-msgid "unexpected disk cache mode %d"
-msgstr "neočekávaný model diskové cache %d"
-
 #, c-format
 msgid "unexpected disk device %d"
 msgstr "neočekávané diskové zařízení %d"
 
-#, c-format
-msgid "unexpected disk io mode %d"
-msgstr "neočekávaný io mód disku %d"
-
 #, c-format
 msgid "unexpected disk type %d"
 msgstr "neočekávaný typ disku %d"
@@ -3752,6 +3800,10 @@ msgstr "neočekávaná akce watchdogu %d"
 msgid "unexpected watchdog model %d"
 msgstr "neočekávaný model watchdogu %d"
 
+#, c-format
+msgid "unimplemented parameter type %d"
+msgstr "neimplementovaný typ parametru %d"
+
 msgid "unknown"
 msgstr "neznámý"
 
@@ -3788,7 +3840,7 @@ msgstr "neznámý offset hodin '%s'"
 
 #, c-format
 msgid "unknown command: '%s'"
-msgstr "neznámý příkaz '%s'"
+msgstr "neznámý příkaz: „%s“"
 
 #, c-format
 msgid "unknown dhcp peerdns value %s"
@@ -3868,6 +3920,9 @@ msgstr "neznámý typ rozhraní '%s'"
 msgid "unknown memory balloon model '%s'"
 msgstr "neznámý model ballon memory '%s'"
 
+msgid "unknown option"
+msgstr "neznámá volba"
+
 #, c-format
 msgid "unknown pci source type '%s'"
 msgstr "neznámý typ '%s' pro zdroj pci"

po/cy.mini.po

@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libvirt\n"
 "Report-Msgid-Bugs-To: https://libvirt.org/bugs.html\n"
-"POT-Creation-Date: 2018-04-24 12:51+0100\n"
-"PO-Revision-Date: 2018-04-24 05:01-0400\n"
+"POT-Creation-Date: 2018-11-28 16:52+0000\n"
+"PO-Revision-Date: 2018-04-24 05:01+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Welsh (http://www.transifex.com/projects/p/fedora/language/"
 "cy/)\n"
@@ -20,4 +20,4 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != "
 "11) ? 2 : 3;\n"
-"X-Generator: Zanata 3.9.6\n"
+"X-Generator: Zanata 4.6.2\n"

po/da.mini.po

@@ -9,10 +9,10 @@
 # Magnus Larsson <fedoratrans@gmail.com>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: libvirt 4.3.0\n"
+"Project-Id-Version: libvirt 4.10.0\n"
 "Report-Msgid-Bugs-To: https://libvirt.org/bugs.html\n"
-"POT-Creation-Date: 2018-04-24 12:51+0100\n"
-"PO-Revision-Date: 2015-02-26 08:52-0500\n"
+"POT-Creation-Date: 2018-11-28 16:52+0000\n"
+"PO-Revision-Date: 2015-02-26 08:52+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/fedora/language/"
 "da/)\n"
@@ -21,7 +21,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Zanata 3.9.6\n"
+"X-Generator: Zanata 4.6.2\n"
 
 msgid ""
 "\n"
@@ -562,9 +562,6 @@ msgstr "domæneinformation ukomplet, vbd har ingen src"
 msgid "domain name or uuid"
 msgstr "domænenavn eller uuid"
 
-msgid "domain name, id or uuid"
-msgstr "domænenavn, id eller uuid"
-
 msgid "domain state"
 msgstr "domænetilstand"
 

po/de_CH.mini.po

@@ -5,15 +5,15 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libvirt 4.3.0\n"
+"Project-Id-Version: libvirt 4.10.0\n"
 "Report-Msgid-Bugs-To: https://libvirt.org/bugs.html\n"
-"POT-Creation-Date: 2018-04-24 12:51+0100\n"
+"POT-Creation-Date: 2018-11-28 16:52+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: German (Switzerland)\n"
-"Language: de-CH\n"
+"Language: de_CH\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"X-Generator: Zanata 3.9.6\n"
+"X-Generator: Zanata 4.6.2\n"

po/el.mini.po

@@ -7,10 +7,10 @@
 # Pierros Papadeas <pierros@papadeas.gr>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: libvirt 4.3.0\n"
+"Project-Id-Version: libvirt 4.10.0\n"
 "Report-Msgid-Bugs-To: https://libvirt.org/bugs.html\n"
-"POT-Creation-Date: 2018-04-24 12:51+0100\n"
-"PO-Revision-Date: 2015-02-27 04:41-0500\n"
+"POT-Creation-Date: 2018-11-28 16:52+0000\n"
+"PO-Revision-Date: 2015-02-27 04:41+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/fedora/language/"
 "el/)\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Zanata 3.9.6\n"
+"X-Generator: Zanata 4.6.2\n"
 
 #, c-format
 msgid "Bridge generation exceeded max id %d"
@@ -258,9 +258,6 @@ msgstr "η σύνδεση είναι ήδη ανοικτή"
 msgid "connection not open"
 msgstr "η σύνδεση δεν είναι ανοικτή"
 
-msgid "failed to parse xml document"
-msgstr "αδυναμία ερμηνείας του εγγράφου XML"
-
 msgid "interface has no name"
 msgstr "η διεπαφή/προσαρμογέας (interface) δεν έχει όνομα"
 
@@ -510,10 +507,6 @@ msgstr "απροσδόκητος τύπος χαρακτήρα %d"
 msgid "unexpected disk bus %d"
 msgstr "απρόσμενος τύπος διαύλου δίσκου %d"
 
-#, c-format
-msgid "unexpected disk cache mode %d"
-msgstr "απροσδόκητη κατάσταση λανθάνουσας μνήμης δίσκου %d"
-
 #, c-format
 msgid "unexpected disk device %d"
 msgstr "απρόσμενος τύπος συσκευής δίσκου %d"

po/eo.mini.po

@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libvirt 4.3.0\n"
+"Project-Id-Version: libvirt 4.10.0\n"
 "Report-Msgid-Bugs-To: https://libvirt.org/bugs.html\n"
-"POT-Creation-Date: 2018-04-24 12:51+0100\n"
+"POT-Creation-Date: 2018-11-28 16:52+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Esperanto\n"
@@ -16,4 +16,4 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"X-Generator: Zanata 3.9.6\n"
+"X-Generator: Zanata 4.6.2\n"

po/et.mini.po

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libvirt 4.3.0\n"
 "Report-Msgid-Bugs-To: https://libvirt.org/bugs.html\n"
-"POT-Creation-Date: 2018-04-24 12:51+0100\n"
-"PO-Revision-Date: 2018-04-24 06:15-0400\n"
+"POT-Creation-Date: 2018-11-28 16:52+0000\n"
+"PO-Revision-Date: 2018-04-24 06:15+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Estonian (http://www.transifex.com/projects/p/fedora/language/"
 "et/)\n"
@@ -18,4 +18,4 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Zanata 3.9.6\n"
+"X-Generator: Zanata 4.6.2\n"

po/eu.mini.po

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libvirt 4.3.0\n"
 "Report-Msgid-Bugs-To: https://libvirt.org/bugs.html\n"
-"POT-Creation-Date: 2018-04-24 12:51+0100\n"
-"PO-Revision-Date: 2018-04-24 06:19-0400\n"
+"POT-Creation-Date: 2018-11-28 16:52+0000\n"
+"PO-Revision-Date: 2018-04-24 06:19+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/fedora/"
 "language/eu_ES/)\n"
@@ -18,4 +18,4 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Zanata 3.9.6\n"
+"X-Generator: Zanata 4.6.2\n"

po/fa.mini.po

@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libvirt 4.3.0\n"
+"Project-Id-Version: libvirt 4.10.0\n"
 "Report-Msgid-Bugs-To: https://libvirt.org/bugs.html\n"
-"POT-Creation-Date: 2018-04-24 12:51+0100\n"
+"POT-Creation-Date: 2018-11-28 16:52+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Persian\n"
@@ -16,4 +16,4 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0\n"
-"X-Generator: Zanata 3.9.6\n"
+"X-Generator: Zanata 4.6.2\n"

po/fi.mini.po

@@ -8,10 +8,10 @@
 # Toni Rantala <trantalafilo@gmail.com>, 2017. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: libvirt 4.3.0\n"
+"Project-Id-Version: libvirt 4.10.0\n"
 "Report-Msgid-Bugs-To: https://libvirt.org/bugs.html\n"
-"POT-Creation-Date: 2018-04-24 12:51+0100\n"
-"PO-Revision-Date: 2017-03-26 10:24-0400\n"
+"POT-Creation-Date: 2018-11-28 16:52+0000\n"
+"PO-Revision-Date: 2017-03-26 10:24+0000\n"
 "Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
 "Language-Team: Finnish (http://www.transifex.com/projects/p/fedora/language/"
 "fi/)\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Zanata 3.9.6\n"
+"X-Generator: Zanata 4.6.2\n"
 
 msgid ""
 "\n"
@@ -778,9 +778,6 @@ msgstr "toimialue ei ole käynnissä"
 msgid "domain name or uuid"
 msgstr "toimialueen nimi tai uuid"
 
-msgid "domain name, id or uuid"
-msgstr "toimialueen nimi, id tai uuid"
-
 msgid "domain state"
 msgstr "toimialueen tila"
 

po/fil.mini.po

@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libvirt 4.3.0\n"
+"Project-Id-Version: libvirt 4.10.0\n"
 "Report-Msgid-Bugs-To: https://libvirt.org/bugs.html\n"
-"POT-Creation-Date: 2018-04-24 12:51+0100\n"
+"POT-Creation-Date: 2018-11-28 16:52+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Filipino\n"
@@ -16,4 +16,4 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1\n"
-"X-Generator: Zanata 3.9.6\n"
+"X-Generator: Zanata 4.6.2\n"

po/fr.mini.po

@@ -21,10 +21,10 @@
 # Thomas Canniot <thomas.canniot@laposte.net>, 2007
 msgid ""
 msgstr ""
-"Project-Id-Version: libvirt 4.3.0\n"
+"Project-Id-Version: libvirt 4.10.0\n"
 "Report-Msgid-Bugs-To: https://libvirt.org/bugs.html\n"
-"POT-Creation-Date: 2018-04-24 12:51+0100\n"
-"PO-Revision-Date: 2015-02-26 09:47-0500\n"
+"POT-Creation-Date: 2018-11-28 16:52+0000\n"
+"PO-Revision-Date: 2015-02-26 09:47+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: French <trans-fr@lists.fedoraproject.org>\n"
 "Language: fr\n"
@@ -32,7 +32,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Zanata 3.9.6\n"
+"X-Generator: Zanata 4.6.2\n"
 
 msgid ""
 "\n"
@@ -219,9 +219,6 @@ msgstr ""
 "« bus », « target » et « unit » doivent être spécifiés pour l'adresse source "
 "scsi hostdev"
 
-msgid "'info blockstats' not supported by this qemu"
-msgstr "« info blockstats » n'est pas pris en charge par cette qemu"
-
 msgid "'pool' and 'volume' must be specified together for 'pool' type source"
 msgstr ""
 "« pool » et « volume » doivent être spécifiés ensemble pour la source du "
@@ -1833,9 +1830,6 @@ msgstr "Échec temporaire dans la résolution de nom"
 msgid "The certificate has no peers"
 msgstr "Le certificat n'a pas de pair"
 
-msgid "This libvirtd build does not support TLS"
-msgstr "Ce binaire de libvirt ne prend pas en charge TLS"
-
 msgid "Thread(s) per core:"
 msgstr "Thread(s) par coeur :"
 
@@ -2512,9 +2506,6 @@ msgstr "le domaine n'est pas actif"
 msgid "domain name or uuid"
 msgstr "nom du domaine ou UUID"
 
-msgid "domain name, id or uuid"
-msgstr "nom du domaine, ID ou UUID"
-
 msgid "domain state"
 msgstr "état du domaine"
 
@@ -3627,18 +3618,10 @@ msgstr "donnée inattendue « %s »"
 msgid "unexpected disk bus %d"
 msgstr "bus de disque %d inattendu"
 
-#, c-format
-msgid "unexpected disk cache mode %d"
-msgstr "mode de cache du disque %d inattendu"
-
 #, c-format
 msgid "unexpected disk device %d"
 msgstr "périphérique de disque %d inattendu"
 
-#, c-format
-msgid "unexpected disk io mode %d"
-msgstr "mode io du disque %d inattendu"
-
 #, c-format
 msgid "unexpected disk type %d"
 msgstr "type de disque %d inattendu"

po/fur.mini.po

@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libvirt 4.3.0\n"
+"Project-Id-Version: libvirt 4.10.0\n"
 "Report-Msgid-Bugs-To: https://libvirt.org/bugs.html\n"
-"POT-Creation-Date: 2018-04-24 12:51+0100\n"
+"POT-Creation-Date: 2018-11-28 16:52+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Friulian\n"
@@ -16,4 +16,4 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"X-Generator: Zanata 3.9.6\n"
+"X-Generator: Zanata 4.6.2\n"

po/ga.mini.po

@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libvirt 4.3.0\n"
+"Project-Id-Version: libvirt 4.10.0\n"
 "Report-Msgid-Bugs-To: https://libvirt.org/bugs.html\n"
-"POT-Creation-Date: 2018-04-24 12:51+0100\n"
+"POT-Creation-Date: 2018-11-28 16:52+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Irish\n"
@@ -17,4 +17,4 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=5; plural=n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : "
 "4\n"
-"X-Generator: Zanata 3.9.6\n"
+"X-Generator: Zanata 4.6.2\n"

po/gl.mini.po

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libvirt 4.3.0\n"
 "Report-Msgid-Bugs-To: https://libvirt.org/bugs.html\n"
-"POT-Creation-Date: 2018-04-24 12:51+0100\n"
-"PO-Revision-Date: 2018-04-24 06:22-0400\n"
+"POT-Creation-Date: 2018-11-28 16:52+0000\n"
+"PO-Revision-Date: 2018-04-24 06:22+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/fedora/language/"
 "gl/)\n"
@@ -18,4 +18,4 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Zanata 3.9.6\n"
+"X-Generator: Zanata 4.6.2\n"

po/he.mini.po

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libvirt 4.3.0\n"
 "Report-Msgid-Bugs-To: https://libvirt.org/bugs.html\n"
-"POT-Creation-Date: 2018-04-24 12:51+0100\n"
-"PO-Revision-Date: 2018-04-24 06:25-0400\n"
+"POT-Creation-Date: 2018-11-28 16:52+0000\n"
+"PO-Revision-Date: 2018-04-24 06:25+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/fedora/language/"
 "he/)\n"
@@ -18,4 +18,4 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Zanata 3.9.6\n"
+"X-Generator: Zanata 4.6.2\n"

po/hi.mini.po

@@ -17,10 +17,10 @@
 # sandeep shedmake <sandeep.shedmake@gmail.com>, 2007
 msgid ""
 msgstr ""
-"Project-Id-Version: libvirt 4.3.0\n"
+"Project-Id-Version: libvirt 4.10.0\n"
 "Report-Msgid-Bugs-To: https://libvirt.org/bugs.html\n"
-"POT-Creation-Date: 2018-04-24 12:51+0100\n"
-"PO-Revision-Date: 2015-02-23 12:39-0500\n"
+"POT-Creation-Date: 2018-11-28 16:52+0000\n"
+"PO-Revision-Date: 2015-02-23 12:39+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/fedora/language/"
 "hi/)\n"
@@ -29,7 +29,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Zanata 3.9.6\n"
+"X-Generator: Zanata 4.6.2\n"
 
 msgid ""
 "\n"
@@ -191,9 +191,6 @@ msgstr "संजालन"
 msgid " Storage:"
 msgstr "भंडारण"
 
-msgid " block_io_throttle reply was missing device list"
-msgstr "block_io_throttle उत्तर डिवाइस सूची गुम "
-
 #, c-format
 msgid "%s\n"
 msgstr "%s\n"
@@ -328,9 +325,6 @@ msgstr ""
 msgid "'floor' attribute allowed only in <inbound> element"
 msgstr "'फर्श' विशेषता केवल <inbound> तत्व में अनुमति दी गई"
 
-msgid "'info blockstats' not supported by this qemu"
-msgstr "'info blockstats' इस qemu के द्वारा समर्थित नहीं"
-
 msgid "'peak' and 'burst' require 'average' attribute"
 msgstr "'शिखर' और 'फट' 'औसत' विशेषता की आवश्यकता"
 
@@ -341,9 +335,6 @@ msgstr "'पूल' और 'मात्रा' पूल 'प्रकार
 msgid "'queues' attribute must be positive number: %s"
 msgstr "'कतार' विशेषता धनात्मक संख्या होनी चाहिए: %s"
 
-msgid "'set_link' not supported by this qemu"
-msgstr "'set_link' स qemu के द्वारा समर्थित नहीं"
-
 msgid "'wwnn' and 'wwpn' must be specified for adapter type 'fchost'"
 msgstr "'wwnn' और 'WWPN' अनुकूलक प्रकार 'fchost' के लिए निर्दिष्ट किया जाना चाहिए"
 
@@ -817,15 +808,9 @@ msgstr "आरंभिक पीआईडी ​​जाना जाता
 msgid "Cannot attach hostdev until init PID is known"
 msgstr "आरंभिक पीआईडी ​​जाना जाता है जब तक hostdev संलग्न नहीं कर सकता"
 
-msgid "Cannot check socket connection status"
-msgstr "सोकेट कनेक्शन स्थिति की जाँच नहीं कर सकता"
-
 msgid "Cannot complete within timeout period"
 msgstr "समयबाह्य अवधि के भीतर पूरा नहीं कर सकता"
 
-msgid "Cannot connect to agent socket"
-msgstr "प्रतिनिधि सॉकेट कनेक्ट नहीं हो सकता"
-
 #, c-format
 msgid "Cannot connect to monitor connection of type '%s' for pid %u"
 msgstr "कनेक्शन प्रकार '%s' की निगरानी के लिए कनेक्ट नहीं कर सकते %u pid के लिए "
@@ -1119,10 +1104,6 @@ msgstr "क्लाइंट सॉकेट पहचान उपलब्ध
 msgid "Command %s too long for destination"
 msgstr "कमांड %s गंतव्य के लिए काफी बड़ा है"
 
-#, c-format
-msgid "Command '%s' is not found"
-msgstr "कमांड '% s' नहीं मिली"
-
 msgid "Completed with no error"
 msgstr "कोई त्रुटि के साथ पूरा हो गया"
 
@@ -1201,10 +1182,6 @@ msgstr "hashmap में परिवर्तनीय 'IP' को जोड़
 msgid "Could not add variable 'MAC' to hashmap"
 msgstr " hashmap में परिवर्तनीय 'MAC' को जोड़ नहीं सका"
 
-#, c-format
-msgid "Could not allocate memory for output of '%s'"
-msgstr "'%s' की आउटपुट के लिए स्मृति आबंटन में विफल"
-
 msgid "Could not build CURL header list"
 msgstr "CURL शीर्षिका सूची बना नहीं सका"
 
@@ -1356,10 +1333,6 @@ msgstr "मैक पते '%s' के साथ शारीरिक एन
 msgid "Could not find physical NIC with name '%s'"
 msgstr "नाम '%s' के साथ शारीरिक एनआईसी नहीं मिल सका"
 
-#, c-format
-msgid "Could not find placement for controller %s at %s"
-msgstr "नियंत्रक %s के लिए %s पर नियुक्ति नहीं पा सका"
-
 #, c-format
 msgid "Could not find snapshot with name '%s'"
 msgstr "नाम '%s' के साथ स्नैपशॉट नहीं ढूँढ सका"
@@ -1606,10 +1579,6 @@ msgstr "usb फाइल %s को विश्लेषित नहीं क
 msgid "Could not parse version number from '%s'"
 msgstr "'%s' से संस्करण संख्या का विश्लेषण नहीं कर सका"
 
-#, c-format
-msgid "Could not put variable '%s' into hashmap"
-msgstr "hashmap में परिवर्तनीय '%s' को रख नहीं सका"
-
 #, c-format
 msgid "Could not read 'IP_ADDRESS' from config for container %d"
 msgstr "'IP_ADDRESS' को config से कंटेनर %d के लिए पढ़ नहीं सका"
@@ -1847,14 +1816,6 @@ msgstr "दिये आयतन को मिटाएँ."
 msgid "Dest file %s too big for destination"
 msgstr "गंतव्य फ़ाइल %s गंतव्य के लिए काफी बड़ी है"
 
-#, c-format
-msgid "Destination buffer for ifname ('%s') not large enough"
-msgstr "गंतव्य बफ़र के लिए ifname('%s') बहुत ज्यादा पर्याप्त नहीं"
-
-#, c-format
-msgid "Destination buffer for linkdev ('%s') not large enough"
-msgstr "गंतव्य बफ़र के लिए linkdev('%s') बहुत ज्यादा पर्याप्त नहीं"
-
 msgid "Destination libvirt does not support peer-to-peer migration protocol"
 msgstr "गंतव्य libvirt पीयर टू पीयर उत्प्रवास प्रोटोकॉल का समर्थन नहीं करता है"
 
@@ -1881,10 +1842,6 @@ msgstr "संजाल अंतरफलक अलग करें."
 msgid "Device"
 msgstr "युक्ति"
 
-#, c-format
-msgid "Device %s in use"
-msgstr "डिवाइस %s उपयोग में है"
-
 #, c-format
 msgid "Device %s is already in use"
 msgstr "युक्ति %s पहले से प्रयोग में है"
@@ -2248,10 +2205,6 @@ msgstr "FAIL"
 msgid "Failed"
 msgstr "असफल"
 
-#, c-format
-msgid "Failed module registration %s"
-msgstr "विफल मॉड्यूल पंजीयन %s "
-
 #, c-format
 msgid "Failed opening %s"
 msgstr "%s खोलने में विफल "
@@ -2730,10 +2683,6 @@ msgstr "%s डोमेन का स्वतः आरंभन चिह्
 msgid "Failed to mkdir %s"
 msgstr "%s को mkdir करने में विफल"
 
-#, c-format
-msgid "Failed to mount %s on %s type %s"
-msgstr "%s प्रकार %s पर %s को माउंट करने में विफल  "
-
 #, c-format
 msgid "Failed to mount %s on /proc/meminfo"
 msgstr "/proc/meminfo को %s पर आरोहित करने में विफल"
@@ -2781,11 +2730,6 @@ msgstr "sanlock डेमोन का सोकेट खोलने में
 msgid "Failed to open storage volume with path '%s'"
 msgstr "पथ '%s' से भंडार आयतन को खोलने में विफल"
 
-#, c-format
-msgid ""
-"Failed to open stream for file descriptor when reading output from '%s': '%s'"
-msgstr "फाइल विवरणकर्ता के लिए धारा खोलने में विफल जब '%s' से आउटपुट पढ़ रहा है: '%s'"
-
 #, c-format
 msgid "Failed to open tty %s"
 msgstr "tty %s खोलने में विफल"
@@ -3126,10 +3070,6 @@ msgstr "विफलता कार्रवाई %s की sanlock द्व
 msgid "Failure establishing SSH session."
 msgstr "SSH सत्र स्थापित करने में विफलता."
 
-#, c-format
-msgid "Failure while applying current filter on VM %s"
-msgstr "VM %s पर मौजूदा फ़िल्टर लागू करते समय विफलता"
-
 #, c-format
 msgid "Feature %s required by CPU model %s not found"
 msgstr "विशेषता %s CPU मॉडल के द्वारा जरूरी %s नहीं मिला"
@@ -3710,9 +3650,6 @@ msgstr "%s के आह्वान से एक त्रुटि आई: %s
 msgid "Iterator ID exceeds maximum ID of %u"
 msgstr "इटरेटर ID %u की अधिकतम ID से अधिक है "
 
-msgid "JSON monitor should be using RemoveNetdev"
-msgstr "JSON मानिटर को RemoveNetdev को उपयोग करना चाहिए"
-
 msgid "Job type:"
 msgstr "कार्य प्रकार:"
 
@@ -3811,9 +3748,6 @@ msgstr "विकृत ctrl-alt-del सेटिंग '%s'"
 msgid "Malformed lease target offset %s"
 msgstr "विरूपित लीज लक्ष्य ऑफसेट %s"
 
-msgid "Malformed lockspaces data from JSON file"
-msgstr "JSON फ़ाइल से विकृत lockspaces डेटा"
-
 #, c-format
 msgid "Malformed size %s"
 msgstr "विरूपित आकार %s"
@@ -3964,9 +3898,6 @@ msgstr "गुम सीपीयू विशेषता नाम"
 msgid "Missing CPU model name"
 msgstr "अनुपस्थित CPU मॉडल नाम"
 
-msgid "Missing CPU vendor name"
-msgstr "अनुपस्थित CPU विक्रेता नाम"
-
 msgid "Missing ID parameter for domain object"
 msgstr "डोमेन ऑब्जेक्ट के लिए गुम आईडी पैरामीटर"
 
@@ -4019,10 +3950,6 @@ msgstr "JSON के दस्तावेज़ में गुम जादु
 msgid "Missing mandatory average or floor attributes"
 msgstr "अनिवार्य औसत या फर्श गुण गुम"
 
-#, c-format
-msgid "Missing module registration symbol %s"
-msgstr "गायब मॉड्यूल पंजीयन संकेतक %s"
-
 msgid "Missing monitor reply object"
 msgstr "गायब मॉनिटर जबाब वस्तु"
 
@@ -4044,9 +3971,6 @@ msgid ""
 "network %s"
 msgstr "संजाल %s में गुम या <forward> में <nat> में <port> में अवैध 'शुरुआत' विशेषता"
 
-msgid "Missing or invalid auth pointer"
-msgstr "गुम या अवैध auth संकेतक "
-
 msgid "Missing ownerId data in JSON document"
 msgstr "JSON के दस्तावेज़ में ownerId डेटा गुम"
 
@@ -4087,9 +4011,6 @@ msgstr "JSON के दस्तावेज़ में प्रतिबं
 msgid "Missing server data from JSON file"
 msgstr "JSON फ़ाइल से गुम सर्वर डेटा"
 
-msgid "Missing server name in phyp:// URI"
-msgstr "phyp:// URI में अनुपस्थित सर्वर नाम"
-
 msgid "Missing source host attribute for char device"
 msgstr "चार युक्ति के लिए गुम मेजबान पथ गुण"
 
@@ -4293,9 +4214,6 @@ msgstr ""
 msgid "No <source> 'port' attribute specified with socket interface"
 msgstr "कोई <source> 'port' गुण सॉकेट अंतरफलक के साथ निर्दिष्ट नहीं"
 
-msgid "No CPUs given"
-msgstr "कोई CPU नहीं दिया है"
-
 #, c-format
 msgid "No IP address for host '%s' found: %s"
 msgstr "होस्ट '%s' के लिये कोई IP पता नहीं मिल पाया: %s"
@@ -4316,9 +4234,6 @@ msgstr "होस्टनाम के साथ कोई पता संब
 msgid "No authentication callback available"
 msgstr "कोई प्रमाणीकरण कॉलबैक नहीं उपलब्ध हैं "
 
-msgid "No authentication callback provided."
-msgstr "कोई सत्यापन कॉलबैक नहीं दिया गया."
-
 msgid "No bridge name specified"
 msgstr "कोई ब्रिज नाम निर्दिष्ट नहीं"
 
@@ -4356,10 +4271,6 @@ msgstr "मेल खाता uuid '%s' के साथ कोई डोमे
 msgid "No domain with name %s"
 msgstr "कोई डोमेन नहीं %s नाम के साथ"
 
-#, c-format
-msgid "No domain with name '%s'"
-msgstr "'%s' नाम के साथ कोई डोमेन नहीं "
-
 msgid "No error message provided"
 msgstr "कोई त्रुटि संदेश नहीं दिया गया"
 
@@ -4367,10 +4278,6 @@ msgstr "कोई त्रुटि संदेश नहीं दिया
 msgid "No graphics backend with index %d"
 msgstr "कोई ग्राफ़िक्स बैकेंड अनुक्रमणिका %d के साथ नहीं "
 
-#, c-format
-msgid "No host CPU specified in '%s'"
-msgstr "कोई मेजबान CPU '%s' में निर्दिष्ट नहीं"
-
 msgid "No master USB controller specified"
 msgstr "कोई मास्टर USB नियंत्रक निर्दिष्ट नहीं"
 
@@ -4586,9 +4493,6 @@ msgstr "विश्लेषित JSON जवाब '%s' कोई वस्
 msgid "Password request failed"
 msgstr "कूटशब्द निवेदन असफल"
 
-msgid "Password request seen, but no handler available"
-msgstr "पासवर्ड अनुरोध देखे, लेकिन कोई हैंडलर उपलब्ध नहीं "
-
 msgid "Path"
 msgstr "पथ"
 
@@ -5588,9 +5492,6 @@ msgstr ""
 msgid "This host is not managed by a vCenter"
 msgstr "यह होस्ट vCenter द्वारा प्रबंधित नहीं है"
 
-msgid "This libvirtd build does not support TLS"
-msgstr "इस libvirtd बिल्ड  में TLS का समर्थन नहीं है."
-
 msgid "This type of device cannot be hot unplugged"
 msgstr "युक्ति प्रकार को हॉट प्लग नहीं किया जा सकता है"
 
@@ -5919,10 +5820,6 @@ msgstr "भंडारण sps का आकार निर्धारित
 msgid "Unable to determine storage sps's source adapter."
 msgstr "भंडारण sps का स्रोत अनुकूलक निर्धारित कर पाने में अक्षम."
 
-#, c-format
-msgid "Unable to extract disk path from %s"
-msgstr "डिस्क पथ %s से निकालने में असमर्थ"
-
 msgid "Unable to find 'cpuacct' cgroups controller mount"
 msgstr "'cpuacct' cgroups नियंत्रक माउंट ढूंढने में अक्षम"
 
@@ -6022,6 +5919,9 @@ msgstr "%s को खोलने में विफल"
 msgid "Unable to open %s (%d)"
 msgstr "%s (%d) खोलने में असमर्थ"
 
+msgid "Unable to open /proc/mounts"
+msgstr "/proc/mounts को खोलने में असमर्थ"
+
 msgid "Unable to open UNIX socket"
 msgstr "UNIX सॉकेट खोलने में असमर्थ"
 
@@ -6230,9 +6130,6 @@ msgstr "गैर peer2peer माइग्रेशन के साथ अन
 msgid "Unexpected disk sgio mode '%d'"
 msgstr "अप्रत्याशित डिस्क sgio मोड '%d'"
 
-msgid "Unexpected error"
-msgstr "अप्रत्याशित त्रुटि"
-
 #, c-format
 msgid "Unexpected filesystem type %s"
 msgstr "अप्रत्याशित filesystem प्रकार %s"
@@ -6241,10 +6138,6 @@ msgstr "अप्रत्याशित filesystem प्रकार %s"
 msgid "Unexpected hostdev mode %d"
 msgstr "अप्रत्याशित होस्टडेव विधि %d"
 
-#, c-format
-msgid "Unexpected line > %d characters when parsing output of '%s'"
-msgstr "अप्रत्याशित पंक्ति > %d वर्ण जब '%s' के आउटपुट का विश्लेषण कर रहा है"
-
 msgid "Unexpected lock parameters for disk resource"
 msgstr "अप्रत्याशित लॉक पैरामीटर डिस्क संसाधन के लिए "
 
@@ -6755,10 +6648,6 @@ msgstr ""
 "सक्रिय qemu डोमेन को बाहरी डिस्क स्नैपशॉट की आवश्यकता होती है, डिस्क %s आंतरिक अनुरोध "
 "किया"
 
-#, c-format
-msgid "adding %s device failed: %s"
-msgstr "%s युक्ति विफल रहा: %s"
-
 #, c-format
 msgid "address type='%s' not supported in hostdev interfaces"
 msgstr "address type='%s' समर्थित नहीं है hostdev अंतरफलक में"
@@ -6912,10 +6801,6 @@ msgstr "बूल"
 msgid "boot order '%s' used for more than one device"
 msgstr "बूट क्रम '%s' एक से अधिक उपकरण के लिए उपयोग होना चाहिए"
 
-msgid ""
-"booting from assigned PCI devices is not supported with this version of qemu"
-msgstr "सौपे गए PCI युक्ति से बूटिंग qemu के इस संस्करण से समर्थित नहीं है"
-
 #, c-format
 msgid "bridge '%s' has an invalid netmask or IP address"
 msgstr "ब्रिज '%s' एक अवैध netmask या आईपी पता है"
@@ -7155,9 +7040,6 @@ msgstr "\tunnelled माइग्रेशन के लिए पाइप न
 msgid "cannot create snapshot directory '%s'"
 msgstr "स्नैपशॉट निर्देशिका '%s' बना नहीं सकता है"
 
-msgid "cannot create virtual FAT disks in read-write mode"
-msgstr "आभासी FAT डिस्क को लेखन-पठन मोड में बना नहीं सकता है"
-
 #, c-format
 msgid "cannot decode CPU data for %s architecture"
 msgstr "CPU डाटा को %s ऑर्किटेक्चर के लिए डिकोड नहीं कर सकता है"
@@ -7317,9 +7199,6 @@ msgstr "सुरक्षा प्रस्ताव %d (%s) पा नही
 msgid "cannot get the host uuid"
 msgstr "होस्ट uuid नहीं मिल पाया "
 
-msgid "cannot get the path of MEMORY cgroup controller"
-msgstr "मेमोरी cgroup नियंत्रक का का रास्ता नहीं मिल सकता है"
-
 msgid "cannot get vCPU placement & pCPU time"
 msgstr "vCPU स्थापन व pCPU समय नहीं पा सकता है"
 
@@ -7374,9 +7253,6 @@ msgstr "निष्पादन रोकने के साथ कॉलर
 msgid "cannot mix string I/O with daemon"
 msgstr "डेमॉन के साथ मैं / हे स्ट्रिंग मिश्रण नहीं कर सकते"
 
-msgid "cannot modify network device alias"
-msgstr "संजाल युक्ति उपनाम संशोधित नहीं कर सकते"
-
 msgid "cannot modify network device boot index setting"
 msgstr "संजाल युक्ति बूट सूची सेटिंग संशोधित नहीं कर सकते"
 
@@ -7419,10 +7295,6 @@ msgstr "वॉल्यूम '%s' खोल नहीं सकता है"
 msgid "cannot parse %s version number in '%.*s'"
 msgstr "%s संस्करण संख्या का विश्लेषण नहीं कर सकता है '%.*s' में "
 
-#, c-format
-msgid "cannot parse CPU map for %s architecture"
-msgstr "CPU मानचित्र %s ऑर्किटेक्चर के लिए  विश्लेषित नहीं कर सकता है"
-
 #, c-format
 msgid "cannot parse CPU topology '%s'"
 msgstr "CPU टोपोलॉजी '%s' का विश्लेषण नहीं कर सकता है"
@@ -7477,18 +7349,6 @@ msgstr "युक्ति अंत स्थान का विश्ले
 msgid "cannot parse device start location"
 msgstr "युक्ति आरंभ स्थान का विश्लेषण नहीं कर सकता है"
 
-#, c-format
-msgid "cannot parse disk migration data remaining statistic %s"
-msgstr "डिस्क उत्प्रवासन आँकड़ा शेष सांख्यिकी %s विश्लेषित नहीं कर सकता है"
-
-#, c-format
-msgid "cannot parse disk migration data total statistic %s"
-msgstr "डिस्क उत्प्रवासन आँकड़ा सकल सांख्यिकी %s विश्लेषित नहीं कर सकता है"
-
-#, c-format
-msgid "cannot parse disk migration data transferred statistic %s"
-msgstr "डिस्क उत्प्रवासन आँकड़ा हस्तांतरित सांख्यिकी %s विश्लेषित नहीं कर सकता है"
-
 #, c-format
 msgid "cannot parse drive bus '%s'"
 msgstr "'%s' ड्राइव बस का विश्लेषण नहीं कर सकता है"
@@ -7515,18 +7375,6 @@ msgstr "IO मोड '%s' को विश्लेषित नहीं कर
 msgid "cannot parse json %s: %s"
 msgstr "json %s विश्लेषित नहीं कर सकता है: %s"
 
-#, c-format
-msgid "cannot parse migration data remaining statistic %s"
-msgstr "उत्प्रवासन आँकड़ा शेष सांख्यिकी %s विश्लेषित नहीं कर सकता है"
-
-#, c-format
-msgid "cannot parse migration data total statistic %s"
-msgstr "उत्प्रवासन आँकड़ा सकल सांख्यिकी %s विश्लेषित नहीं कर सकता है"
-
-#, c-format
-msgid "cannot parse migration data transferred statistic %s"
-msgstr "उत्प्रवासन आँकड़ा हस्तांतरित सांख्यिकी %s विश्लेषित नहीं कर सकता है"
-
 #, c-format
 msgid "cannot parse nbd filename '%s'"
 msgstr "nbd फ़ाइलनाम '%s' को विश्लेषित नहीं कर सकता है"
@@ -7962,10 +7810,6 @@ msgstr "कान्फिग मान %s विरूपित था"
 msgid "config value %s was missing"
 msgstr "कान्फिग मान %s गुम था"
 
-#, c-format
-msgid "config value %s was not a string"
-msgstr "कॉन्फिग मान %s एक स्ट्रिंग नहीं था"
-
 msgid "configuration file syntax error"
 msgstr "विन्यास फाइल वाक्य रचना त्रुटि"
 
@@ -8040,10 +7884,6 @@ msgstr "निरपेक्ष इनपुट फाइल पथ नही
 msgid "could not build absolute output file path"
 msgstr "निरपेक्ष आउटपुट फाइल पथ नहीं बना सका "
 
-#, c-format
-msgid "could not change media on %s: %s"
-msgstr " मीडिया परिवर्तित नहीं कर सका %s पर: %s"
-
 msgid "could not close handshake fd"
 msgstr "हैंडशेक fd बन्द नहीं कर सका"
 
@@ -8079,10 +7919,6 @@ msgstr "प्रोफाइल नहीं बना सकते"
 msgid "could not determine max vcpus for the domain"
 msgstr "डोमेन के लिए अधिकमत vcpus निर्धारित नहीं कर सकता है"
 
-#, c-format
-msgid "could not eject media on %s: %s"
-msgstr "%s पर मीडिया नहीं निकला सका: %s"
-
 msgid "could not find libvirtd"
 msgstr "libvirtd नहीं ढूँढ़ सका"
 
@@ -8277,9 +8113,6 @@ msgstr "वर्तमान"
 msgid "current vcpu count must equal maximum"
 msgstr "मौजूदा vcpu संख्या अधिकतम बराबर होना अनिवार्य है "
 
-msgid "currently is supported only taking screenshots of screen ID 0"
-msgstr "मौजूदा में केवल स्क्रीन आईडी 0 के screenshots लेने समर्थित है"
-
 msgid "data sinks cannot be used for non-blocking streams"
 msgstr "गैर ब्लॉकिंग स्ट्रीम के लिए आँकड़ा सिंक प्रयोग नहीं किया जा सकता है"
 
@@ -8340,10 +8173,6 @@ msgstr "डिस्क युक्ति अलग करें"
 msgid "detach network interface"
 msgstr "संजाल अंतरफलक अलग करें"
 
-#, c-format
-msgid "detaching %s device failed: %s"
-msgstr "%s युक्ति को अलगाना विफल: %s"
-
 #, c-format
 msgid "device %s is not a PCI device"
 msgstr "%s युक्ति कोई PCI युक्ति नहीं है"
@@ -8363,9 +8192,6 @@ msgstr "युक्ति डोमेन विन्यास में प
 msgid "device key"
 msgstr "युक्ति कुंजी"
 
-msgid "device name rejected"
-msgstr "डिवाइस का नाम अस्वीकार कर दिया"
-
 msgid "device not present in domain configuration"
 msgstr "डोमेन संरचना में नहीं युक्ति"
 
@@ -8412,10 +8238,6 @@ msgstr "स्वतः आरंभन निष्क्रिय करें
 msgid "discover potential storage pool sources"
 msgstr "संभावित स्टोरेज पूल स्रोत खोजें"
 
-#, c-format
-msgid "disk %s does not have any encryption information"
-msgstr "डिस्क %s के पास कोई गोपन सूचना नहीं है"
-
 #, c-format
 msgid "disk %s not found"
 msgstr "डिस्क %s नहीं मिला"
@@ -8611,9 +8433,6 @@ msgstr "डोमेन कार्य सूचना"
 msgid "domain name or uuid"
 msgstr "डोमेन नाम या uuid"
 
-msgid "domain name, id or uuid"
-msgstr "डोमेन नाम, id या uuid"
-
 msgid "domain save job"
 msgstr "डोमेन कार्य सहेजें"
 
@@ -9005,10 +8824,6 @@ msgstr "SASL लाइब्रेरी को आरंभ करने मे
 msgid "failed to list host interfaces: %s%s%s"
 msgstr "होस्ट अंतरफलक के सूचीकरण में विफल: %s%s%s "
 
-#, c-format
-msgid "failed to load module %s %s"
-msgstr "%s मॉड्यूल को लोड करने में विफल %s"
-
 #, c-format
 msgid "failed to lookup interface with MAC address '%s'"
 msgstr "मैक पते '%s' के साथ इंटरफेस देखने करने में विफल"
@@ -9048,9 +8863,6 @@ msgstr "%s विन्यास फाइल के विश्लेषण
 msgid "failed to parse qemu capabilities flags"
 msgstr "qemu क्षमता वाले ध्वजों का विश्लेषण करने में विफल रहा"
 
-msgid "failed to parse xml document"
-msgstr "xml दस्तावेज़ विश्लेषण में असमर्थ"
-
 msgid "failed to read AppArmor template"
 msgstr "AppArmor प्रोफाइल टेम्पलेट पढ़ने में विफल"
 
@@ -9099,10 +8911,6 @@ msgstr "ट्रांजेक्शन रोलबैक करने मे
 msgid "failed to run apparmor_parser"
 msgstr "apparmor_parser चलाने में विफल"
 
-#, c-format
-msgid "failed to save chardev path '%s'"
-msgstr "chardev पथ '%s' सहेजने में विफल"
-
 msgid "failed to save content"
 msgstr "सामग्री सहेजने में विफल"
 
@@ -9110,10 +8918,6 @@ msgstr "सामग्री सहेजने में विफल"
 msgid "failed to seek to end of %s"
 msgstr "%s के अंत की तलाश करने में विफल"
 
-#, c-format
-msgid "failed to send key '%s'"
-msgstr "'%s' कुंजी भेजने में विफल"
-
 msgid "failed to serialize S-Expr"
 msgstr "S-Expr को सीरियलाइज करने में विफल"
 
@@ -9250,10 +9054,6 @@ msgstr "मंजिल विशेषता अभी तक इस नेट
 msgid "forbidden characters in 'compat' attribute"
 msgstr "'compat' विशेषता में निषिद्ध वर्ण"
 
-#, c-format
-msgid "format='qcow' passphrase for %s must not contain a '\\0'"
-msgstr "format='qcow' कूटशब्द %s के लिए जरूर किसी '\\0' को समाहित रखना चाहिए"
-
 #, c-format
 msgid "formatter for %s %s reported error"
 msgstr "%s %s रिपोर्ट की गयी त्रुटि के लिए फोर्मेटर"
@@ -9375,9 +9175,6 @@ msgstr "हब प्रकार %s समर्थित नहीं"
 msgid "hypervisor connection URI"
 msgstr "हाइपरविजर कनेक्शन URI"
 
-msgid "hypervisor lacks deviceboot feature"
-msgstr "हाइपरविजर deviceboot सुविधा का अभाव है"
-
 msgid "iSCSI storage pool does not support volume creation"
 msgstr "iSCSI भंडारण पूल मात्रा निर्माण का समर्थन नहीं करता है"
 
@@ -9434,9 +9231,6 @@ msgstr "गलत बूट क्रम '%s', धनात्मक पूर
 msgid "info balloon reply was missing balloon data"
 msgstr "सूचना बलून उत्तर में बलून आँकड़ा अनुपस्थित था"
 
-msgid "info block not supported by this qemu"
-msgstr "info block इस qemu के द्वारा समर्थित नहीं"
-
 msgid "info migration reply was missing return status"
 msgstr "सूचना प्रवास उत्तर में वापसी स्टैट्स अनुपस्थित था"
 
@@ -9508,10 +9302,6 @@ msgstr ""
 msgid "invalid <address> element found in <forward> of network %s"
 msgstr "संजाल %s के <forward> में पाया अवैध <address> तत्व"
 
-#, c-format
-msgid "invalid <encryption> for volume %s"
-msgstr "अवैध <encryption> आयतन %s के लिए"
-
 #, c-format
 msgid "invalid <host> element found in <dns> of network %s"
 msgstr "अवैध <host> तत्व संजाल %s के <dns> में पाया"
@@ -9661,10 +9451,6 @@ msgstr "अवैध catchup घुमाव"
 msgid "invalid catchup threshold"
 msgstr "अवैध कैचअप थ्रेसहोल्ड"
 
-#, c-format
-msgid "invalid certificate name: %s"
-msgstr "अवैध प्रमाणपत्र नाम: %s"
-
 msgid "invalid cipher size for TLS session"
 msgstr "TLS सत्र के लिए अवैध साइफर आकार"
 
@@ -9680,10 +9466,6 @@ msgstr "इसमें अवैध कनेक्शन संकेतक"
 msgid "invalid connection pointer in %s"
 msgstr "%s में अवैध कनेक्शन संकेतक"
 
-#, c-format
-msgid "invalid database name: %s"
-msgstr "अवैध डाटाबेस नाम: %s"
-
 #, c-format
 msgid "invalid device name '%s'"
 msgstr "अवैध युक्ति नाम '%s'"
@@ -10146,14 +9928,6 @@ msgstr "उत्प्रवासन URI, प्रायः मिटाय
 msgid "migration protocol going backwards %s => %s"
 msgstr "उत्प्रवासन प्रोटोकॉल %s पीछे की ओर जा रहा है => %s"
 
-#, c-format
-msgid "migration to '%s' failed: %s"
-msgstr "'%s' में उत्प्रवासन विफल: %s"
-
-#, c-format
-msgid "migration to '%s' not supported by this qemu: %s"
-msgstr "'%s' में उत्प्रवासन इस qemu के द्वारा समर्थित नहीं: %s"
-
 msgid "migration was active, but RAM 'remaining' data was missing"
 msgstr "प्रवास सक्रिय था लेकिन RAM 'शेष' आंकड़ा गुम था"
 
@@ -10779,9 +10553,6 @@ msgstr "'%s' के लिए कोई ब्लॉक युक्ति प
 msgid "no call waiting for reply with prog %d vers %d serial %d"
 msgstr " prog %d vers %d serial %d के साथ उत्तर के लिए कोई कॉल प्रतीक्षारत नहीं"
 
-msgid "no callback provided"
-msgstr "कोई कॉलबैक नहीं दिया गया"
-
 msgid "no client username was found"
 msgstr "कोई क्लाइंट उपयोक्तानाम नहीं मिला था"
 
@@ -10801,14 +10572,6 @@ msgstr "%s उपनाम के साथ कोई युक्ति नह
 msgid "no disk format for %s and probing is disabled"
 msgstr "%s के लिए कोई डिस्क प्रारूप नहीं और जाँच निष्क्रिय है"
 
-#, c-format
-msgid "no disk found with alias %s"
-msgstr "%s उपनाम के साथ कोई डिस्क नहीं मिला"
-
-#, c-format
-msgid "no disk found with path %s"
-msgstr "पथ %s के साथ कोई डिस्क नहीं मिला"
-
 #, c-format
 msgid "no disk named '%s'"
 msgstr "कोई %s नाम का डिस्क नहीं "
@@ -11253,14 +11016,6 @@ msgstr "pwd: मौजूदा निर्देशिका नहीं प
 msgid "qemu does not support SGA"
 msgstr "qemu SGA का समर्थन नहीं करता है"
 
-#, c-format
-msgid "qemu does not support closing of file handles: %s"
-msgstr "qemu फ़ाइल नियंत्रण के बंद करने का समर्थन नहीं करता है: %s"
-
-#, c-format
-msgid "qemu does not support sending of file handles: %s"
-msgstr "qemu फ़ाइल नियंत्रण के प्रेषण का समर्थन नहीं करता है: %s"
-
 #, c-format
 msgid "qemu emulator '%s' does not support xen"
 msgstr "qemu एमुलेटर '%s' xen का समर्थन नहीं करता है"
@@ -11389,12 +11144,6 @@ msgstr "शुरू करने के बाद स्नैपशॉट व
 msgid "returned buffer is not same size as requested"
 msgstr "वापस बफर आग्रहित आकार के समान नहीं है"
 
-msgid "reuse is not supported with this QEMU binary"
-msgstr "QEMU द्विपदीय के साथ फिर उपयोग समर्थित नहीं है"
-
-msgid "rombar and romfile are supported only for PCI devices"
-msgstr "rombar और romfile केवल PCI युक्ति के लिए समर्थन है"
-
 msgid "root element was not source"
 msgstr "रूट तत्व स्रोत नहीं था"
 
@@ -11465,9 +11214,6 @@ msgstr "XML में गुप्त विशेषता"
 msgid "secret is private"
 msgstr "गुप्त निजी है"
 
-msgid "secrets already defined"
-msgstr "गुप्त पहले से परिभाषित"
-
 #, c-format
 msgid "security DOI string exceeds max %d bytes"
 msgstr "सुरक्षा DOI स्ट्रिंग अधिकतम %d बाइट से अधिक हो गई"
@@ -11513,12 +11259,6 @@ msgstr "कोई गुप्त मान सेट करें"
 msgid "set maximum tolerable downtime"
 msgstr "अधिकतम सहनशीलता डाउनटाइम सेट करें"
 
-msgid "setting VNC password failed"
-msgstr "VNC कूटशब्द का सेट करना विफल"
-
-msgid "setting disk password is not supported"
-msgstr "डिस्क कूटशब्द की सेटिंग समर्थित नहीं है"
-
 msgid "setting up HAL callbacks failed"
 msgstr "HAL कॉलबैक का सेटअप विफल"
 
@@ -11674,10 +11414,6 @@ msgstr "भंडारण पुल '%s' पहले से सक्रिय
 msgid "storage pool '%s' is not active"
 msgstr "भंडारण पुल '%s' सक्रिय नहीं है"
 
-msgid ""
-"storage pool does not support building encrypted volumes from other volumes"
-msgstr "दूसरे आयतन से गोपित आयतन निर्माण में भंडारण पूल समर्थन नहीं करता है"
-
 msgid "storage pool does not support encrypted volumes"
 msgstr "भंडारण पुल गोपित आयतन का समर्थन नहीं करता है"
 
@@ -11817,9 +11553,6 @@ msgstr "मैक पते '%s' में कई इंटरफेस से
 msgid "the default lockspace already exists"
 msgstr "डिफ़ॉल्ट lockspace पहले से मौजूद है"
 
-msgid "the disk password is incorrect"
-msgstr "डिस्क कूटशब्द गलत है"
-
 msgid "the domain does not have a current snapshot"
 msgstr "डोमेन में कोई मौजूदा स्नैपशॉट नहीं है "
 
@@ -11933,9 +11666,6 @@ msgstr "%s में कई ड्राइवर पंजीकृत है
 msgid "too many memory stats requested: %d > %d"
 msgstr "कई स्मृति स्टैट आग्रहित: %d > %d"
 
-msgid "too many secrets for qcow encryption"
-msgstr "qcow गोपन के लिए कई गुप्त"
-
 msgid "total and read/write bytes_sec cannot be set at the same time"
 msgstr "कुल और read/write bytes_sec एक ही समय में सेट नहीं किया जा सकता है"
 
@@ -12020,10 +11750,6 @@ msgstr "उपकरण %s का उपयोग करने में अस
 msgid "unable to access disk %s\n"
 msgstr "डिस्क %s का उपयोग करने में असमर्थ\n"
 
-#, c-format
-msgid "unable to add host net: %s"
-msgstr "मेजबान नेट जोड़ने में असमर्थ: %s"
-
 #, c-format
 msgid "unable to allocate socket security context '%s'"
 msgstr "गर्तिका सुरक्षा संदर्भ '%s' आवंटित करने में असमर्थ"
@@ -12067,9 +11793,6 @@ msgstr ""
 "संजाल '%s' अंतरफलक '%s' को नष्ट करने में असमर्थ. यह वर्तमान में %d डोमेन द्वारा इस्तेमाल "
 "किया जा रहा है."
 
-msgid "unable to determine array size"
-msgstr "सरणी का आकार निर्धारित करने में असमर्थ"
-
 #, c-format
 msgid "unable to execute QEMU command '%s'"
 msgstr "QEMU कमांड '%s' के निष्पादन में असमर्थ"
@@ -12125,10 +11848,6 @@ msgstr "सर्वर cert %s को पढ़ने में असमर्
 msgid "unable to register monitor events"
 msgstr "मॉनिटर घटना पंजीकृत करने में असमर्थ"
 
-#, c-format
-msgid "unable to send file handle '%s': %s"
-msgstr "फ़ाइल नियंत्रण '%s' भेजने में असमर्थ: %s"
-
 #, c-format
 msgid "unable to set ownership of '%s' to %d:%d"
 msgstr "'%s' के स्वामित्व को %d में सेट करने में असमर्थ:%d"
@@ -12222,14 +11941,6 @@ msgstr "अप्रत्याशित पता प्रकार ide ड
 msgid "unexpected address type for scsi disk"
 msgstr "अप्रत्याशित पता प्रकार scsi डिस्क के लिए"
 
-#, c-format
-msgid "unexpected async job %d"
-msgstr "अप्रत्याशित async कार्य %d"
-
-#, c-format
-msgid "unexpected balloon information '%s'"
-msgstr "अनपेक्षित बैलून जानकारी '%s'"
-
 #, c-format
 msgid "unexpected boot device type %d"
 msgstr "अप्रत्याशित बूट युक्ति प्रकार %d"
@@ -12268,18 +11979,10 @@ msgstr "अप्रत्याशित डिस्क पता प्रक
 msgid "unexpected disk bus %d"
 msgstr "अप्रत्याशित डिस्क बस %d"
 
-#, c-format
-msgid "unexpected disk cache mode %d"
-msgstr "अप्रत्याशित डिस्क कैश मोड %d"
-
 #, c-format
 msgid "unexpected disk device %d"
 msgstr "अप्रत्याशित डिस्क युक्ति %d"
 
-#, c-format
-msgid "unexpected disk io mode %d"
-msgstr "अप्रत्याशित डिस्क io मोड %d"
-
 #, c-format
 msgid "unexpected disk type %d"
 msgstr "अप्रत्याशित डिस्क प्रकार %d"
@@ -12378,10 +12081,6 @@ msgstr "अप्रत्याशित pci hostdev ड्राइवर न
 msgid "unexpected pool type"
 msgstr "अप्रत्याशित पूल प्रकार"
 
-#, c-format
-msgid "unexpected reply from info status: %s"
-msgstr "जानकारी की स्थिति से अनपेक्षित उत्तर: %s"
-
 #, c-format
 msgid "unexpected root element <%s> expecting <device>"
 msgstr "अप्रत्याशित रूट तत्व <%s>, <device> की आशा"
@@ -13109,10 +12808,6 @@ msgstr "संजाल %s अंतरफलक पूल में असम
 msgid "unsupported disk bus '%s' with device setup"
 msgstr "असमर्थित डिस्क बस '%s' युक्ति सेटअप के साथ"
 
-#, c-format
-msgid "unsupported disk driver type for '%s'"
-msgstr "असमर्थित डिस्क ड्राइवर प्रकार '%s' के लिए"
-
 #, c-format
 msgid "unsupported disk type %s"
 msgstr "असमर्थित डिस्क प्रकार %s"

po/hr.mini.po

@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libvirt 4.3.0\n"
+"Project-Id-Version: libvirt 4.10.0\n"
 "Report-Msgid-Bugs-To: https://libvirt.org/bugs.html\n"
-"POT-Creation-Date: 2018-04-24 12:51+0100\n"
+"POT-Creation-Date: 2018-11-28 16:52+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Croatian\n"
@@ -17,4 +17,4 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
-"X-Generator: Zanata 3.9.6\n"
+"X-Generator: Zanata 4.6.2\n"

po/hu.mini.po

@@ -8,10 +8,10 @@
 # Gabor Egry <gaba@freemail.hu>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: libvirt 4.3.0\n"
+"Project-Id-Version: libvirt 4.10.0\n"
 "Report-Msgid-Bugs-To: https://libvirt.org/bugs.html\n"
-"POT-Creation-Date: 2018-04-24 12:51+0100\n"
-"PO-Revision-Date: 2015-02-27 04:56-0500\n"
+"POT-Creation-Date: 2018-11-28 16:52+0000\n"
+"PO-Revision-Date: 2015-02-27 04:56+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Hungarian (http://www.transifex.com/projects/p/fedora/"
 "language/hu/)\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Zanata 3.9.6\n"
+"X-Generator: Zanata 4.6.2\n"
 
 msgid ""
 "\n"
@@ -566,9 +566,6 @@ msgstr "a tartományinformáció nem teljes - vbd nem rendelkezik forrással"
 msgid "domain name or uuid"
 msgstr "tartománynév vagy uuid"
 
-msgid "domain name, id or uuid"
-msgstr "tartománynév, azonosító vagy uuid"
-
 msgid "domain state"
 msgstr "tartományállapot"