maint: this branch is now dead

Upstream is no longer willing to backport patches to a branch
this old.  If you disagree with the policy, please volunteer
to become the branch maintainer on libvir-list@redhat.com

Signed-off-by: Eric Blake <eblake@redhat.com>

.dir-locals.el

@@ -1,11 +0,0 @@
-(
- (c-mode . (
-            (c-file-style . "K&R")
-            (indent-tabs-mode . nil)
-            (c-indent-level . 4)
-            (c-basic-offset . 4)
-            ))
- (html-mode . (
-	       (indent-tabs-mode . nil)
-	       ))
- )

.gitignore

@@ -1,7 +1,3 @@
-!/m4/compiler-flags.m4
-!/po/*.po
-!/po/POTFILES.in
-!/po/libvirt.pot
 *#*#
 *.#*#
 *.a
@@ -16,51 +12,43 @@
 .git
 .git-module-status
 .sc-start-sc_*
-/ABOUT-NLS
-/COPYING
-/ChangeLog
 /GNUmakefile
-/INSTALL
-/NEWS
-/aclocal.m4
-/autom4te.cache
-/build-aux
-/build-aux/
-/config.cache
-/config.guess
-/config.h
-/config.h.in
-/config.log
-/config.rpath
-/config.status
-/config.sub
-/configure
-/configure.lineno
-/gnulib/
-/libtool
-/libvirt-*.tar.gz
 /libvirt-[0-9]*
-/libvirt.pc
-/libvirt.spec
-/ltconfig
-/ltmain.sh
-/m4/
 /maint.mk
-/mingw32-libvirt.spec
-/mkinstalldirs
-/po/
-/proxy/
-/tests/*.log
-/tests/cputest
-/tests/nwfilterxml2xmltest
-/update.log
+ABOUT-NLS
+COPYING
+ChangeLog
+INSTALL
 Makefile
 Makefile.in
-TAGS
+NEWS
+aclocal.m4
+autom4te.cache
+config.cache
+config.guess
+config.h
+config.h.in
+config.log
+config.rpath
+config.status
+config.sub
+configure
 coverage
 cscope.files
 cscope.out
+gnulib/
+libtool
+libvirt-*.tar.gz
+libvirt.pc
+libvirt.spec
+ltconfig
+ltmain.sh
+mingw32-libvirt.spec
+mkinstalldirs
 results.log
 stamp-h
 stamp-h.in
 stamp-h1
+tests/*.log
+tests/nwfilterxml2xmltest
+update.log

.mailmap

@@ -1,16 +0,0 @@
-<amy.griffis@hp.com> <aron.griffis@hp.com>
-<bozzolan@gmail.com> <redshift@gmx.com>
-<charles_duffy@messageone.com> <charles@dyfis.net>
-<dfj@redhat.com> <dfj@dfj.bne.redhat.com>
-<eblake@redhat.com> <ebb9@byu.net>
-<gdolley@arpnetworks.com> <gdolley@ucla.edu>
-<gerhard.stenzel@de.ibm.com> <gstenzel@linux.vnet.ibm.com>
-<jamie@canonical.com> <jamie@ubuntu.com>
-<laine@redhat.com> <laine@laine.org>
-<meyering@redhat.com> <jim@meyering.net>
-<socketpair@gmail.com> <socketpair gmail com>
-<soren@linux2go.dk> <soren@ubuntu.com>
-<jfehlig@novell.com> <jfehlig@linux-ypgk.site>
-<jclift@redhat.com> <justin@salasaga.org>
-<berrange@redhat.com> <dan@berrange.com>
-<soren@linux2go.dk> <soren@canonical.com>

.x-sc_avoid_ctype_macros

@@ -1 +0,0 @@
-^gnulib/.*

.x-sc_avoid_if_before_free

@@ -1 +0,0 @@
-^ChangeLog

.x-sc_avoid_write

@@ -1,9 +0,0 @@
-^src/libvirt\.c$
-^src/fdstream\.c$
-^src/qemu/qemu_monitor\.c$
-^src/util/command\.c$
-^src/util/util\.c$
-^src/xen/xend_internal\.c$
-^daemon/libvirtd.c$
-^gnulib/
-^tools/console.c$

.x-sc_bindtextdomain

@@ -1,2 +0,0 @@
-^tests/.*
-^examples/.*

.x-sc_m4_quote_check

@@ -1 +0,0 @@
-^gnulib/m4/intl\.m4$

.x-sc_po_check

@@ -1 +0,0 @@
-^docs/

.x-sc_prohibit_HAVE_MBRTOWC

@@ -1 +0,0 @@
-gnulib/.*

.x-sc_prohibit_VIR_ERR_NO_MEMORY

@@ -1,5 +0,0 @@
-^ChangeLog$
-^ChangeLog-old$
-^include/libvirt/virterror\.h$
-^daemon/dispatch\.c$
-^src/util/virterror\.c$

.x-sc_prohibit_always_true_header_tests

@@ -1,4 +0,0 @@
-ChangeLog*
-docs/news.html.in
-python/libvirt-override.c
-python/typewrappers.c

.x-sc_prohibit_asprintf

@@ -1,5 +0,0 @@
-ChangeLog
-^bootstrap.conf$
-^gnulib/
-^po/
-^src/util/util.c$

.x-sc_prohibit_close

@@ -1,9 +0,0 @@
-# Non-C files:
-^docs/.*
-^ChangeLog*
-^HACKING$
-*\.py$
-# Wrapper implementation:
-^src/util/files\.c$
-# Only uses close in documentation comments:
-^src/libvirt\.c$

.x-sc_prohibit_empty_lines_at_EOF

@@ -1,2 +0,0 @@
-^docs/api_extension/.*
-^tests/qemuhelpdata/.*

.x-sc_prohibit_fork_wrappers

@@ -1,8 +0,0 @@
-^docs/.*
-^HACKING$
-^src/util/util\.c$
-^tests/testutils\.c$
-# Files that we may want to convert over to virCommand someday...
-^daemon/libvirtd\.c$
-^src/libvirt\.c$
-^src/lxc/lxc_controller\.c$

.x-sc_prohibit_gethostby

@@ -1,2 +0,0 @@
-^gnulib/lib/getaddrinfo\.c$
-^gnulib/m4/

.x-sc_prohibit_gethostname

@@ -1,2 +0,0 @@
-^src/util/util\.c$
-^ChangeLog-old$

.x-sc_prohibit_gettext_noop

@@ -1,2 +0,0 @@
-ChangeLog*
-docs/news.html.in

.x-sc_prohibit_have_config_h

@@ -1 +0,0 @@
-^gnulib/lib/strsep\.c$

.x-sc_prohibit_nonreentrant

@@ -1,10 +0,0 @@
-^gnulib/
-^po/
-^ChangeLog$
-^ChangeLog-old$
-^Makefile*
-^docs/
-^tests/
-^tools/virsh\.c$
-^tools/console\.c$
-^build-aux/

.x-sc_prohibit_readlink

@@ -1,2 +0,0 @@
-^src/util/util\.c$
-^ChangeLog-old$

.x-sc_prohibit_sprintf

@@ -1,4 +0,0 @@
-^docs/
-^po/
-^ChangeLog
-^HACKING

.x-sc_prohibit_strncpy

@@ -1,2 +0,0 @@
-^src/util/util\.c$
-^tools/virsh\.c$

.x-sc_prohibit_test_minus_ao

@@ -1 +0,0 @@
-docs/news.html.in

.x-sc_prohibit_xmlGetProp

@@ -1 +0,0 @@
-^src/util/xml.c$

.x-sc_require_config_h

@@ -1,4 +0,0 @@
-^examples/
-^gnulib/lib/dummy\.c$
-^gnulib/tests/dummy\.c$
-^ChangeLog$

.x-sc_require_config_h_first

@@ -1 +0,0 @@
-^examples/

.x-sc_trailing_blank

@@ -1,7 +0,0 @@
-\.fig$
-\.gif$
-\.ico$
-\.png$
-^ChangeLog$
-^NEWS$
-^docs/.*

.x-sc_unmarked_diagnostics

@@ -1,2 +0,0 @@
-docs/apibuild.py
-tests/virt-aa-helper-test

AUTHORS

@@ -1,166 +0,0 @@
-   libvirt Authors
-   ===============
-
-The libvirt project was initiated by:
-
-  Daniel Veillard      <veillard@redhat.com> or <daniel@veillard.com>
-
-The primary maintainers and people with commit access rights:
-
-  Daniel Veillard      <veillard@redhat.com>
-  Daniel Berrange      <berrange@redhat.com>
-  Richard W.M. Jones   <rjones@redhat.com>
-  Karel Zak            <kzak@redhat.com>
-  Mark McLoughlin      <markmc@redhat.com>
-  Anthony Liguori      <aliguori@us.ibm.com>
-  Jim Meyering         <meyering@redhat.com>
-  Jim Fehlig           <jfehlig@novell.com>
-  Chris Lalancette     <clalance@redhat.com>
-  Atsushi SAKAI        <sakaia@jp.fujitsu.com>
-  Dave Leskovec        <dlesko@linux.vnet.ibm.com>
-  Cole Robinson        <crobinso@redhat.com>
-  Dan Smith            <danms@us.ibm.com>
-  Guido Günther        <agx@sigxcpu.org>
-  John Levon           <john.levon@sun.com>
-  Matthias Bolte       <matthias.bolte@googlemail.com>
-  Jiří Denemark        <jdenemar@redhat.com>
-  Dave Allan           <dallan@redhat.com>
-  Laine Stump          <laine@redhat.com>
-  Stefan Berger        <stefanb@us.ibm.com>
-  Eric Blake           <eblake@redhat.com>
-  Justin Clift         <jclift@redhat.com>
-  Osier Yang           <jyang@redhat.com>
-
-Patches have also been contributed by:
-
-  David Lutterkort     <dlutter@redhat.com>
-  Andrew Puch          <apuch@redhat.com>
-  Philippe Berthault   <philippe.berthault@Bull.net>
-  Hugh Brock           <hbrock@redhat.com>
-  Michel Ponceau       <michel.ponceau@bull.net>
-  Jeremy Katz          <katzj@redhat.com>
-  Pete Vetere          <pvetere@redhat.com>
-  Kazuki Mizushima     <mizushima.kazuk@jp.fujitsu.com>
-  Saori Fukuta         <fukuta.saori@jp.fujitsu.com>
-  Tatsuro Enokura      <fj7716hz@aa.jp.fujitsu.com>
-  Takahashi Tomohiro   <takatom@jp.fujitsu.com>
-  Nobuhiro Itou        <fj0873gn@aa.jp.fujitsu.com>
-  Masayuki Sunou       <fj1826dm@aa.jp.fujitsu.com>
-  Mark Johnson         <johnson.nh@gmail.com>
-  Christian Ehrhardt   <ehrhardt@linux.vnet.ibm.com>
-  Shuveb Hussain       <shuveb@binarykarma.com>
-  Jim Paris            <jim@jtan.com>
-  Daniel Hokka Zakrisson <daniel@hozac.com>
-  Mads Chr. Olesen     <shiyee@shiyee.dk>
-  Anton Protopopov     <aspsk2@gmail.com>
-  Stefan de Konink     <dekonink@kinkrsoftware.nl>
-  Kaitlin Rupert       <kaitlin@linux.vnet.ibm.com>
-  Evgeniy Sokolov      <evg@openvz.org>
-  David Lively         <dlively@virtualiron.com>
-  Charles Duffy        <Charles_Duffy@messageone.com>
-  Nguyen Anh Quynh     <aquynh@gmail.com>
-  James Morris         <jmorris@namei.org>
-  Chris Wright         <chrisw@redhat.com>
-  Ben Guthro           <ben.guthro@gmail.com>
-  Shigeki Sakamoto     <fj0588di@aa.jp.fujitsu.com>
-  Gerd von Egidy       <lists@egidy.de>
-  Itamar Heim          <iheim@redhat.com>
-  Markus Armbruster    <armbru@redhat.com>
-  Ryota Ozaki          <ozaki.ryota@gmail.com>
-  James Morris         <jmorris@namei.org>
-  Daniel J Walsh       <dwalsh@redhat.com>
-  Maximilian Wilhelm   <max@rfc2324.org>
-  Pritesh Kothari      <Pritesh.Kothari@Sun.COM>
-  Amit Shah            <amit.shah@redhat.com>
-  Florian Vichot       <florian.vichot@diateam.net>
-  Takahashi Tomohiro   <takatom@jp.fujitsu.com>
-  Serge E. Hallyn      <serue@us.ibm.com>
-  Soren Hansen         <soren@linux2go.dk>
-  Abel Míguez Rodríguez<amiguezr@pdi.ucm.es>
-  Doug Goldstein       <cardoe@gentoo.org>
-  Javier Fontan        <jfontan@gmail.com>
-  Federico Simoncelli  <federico.simoncelli@gmail.com>
-  Amy Griffis          <amy.griffis@hp.com>
-  Henrik Persson E     <henrik.e.persson@ericsson.com>
-  Satoru SATOH         <satoru.satoh@gmail.com>
-  Paolo Bonzini        <pbonzini@redhat.com>
-  Miloslav Trmač       <mitr@redhat.com>
-  Jamie Strandboge     <jamie@canonical.com>
-  Gerhard Stenzel      <gerhard.stenzel@de.ibm.com>
-  Matthew Booth        <mbooth@redhat.com>
-  Diego Elio Pettenò   <flameeyes@gmail.com>
-  Adam Litke           <agl@us.ibm.com>
-  Steve Yarmie         <steve.yarmie@gmail.com>
-  Dan Kenigsberg       <danken@redhat.com>
-  Yuji NISHIDA         <nishidy@nict.go.jp>
-  Dustin Xiong         <x_k_123@hotmail.com>
-  Rolf Eike Beer       <eike@sf-mail.de>
-  Wolfgang Mauerer     <wolfgang.mauerer@siemens.com>
-  Philipp Hahn         <hahn@univention.de>
-  Ed Swierk            <eswierk@aristanetworks.com>
-  Paolo Smiraglia      <paolo.smiraglia@gmail.com>
-  Sharadha Prabhakar   <sharadha.prabhakar@citrix.com>
-  Chris Wong           <wongc-redhat@hoku.net>
-  Daniel Berteaud      <daniel@firewall-services.com>
-  Dustin Kirkland      <kirkland@canonical.com>
-  Luiz Capitulino      <lcapitulino@redhat.com>
-  Ryan Harper          <ryanh@us.ibm.com>
-  Spencer Shimko       <sshimko@tresys.com>
-  Marco Bozzolan       <bozzolan@gmail.com>
-  Alex Williamson      <alex.williamson@redhat.com>
-  Ersek Laszlo         <lacos@caesar.elte.hu>
-  Kenneth Nagin        <NAGIN@il.ibm.com>
-  Klaus Ethgen         <Klaus@Ethgen.de>
-  Bryan Kearney        <bkearney@redhat.com>
-  Darry L. Pierce      <dpierce@redhat.com>
-  David Jorm           <dfj@redhat.com>
-  Eduardo Otubo        <otubo@linux.vnet.ibm.com>
-  Garry Dolley         <gdolley@arpnetworks.com>
-  Harshavardhana       <harsha@gluster.com>
-  Jonas Eriksson       <jonas.j.eriksson@ericsson.com>
-  Jun Koi              <junkoi2004@gmail.com>
-  Olivier Fourdan      <ofourdan@redhat.com>
-  Ron Yorston          <rmy@tigress.co.uk>
-  Shahar Klein         <shaharklein@yahoo.com>
-  Taizo ITO            <taizo.ito@hde.co.jp>
-  Thomas Treutner      <thomas@scripty.at>
-  Jean-Baptiste Rouault <jean-baptiste.rouault@diateam.net>
-  Марк Коренберг       <socketpair@gmail.com>
-  Alan Pevec           <apevec@redhat.com>
-  Aurelien Rougemont   <beorn@binaries.fr>
-  Patrick Dignan       <pat_dignan@dell.com>
-  Serge Hallyn         <serge.hallyn@canonical.com>
-  Nikunj A. Dadhania   <nikunj@linux.vnet.ibm.com>
-  Lai Jiangshan        <laijs@cn.fujitsu.com>
-  Harsh Prateek Bora   <harsh@linux.vnet.ibm.com>
-  John Morrissey       <jwm@horde.net>
-  Kamezawa Hiroyuki    <kamezawa.hiroyu@jp.fujitsu.com>
-  Wen Congyang         <wency@cn.fujitsu.com>
-  Hu Tao               <hutao@cn.fujitsu.com>
-  Laurent Léonard      <laurent@open-minds.org>
-  MORITA Kazutaka      <morita.kazutaka@lab.ntt.co.jp>
-  Josh Durgin          <joshd@hq.newdream.net>
-  Roopa Prabhu         <roprabhu@cisco.com>
-  Paweł Krześniak      <pawel.krzesniak@gmail.com>
-  Kay Schubert         <kayegypt@web.de>
-  Marc-André Lureau    <marcandre.lureau@redhat.com>
-  Michal Prívozník     <mprivozn@redhat.com>
-  Juerg Haefliger      <juerg.haefliger@hp.com>
-  Matthias Dahl        <mdvirt@designassembly.de>
-  Niels de Vos         <ndevos@redhat.com>
-  Davidlohr Bueso      <dave@gnu.org>
-  Alon Levy            <alevy@redhat.com>
-  Hero Phương          <herophuong93@gmail.com>
-  Zdenek Styblik       <stybla@turnovfree.net>
-  Gui Jianfeng         <guijianfeng@cn.fujitsu.com>
-  Michal Novotny       <minovotn@redhat.com>
-  Christophe Fergeau   <teuf@gnome.org>
-
-  [....send patches to get your name here....]
-
-The libvirt Logo was designed by Diana Fong
-
--- End
-;; Local Variables:
-;; coding: utf-8
-;; End:

COPYING.LIB

@@ -1,508 +0,0 @@
-
-                  GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations
-below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-^L
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it
-becomes a de-facto standard.  To achieve this, non-free programs must
-be allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-^L
-                  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control
-compilation and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-^L
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-^L
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at least
-    three years, to give the same user the materials specified in
-    Subsection 6a, above, for a charge no more than the cost of
-    performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-^L
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-^L
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply, and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License
-may add an explicit geographical distribution limitation excluding those
-countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-^L
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-                            NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-^L
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms
-of the ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.
-It is safest to attach them to the start of each source file to most
-effectively convey the exclusion of warranty; and each file should
-have at least the "copyright" line and a pointer to where the full
-notice is found.
-
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or
-your school, if any, to sign a "copyright disclaimer" for the library,
-if necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James
-  Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!

HACKING

@@ -1,679 +0,0 @@
--*- buffer-read-only: t -*- vi: set ro:
-DO NOT EDIT THIS FILE!  IT IS GENERATED AUTOMATICALLY!
-
-
-
-                         Contributor guidelines
-                         ======================
-
-
-
-General tips for contributing patches
-=====================================
-(1) Discuss any large changes on the mailing list first. Post patches early and
-listen to feedback.
-
-(2) Post patches in unified diff format. A command similar to this should work:
-
-  diff -urp libvirt.orig/ libvirt.modified/ > libvirt-myfeature.patch
-
-or:
-
-  git diff > libvirt-myfeature.patch
-
-(3) Split large changes into a series of smaller patches, self-contained if
-possible, with an explanation of each patch and an explanation of how the
-sequence of patches fits together.
-
-(4) Make sure your patches apply against libvirt GIT. Developers only follow GIT
-and don't care much about released versions.
-
-(5) Run the automated tests on your code before submitting any changes. In
-particular, configure with compile warnings set to -Werror:
-
-  ./configure --enable-compile-warnings=error
-
-and run the tests:
-
-  make check
-  make syntax-check
-  make -C tests valgrind
-
-The latter test checks for memory leaks.
-
-If you encounter any failing tests, the VIR_TEST_DEBUG environment variable
-may provide extra information to debug the failures. Larger values of
-VIR_TEST_DEBUG may provide larger amounts of information:
-
-  VIR_TEST_DEBUG=1 make check    (or)
-  VIR_TEST_DEBUG=2 make check
-
-Also, individual tests can be run from inside the "tests/" directory, like:
-
-  ./qemuxml2xmltest
-
-(6) Update tests and/or documentation, particularly if you are adding a new
-feature or changing the output of a program.
-
-
-
-There is more on this subject, including lots of links to background reading
-on the subject, on
-
-  Richard Jones' guide to working with open source projects
-  http://et.redhat.com/~rjones/how-to-supply-code-to-open-source-projects/
-
-
-Code indentation
-================
-Libvirt's C source code generally adheres to some basic code-formatting
-conventions. The existing code base is not totally consistent on this front,
-but we do prefer that contributed code be formatted similarly. In short, use
-spaces-not-TABs for indentation, use 4 spaces for each indentation level, and
-other than that, follow the K&R style.
-
-If you use Emacs, add the following to one of one of your start-up files
-(e.g., ~/.emacs), to help ensure that you get indentation right:
-
-  ;;; When editing C sources in libvirt, use this style.
-  (defun libvirt-c-mode ()
-    "C mode with adjusted defaults for use with libvirt."
-    (interactive)
-    (c-set-style "K&R")
-    (setq indent-tabs-mode nil) ; indent using spaces, not TABs
-    (setq c-indent-level 4)
-    (setq c-basic-offset 4))
-  (add-hook 'c-mode-hook
-            '(lambda () (if (string-match "/libvirt" (buffer-file-name))
-                            (libvirt-c-mode))))
-
-
-Code formatting (especially for new code)
-=========================================
-With new code, we can be even more strict. Please apply the following function
-(using GNU indent) to any new code. Note that this also gives you an idea of
-the type of spacing we prefer around operators and keywords:
-
-  indent-libvirt()
-  {
-    indent -bad -bap -bbb -bli4 -br -ce -brs -cs -i4 -l75 -lc75 \
-      -sbi4 -psl -saf -sai -saw -sbi4 -ss -sc -cdw -cli4 -npcs -nbc \
-      --no-tabs "$@"
-  }
-
-Note that sometimes you'll have to post-process that output further, by piping
-it through "expand -i", since some leading TABs can get through. Usually
-they're in macro definitions or strings, and should be converted anyhow.
-
-
-Curly braces
-============
-Omit the curly braces around an "if", "while", "for" etc. body only when that
-body occupies a single line. In every other case we require the braces. This
-ensures that it is trivially easy to identify a single-'statement' loop: each
-has only one 'line' in its body.
-
-Omitting braces with a single-line body is fine:
-
-  while (expr) // one-line body -> omitting curly braces is ok
-      single_line_stmt();
-
-However, the moment your loop/if/else body extends onto a second line, for
-whatever reason (even if it's just an added comment), then you should add
-braces. Otherwise, it would be too easy to insert a statement just before that
-comment (without adding braces), thinking it is already a multi-statement loop:
-
-  while (true) // BAD! multi-line body with no braces
-      /* comment... */
-      single_line_stmt();
-
-Do this instead:
-
-  while (true) { // Always put braces around a multi-line body.
-      /* comment... */
-      single_line_stmt();
-  }
-
-There is one exception: when the second body line is not at the same
-indentation level as the first body line:
-
-  if (expr)
-      die("a diagnostic that would make this line"
-          " extend past the 80-column limit"));
-
-It is safe to omit the braces in the code above, since the further-indented
-second body line makes it obvious that this is still a single-statement body.
-
-To reiterate, don't do this:
-
-  if (expr)            // BAD: no braces around...
-      while (expr_2) { // ... a multi-line body
-          ...
-      }
-
-Do this, instead:
-
-  if (expr) {
-      while (expr_2) {
-          ...
-      }
-  }
-
-However, there is one exception in the other direction, when even a one-line
-block should have braces. That occurs when that one-line, brace-less block is
-an "if" or "else" block, and the counterpart block *does* use braces. In that
-case, put braces around both blocks. Also, if the "else" block is much shorter
-than the "if" block, consider negating the "if"-condition and swapping the
-bodies, putting the short block first and making the longer, multi-line block
-be the "else" block.
-
-  if (expr) {
-      ...
-      ...
-  }
-  else
-      x = y;    // BAD: braceless "else" with braced "then",
-                // and short block last
-
-  if (expr)
-      x = y;    // BAD: braceless "if" with braced "else"
-  else {
-      ...
-      ...
-  }
-
-Keeping braces consistent and putting the short block first is preferred,
-especially when the multi-line body is more than a few lines long, because it
-is easier to read and grasp the semantics of an if-then-else block when the
-simpler block occurs first, rather than after the more involved block:
-
-  if (!expr) {
-    x = y; // putting the smaller block first is more readable
-  } else {
-      ...
-      ...
-  }
-
-But if negating a complex condition is too ugly, then at least add braces:
-
-  if (complex expr not worth negating) {
-      ...
-      ...
-  } else {
-      x = y;
-  }
-
-
-Preprocessor
-============
-For variadic macros, stick with C99 syntax:
-
-  #define vshPrint(_ctl, ...) fprintf(stdout, __VA_ARGS__)
-
-Use parenthesis when checking if a macro is defined, and use indentation to
-track nesting:
-
-  #if defined(HAVE_POSIX_FALLOCATE) && !defined(HAVE_FALLOCATE)
-  # define fallocate(a,ignored,b,c) posix_fallocate(a,b,c)
-  #endif
-
-
-C types
-=======
-Use the right type.
-
-Scalars
--------
-- If you're using "int" or "long", odds are good that there's a better type.
-
-- If a variable is counting something, be sure to declare it with an unsigned
-type.
-
-- If it's memory-size-related, use "size_t" (use "ssize_t" only if required).
-
-- If it's file-size related, use uintmax_t, or maybe "off_t".
-
-- If it's file-offset related (i.e., signed), use "off_t".
-
-- If it's just counting small numbers use "unsigned int"; (on all but oddball
-embedded systems, you can assume that that type is at least four bytes wide).
-
-- If a variable has boolean semantics, give it the "bool" type and use the
-corresponding "true" and "false" macros. It's ok to include <stdbool.h>, since
-libvirt's use of gnulib ensures that it exists and is usable.
-
-- In the unusual event that you require a specific width, use a standard type
-like "int32_t", "uint32_t", "uint64_t", etc.
-
-- While using "bool" is good for readability, it comes with minor caveats:
-
--- Don't use "bool" in places where the type size must be constant across all
-systems, like public interfaces and on-the-wire protocols. Note that it would
-be possible (albeit wasteful) to use "bool" in libvirt's logical wire
-protocol, since XDR maps that to its lower-level "bool_t" type, which *is*
-fixed-size.
-
--- Don't compare a bool variable against the literal, "true", since a value with
-a logical non-false value need not be "1". I.e., don't write "if (seen ==
-true) ...". Rather, write "if (seen)...".
-
-
-
-
-
-Of course, take all of the above with a grain of salt. If you're about to use
-some system interface that requires a type like "size_t", "pid_t" or "off_t",
-use matching types for any corresponding variables.
-
-Also, if you try to use e.g., "unsigned int" as a type, and that conflicts
-with the signedness of a related variable, sometimes it's best just to use the
-*wrong* type, if 'pulling the thread' and fixing all related variables would
-be too invasive.
-
-Finally, while using descriptive types is important, be careful not to go
-overboard. If whatever you're doing causes warnings, or requires casts, then
-reconsider or ask for help.
-
-Pointers
---------
-Ensure that all of your pointers are 'const-correct'. Unless a pointer is used
-to modify the pointed-to storage, give it the "const" attribute. That way, the
-reader knows up-front that this is a read-only pointer. Perhaps more
-importantly, if we're diligent about this, when you see a non-const pointer,
-you're guaranteed that it is used to modify the storage it points to, or it is
-aliased to another pointer that is.
-
-
-Low level memory management
-===========================
-Use of the malloc/free/realloc/calloc APIs is deprecated in the libvirt
-codebase, because they encourage a number of serious coding bugs and do not
-enable compile time verification of checks for NULL. Instead of these
-routines, use the macros from memory.h.
-
-- To allocate a single object:
-
-  virDomainPtr domain;
-
-  if (VIR_ALLOC(domain) < 0) {
-      virReportOOMError();
-      return NULL;
-  }
-
-
-
-- To allocate an array of objects:
-
-  virDomainPtr domains;
-  size_t ndomains = 10;
-
-  if (VIR_ALLOC_N(domains, ndomains) < 0) {
-      virReportOOMError();
-      return NULL;
-  }
-
-
-
-- To allocate an array of object pointers:
-
-  virDomainPtr *domains;
-  size_t ndomains = 10;
-
-  if (VIR_ALLOC_N(domains, ndomains) < 0) {
-      virReportOOMError();
-      return NULL;
-  }
-
-
-
-- To re-allocate the array of domains to be 1 element longer (however, note that
-repeatedly expanding an array by 1 scales quadratically, so this is
-recommended only for smaller arrays):
-
-  virDomainPtr domains;
-  size_t ndomains = 0;
-
-  if (VIR_EXPAND_N(domains, ndomains, 1) < 0) {
-      virReportOOMError();
-      return NULL;
-  }
-  domains[ndomains - 1] = domain;
-
-
-
-- To ensure an array has room to hold at least one more element (this approach
-scales better, but requires tracking allocation separately from usage)
-
-  virDomainPtr domains;
-  size_t ndomains = 0;
-  size_t ndomains_max = 0;
-
-  if (VIR_RESIZE_N(domains, ndomains_max, ndomains, 1) < 0) {
-      virReportOOMError();
-      return NULL;
-  }
-  domains[ndomains++] = domain;
-
-
-
-- To trim an array of domains from its allocated size down to the actual used
-size:
-
-  virDomainPtr domains;
-  size_t ndomains = x;
-  size_t ndomains_max = y;
-
-  VIR_SHRINK_N(domains, ndomains_max, ndomains_max - ndomains);
-
-
-
-- To free an array of domains:
-
-  virDomainPtr domains;
-  size_t ndomains = x;
-  size_t ndomains_max = y;
-  size_t i;
-
-  for (i = 0; i < ndomains; i++)
-      VIR_FREE(domains[i]);
-  VIR_FREE(domains);
-  ndomains_max = ndomains = 0;
-
-
-
-
-
-
-File handling
-=============
-Usage of the "fdopen()", "close()", "fclose()" APIs is deprecated in libvirt
-code base to help avoiding double-closing of files or file descriptors, which
-is particulary dangerous in a multi-threaded applications. Instead of these
-APIs, use the macros from files.h
-
-- Open a file from a file descriptor:
-
-  if ((file = VIR_FDOPEN(fd, "r")) == NULL) {
-      virReportSystemError(errno, "%s",
-                           _("failed to open file from file descriptor"));
-      return -1;
-  }
-  /* fd is now invalid; only access the file using file variable */
-
-
-
-- Close a file descriptor:
-
-  if (VIR_CLOSE(fd) < 0) {
-      virReportSystemError(errno, "%s", _("failed to close file"));
-  }
-
-
-
-- Close a file:
-
-  if (VIR_FCLOSE(file) < 0) {
-      virReportSystemError(errno, "%s", _("failed to close file"));
-  }
-
-
-
-- Close a file or file descriptor in an error path, without losing the previous
-"errno" value:
-
-  VIR_FORCE_CLOSE(fd);
-  VIR_FORCE_FCLOSE(file);
-
-
-
-
-
-
-String comparisons
-==================
-Do not use the strcmp, strncmp, etc functions directly. Instead use one of the
-following semantically named macros
-
-- For strict equality:
-
-  STREQ(a,b)
-  STRNEQ(a,b)
-
-
-
-- For case insensitive equality:
-
-  STRCASEEQ(a,b)
-  STRCASENEQ(a,b)
-
-
-
-- For strict equality of a substring:
-
-  STREQLEN(a,b,n)
-  STRNEQLEN(a,b,n)
-
-
-
-- For case insensitive equality of a substring:
-
-  STRCASEEQLEN(a,b,n)
-  STRCASENEQLEN(a,b,n)
-
-
-
-- For strict equality of a prefix:
-
-  STRPREFIX(a,b)
-
-
-
-
-
-
-String copying
-==============
-Do not use the strncpy function. According to the man page, it does *not*
-guarantee a NULL-terminated buffer, which makes it extremely dangerous to use.
-Instead, use one of the functionally equivalent functions:
-
-  virStrncpy(char *dest, const char *src, size_t n, size_t destbytes)
-
-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.
-
-  virStrcpy(char *dest, const char *src, size_t destbytes)
-
-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)
-
-  virStrcpyStatic(char *dest, const char *src)
-
-Use this variant if you know you want to copy the entire src string into dest
-*and* 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)).
-
-
-Variable length string buffer
-=============================
-If there is a need for complex string concatenations, avoid using the usual
-sequence of malloc/strcpy/strcat/snprintf functions and make use of the
-virBuffer API described in buf.h
-
-Typical usage is as follows:
-
-  char *
-  somefunction(...)
-  {
-     virBuffer buf = VIR_BUFFER_INITIALIZER;
-
-     ...
-
-     virBufferAddLit(&buf, "<domain>\n");
-     virBufferVSprintf(&buf, "  <memory>%d</memory>\n", memory);
-     ...
-     virBufferAddLit(&buf, "</domain>\n");
-
-     ...
-
-     if (virBufferError(&buf)) {
-         virBufferFreeAndReset(&buf);
-         virReportOOMError();
-         return NULL;
-     }
-
-     return virBufferContentAndReset(&buf);
-  }
-
-
-Include files
-=============
-There are now quite a large number of include files, both libvirt internal and
-external, and system includes. To manage all this complexity it's best to
-stick to the following general plan for all *.c source files:
-
-  /*
-   * Copyright notice
-   * ....
-   * ....
-   * ....
-   *
-   */
-
-  #include <config.h>             Must come first in every file.
-
-  #include <stdio.h>              Any system includes you need.
-  #include <string.h>
-  #include <limits.h>
-
-  #if HAVE_NUMACTL                Some system includes aren't supported
-  # include <numa.h>              everywhere so need these #if guards.
-  #endif
-
-  #include "internal.h"           Include this first, after system includes.
-
-  #include "util.h"               Any libvirt internal header files.
-  #include "buf.h"
-
-  static int
-  myInternalFunc()                The actual code.
-  {
-      ...
-
-Of particular note: *Do not* include libvirt/libvirt.h or libvirt/virterror.h.
-It is included by "internal.h" already and there are some special reasons why
-you cannot include these files explicitly.
-
-
-Printf-style functions
-======================
-Whenever you add a new printf-style function, i.e., one with a format string
-argument and following "..." in its prototype, be sure to use gcc's printf
-attribute directive in the prototype. For example, here's the one for
-virAsprintf, in util.h:
-
-  int virAsprintf(char **strp, const char *fmt, ...)
-      ATTRIBUTE_FORMAT(printf, 2, 3);
-
-This makes it so gcc's -Wformat and -Wformat-security options can do their
-jobs and cross-check format strings with the number and types of arguments.
-
-When printing to a string, consider using virBuffer for incremental
-allocations, virAsprintf for a one-shot allocation, and snprintf for
-fixed-width buffers. Do not use sprintf, even if you can prove the buffer
-won't overflow, since gnulib does not provide the same portability guarantees
-for sprintf as it does for snprintf.
-
-
-Use of goto
-===========
-The use of goto is not forbidden, and goto is widely used throughout libvirt.
-While the uncontrolled use of goto will quickly lead to unmaintainable code,
-there is a place for it in well structured code where its use increases
-readability and maintainability. In general, if goto is used for error
-recovery, it's likely to be ok, otherwise, be cautious or avoid it all
-together.
-
-The typical use of goto is to jump to cleanup code in the case of a long list
-of actions, any of which may fail and cause the entire operation to fail. In
-this case, a function will have a single label at the end of the function.
-It's almost always ok to use this style. In particular, if the cleanup code
-only involves free'ing memory, then having multiple labels is overkill.
-VIR_FREE() and every function named XXXFree() in libvirt is required to handle
-NULL as its arg. Thus you can safely call free on all the variables even if
-they were not yet allocated (yes they have to have been initialized to NULL).
-This is much simpler and clearer than having multiple labels.
-
-There are a couple of signs that a particular use of goto is not ok:
-
-- You're using multiple labels. If you find yourself using multiple labels,
-you're strongly encouraged to rework your code to eliminate all but one of
-them.
-
-- The goto jumps back up to a point above the current line of code being
-executed. Please use some combination of looping constructs to re-execute code
-instead; it's almost certainly going to be more understandable by others. One
-well-known exception to this rule is restarting an i/o operation following
-EINTR.
-
-- The goto jumps down to an arbitrary place in the middle of a function followed
-by further potentially failing calls. You should almost certainly be using a
-conditional and a block instead of a goto. Perhaps some of your function's
-logic would be better pulled out into a helper function.
-
-
-
-Although libvirt does not encourage the Linux kernel wind/unwind style of
-multiple labels, there's a good general discussion of the issue archived at
-
-  KernelTrap
-  http://kerneltrap.org/node/553/2131
-
-When using goto, please use one of these standard labels if it makes sense:
-
-      error: A path only taken upon return with an error code
-    cleanup: A path taken upon return with success code + optional error
-  no_memory: A path only taken upon return with an OOM error code
-      retry: If needing to jump upwards (e.g., retry on EINTR)
-
-
-Libvirt committer guidelines
-============================
-The AUTHORS files indicates the list of people with commit access right who
-can actually merge the patches.
-
-The general rule for committing a patch is to make sure it has been reviewed
-properly in the mailing-list first, usually if a couple of people gave an ACK
-or +1 to a patch and nobody raised an objection on the list it should be good
-to go. If the patch touches a part of the code where you're not the main
-maintainer, or where you do not have a very clear idea of how things work,
-it's better to wait for a more authoritative feedback though. Before
-committing, please also rebuild locally, run 'make check syntax-check', and
-make sure you don't raise errors. Try to look for warnings too; for example,
-configure with
-
-  --enable-compile-warnings=error
-
-which adds -Werror to compile flags, so no warnings get missed
-
-An exception to 'review and approval on the list first' is fixing failures to
-build:
-
-- if a recently committed patch breaks compilation on a platform or for a given
-driver, then it's fine to commit a minimal fix directly without getting the
-review feedback first
-
-- if make check or make syntax-check breaks, if there is an obvious fix, it's
-fine to commit immediately. The patch should still be sent to the list (or
-tell what the fix was if trivial), and 'make check syntax-check' should pass
-too, before committing anything
-
-- fixes for documentation and code comments can be managed in the same way, but
-still make sure they get reviewed if non-trivial.

Makefile.am

@@ -1,119 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-LCOV = lcov
-GENHTML = genhtml
-
-SUBDIRS = gnulib/lib include src daemon tools docs gnulib/tests \
-  python tests po examples/domain-events/events-c examples/hellolibvirt \
-  examples/dominfo examples/domsuspend examples/python examples/apparmor \
-  examples/xml/nwfilter examples/openauth examples/systemtap
-
-ACLOCAL_AMFLAGS = -I m4 -I gnulib/m4
-
-XML_EXAMPLES = \
-  $(patsubst $(srcdir)/%,%,$(wildcard $(addprefix $(srcdir)/examples/xml/, \
-					test/*.xml storage/*.xml)))
-
-syntax_check_exceptions = \
-  .x-sc_avoid_ctype_macros \
-  .x-sc_avoid_if_before_free \
-  .x-sc_avoid_write \
-  .x-sc_bindtextdomain \
-  .x-sc_m4_quote_check \
-  .x-sc_po_check \
-  .x-sc_prohibit_always_true_header_tests \
-  .x-sc_prohibit_asprintf \
-  .x-sc_prohibit_close \
-  .x-sc_prohibit_empty_lines_at_EOF \
-  .x-sc_prohibit_fork_wrappers \
-  .x-sc_prohibit_gethostby \
-  .x-sc_prohibit_gethostname \
-  .x-sc_prohibit_gettext_noop \
-  .x-sc_prohibit_have_config_h \
-  .x-sc_prohibit_HAVE_MBRTOWC \
-  .x-sc_prohibit_nonreentrant \
-  .x-sc_prohibit_readlink \
-  .x-sc_prohibit_sprintf \
-  .x-sc_prohibit_strncpy \
-  .x-sc_prohibit_test_minus_ao \
-  .x-sc_prohibit_VIR_ERR_NO_MEMORY \
-  .x-sc_prohibit_xmlGetProp \
-  .x-sc_require_config_h \
-  .x-sc_require_config_h_first \
-  .x-sc_trailing_blank \
-  .x-sc_unmarked_diagnostics
-
-EXTRA_DIST = \
-  ChangeLog-old \
-  libvirt.spec libvirt.spec.in \
-  mingw32-libvirt.spec.in \
-  libvirt.pc libvirt.pc.in \
-  autobuild.sh \
-  Makefile.nonreentrant \
-  autogen.sh \
-  cfg.mk \
-  examples/domain-events/events-python \
-  $(syntax_check_exceptions) \
-  $(XML_EXAMPLES)
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libvirt.pc
-
-NEWS: $(top_srcdir)/docs/news.xsl $(top_srcdir)/docs/news.html.in
-	-@(if [ -x $(XSLTPROC) ] ; then				\
-	  $(XSLTPROC) --nonet $(top_srcdir)/docs/news.xsl	\
-	     $(top_srcdir)/docs/news.html.in			\
-	   | perl -0777 -pe 's/\n\n+$$/\n/'			\
-	   | perl -pe 's/[ \t]+$$//'				\
-	   > $@-t && mv $@-t $@ ; fi );
-
-$(top_srcdir)/HACKING: $(top_srcdir)/docs/hacking1.xsl $(top_srcdir)/docs/hacking2.xsl \
-                       $(top_srcdir)/docs/wrapstring.xsl $(top_srcdir)/docs/hacking.html.in
-	-@(if [ -x $(XSLTPROC) ] ; then \
-	   $(XSLTPROC) --nonet $(top_srcdir)/docs/hacking1.xsl $(top_srcdir)/docs/hacking.html.in | \
-	   $(XSLTPROC) --nonet $(top_srcdir)/docs/hacking2.xsl - \
-	   | perl -0777 -pe 's/\n\n+$$/\n/' \
-	   > $@-t && mv $@-t $@ ; fi );
-
-rpm: clean
-	@(unset CDPATH ; $(MAKE) dist && rpmbuild -ta $(distdir).tar.gz)
-
-check-local: all tests
-
-tests:
-	@(cd docs/examples ; $(MAKE) MAKEFLAGS+=--silent tests)
-	@(if [ "$(pythondir)" != "" ] ; then cd python ; \
-	  $(MAKE) MAKEFLAGS+=--silent tests ; fi)
-
-cov: clean-cov
-	mkdir $(top_builddir)/coverage
-	$(LCOV) -c -o $(top_builddir)/coverage/libvirt.info.tmp \
-	  -d $(top_builddir)/src  -d $(top_builddir)/daemon \
-	  -d $(top_builddir)/tests
-	$(LCOV) -r $(top_builddir)/coverage/libvirt.info.tmp \
-	  -o $(top_builddir)/coverage/libvirt.info
-	rm $(top_builddir)/coverage/libvirt.info.tmp
-	$(GENHTML) --show-details -t "libvirt" -o $(top_builddir)/coverage \
-	  --legend $(top_builddir)/coverage/libvirt.info
-
-clean-cov:
-	rm -rf $(top_builddir)/coverage
-
-MAINTAINERCLEANFILES = .git-module-status
-
-# disable this check
-distuninstallcheck:
-
-dist-hook: gen-ChangeLog
-
-# Generate the ChangeLog file (with all entries since the switch to git)
-# and insert it into the directory we're about to use to create a tarball.
-gen_start_date = 2009-07-04
-.PHONY: gen-ChangeLog
-gen-ChangeLog:
-	if test -d .git; then					\
-	  $(top_srcdir)/build-aux/gitlog-to-changelog		\
-	    --since=$(gen_start_date) > $(distdir)/cl-t;	\
-	  rm -f $(distdir)/ChangeLog;				\
-	  mv $(distdir)/cl-t $(distdir)/ChangeLog;		\
-	fi

Makefile.nonreentrant

@@ -1,100 +0,0 @@
-
-#
-# Generated by running the following on Fedora 9:
-#
-#  nm -D --defined-only /lib/libc.so.6  \
-#      | grep '_r$' \
-#      | awk '{print $3}' \
-#      | grep -v __ \
-#      | grep -v qsort \ # Red herring since we don't need to pass extra args to qsort comparator
-#      | grep -v readdir \ # This is safe as long as each DIR * instance is only used by one thread
-#      | sort \
-#      | uniq \
-#      | sed -e 's/_r//'
-#
-# Also manually add in all inet_* functions some of which
-# are not threadsafe and do not have _r variants. They are
-# all deprecated in favour of getnameinfo/getaddrinfo
-#
-
-NON_REENTRANT =
-NON_REENTRANT += asctime
-NON_REENTRANT += ctime
-NON_REENTRANT += drand48
-NON_REENTRANT += ecvt
-NON_REENTRANT += erand48
-NON_REENTRANT += ether_aton
-NON_REENTRANT += ether_ntoa
-NON_REENTRANT += fcvt
-NON_REENTRANT += fgetgrent
-NON_REENTRANT += fgetpwent
-NON_REENTRANT += fgetspent
-NON_REENTRANT += getaliasbyname
-NON_REENTRANT += getaliasent
-NON_REENTRANT += getdate
-NON_REENTRANT += getgrent
-NON_REENTRANT += getgrgid
-NON_REENTRANT += getgrnam
-NON_REENTRANT += gethostbyaddr
-NON_REENTRANT += gethostbyname2
-NON_REENTRANT += gethostbyname
-NON_REENTRANT += gethostent
-NON_REENTRANT += getlogin
-NON_REENTRANT += getmntent
-NON_REENTRANT += getnetbyaddr
-NON_REENTRANT += getnetbyname
-NON_REENTRANT += getnetent
-NON_REENTRANT += getnetgrent
-NON_REENTRANT += getprotobyname
-NON_REENTRANT += getprotobynumber
-NON_REENTRANT += getprotoent
-NON_REENTRANT += getpwent
-NON_REENTRANT += getpwnam
-NON_REENTRANT += getpwuid
-NON_REENTRANT += getrpcbyname
-NON_REENTRANT += getrpcbynumber
-NON_REENTRANT += getrpcent
-NON_REENTRANT += getservbyname
-NON_REENTRANT += getservbyport
-NON_REENTRANT += getservent
-NON_REENTRANT += getspent
-NON_REENTRANT += getspnam
-NON_REENTRANT += getutent
-NON_REENTRANT += getutid
-NON_REENTRANT += getutline
-NON_REENTRANT += gmtime
-NON_REENTRANT += hcreate
-NON_REENTRANT += hdestroy
-NON_REENTRANT += hsearch
-NON_REENTRANT += initstate
-NON_REENTRANT += jrand48
-NON_REENTRANT += lcong48
-NON_REENTRANT += localtime
-NON_REENTRANT += lrand48
-NON_REENTRANT += mrand48
-NON_REENTRANT += nrand48
-NON_REENTRANT += ptsname
-NON_REENTRANT += qecvt
-NON_REENTRANT += qfcvt
-NON_REENTRANT += random
-NON_REENTRANT += rand
-NON_REENTRANT += seed48
-NON_REENTRANT += setstate
-NON_REENTRANT += sgetspent
-NON_REENTRANT += srand48
-NON_REENTRANT += srandom
-NON_REENTRANT += strerror
-NON_REENTRANT += strtok
-NON_REENTRANT += tmpnam
-NON_REENTRANT += ttyname
-NON_REENTRANT += inet_addr
-NON_REENTRANT += inet_aton
-NON_REENTRANT += inet_lnaof
-NON_REENTRANT += inet_makeaddr
-NON_REENTRANT += inet_netof
-NON_REENTRANT += inet_network
-NON_REENTRANT += inet_nsap_addr
-NON_REENTRANT += inet_nsap_ntoa
-NON_REENTRANT += inet_ntoa
-NON_REENTRANT += inet_ntop
-NON_REENTRANT += inet_pton

README

@@ -1,13 +1 @@
-
-         LibVirt : simple API for virtualization
-
-  Libvirt is a C toolkit to interact with the virtualization capabilities
-of recent versions of Linux (and other OSes). It is free software
-available under the GNU Lesser General Public License. Virtualization of
-the Linux Operating System means the ability to run multiple instances of
-Operating Systems concurrently on a single hardware system where the basic
-resources are driven by a Linux instance. The library aim at providing
-long term stable C API initially for the Xen paravirtualization but
-should be able to integrate other virtualization mechanisms if needed.
-
-Daniel Veillard <veillard@redhat.com>
+This branch is no longer maintained upstream.

README-hacking

@@ -1,57 +0,0 @@
--*- outline -*-
-
-These notes intend to help people working on the checked-out sources.
-These requirements do not apply when building from a distribution tarball.
-See also HACKING for more detailed libvirt contribution guidelines.
-
-* Requirements
-
-We've opted to keep only the highest-level sources in the GIT repository.
-This eases our maintenance burden, (fewer merges etc.), but imposes more
-requirements on anyone wishing to build from the just-checked-out sources.
-Note the requirements to build the released archive are much less and
-are just the requirements of the standard ./configure && make procedure.
-Specific development tools and versions will be checked for and listed by
-the bootstrap script.
-
-Valgrind <http://valgrind.org/> is also highly recommended, if
-Valgrind supports your architecture. See also README-valgrind.
-
-While building from a just-cloned source tree may require installing a
-few prerequisites, later, a plain `git pull && make' should be sufficient.
-
-* First GIT checkout
-
-You can get a copy of the source repository like this:
-
-        $ git clone git://libvirt.org/libvirt
-        $ cd libvirt
-
-As an optional step, if you already have a copy of the gnulib git
-repository on your hard drive, then you can use it as a reference to
-reduce download time and disk space requirements:
-
-        $ export GNULIB_SRCDIR=/path/to/gnulib
-
-The next step is to get all required pieces from gnulib,
-to run autoreconf, and to invoke ./configure:
-
-        $ ./autogen.sh
-
-And there you are!  Just
-
-        $ make
-        $ make check
-
-At this point, there should be no difference between your local copy,
-and the GIT master copy:
-
-        $ git diff
-
-should output no difference.
-
-Enjoy!
-
-Local Variables:
-indent-tabs-mode: nil
-End:

TODO

@@ -1,22 +0,0 @@
-         libvirt TODO list
-         =================
-
-The TODO list changes frequently, so is maintained online
-in the libvirt bugzilla
-
-  http://bugzilla.redhat.com/
-
-Search against
-
-    Product: Virtualization Tools
-  Component: libvirt
-    Subject: RFE
-
-Or browse dependent bugs under
-
-  https://bugzilla.redhat.com/show_bug.cgi?id=libvirtTodo
-
-Summarized reports automatically generated from bugzilla
-and provided online at
-
-  http://libvirt.org/todo.html

acinclude.m4

@@ -1,125 +0,0 @@
-dnl
-dnl Taken from gnome-common/macros2/gnome-compiler-flags.m4
-dnl
-dnl We've added:
-dnl   -Wextra -Wshadow -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Winline -Wredundant-decls
-dnl We've removed
-dnl   CFLAGS="$realsave_CFLAGS"
-dnl   to avoid clobbering user-specified CFLAGS
-dnl
-AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[
-    dnl ******************************
-    dnl More compiler warnings
-    dnl ******************************
-
-    AC_ARG_ENABLE(compile-warnings,
-                  [AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],
-                                 [Turn on compiler warnings])],,
-                  [enable_compile_warnings="m4_default([$1],[maximum])"])
-
-    warnCFLAGS=
-
-    common_flags=
-    common_flags="$common_flags -Wp,-D_FORTIFY_SOURCE=2"
-    common_flags="$common_flags -fexceptions"
-    common_flags="$common_flags -fasynchronous-unwind-tables"
-    common_flags="$common_flags -fdiagnostics-show-option"
-
-    case "$enable_compile_warnings" in
-    no)
-        try_compiler_flags=""
-	;;
-    minimum)
-	try_compiler_flags="-Wall -Wformat -Wformat-security $common_flags"
-	;;
-    yes)
-	try_compiler_flags="-Wall -Wformat -Wformat-security -Wmissing-prototypes $common_flags"
-	;;
-    maximum|error)
-	try_compiler_flags="-Wall -Wformat -Wformat-security"
-	try_compiler_flags="$try_compiler_flags -Wmissing-prototypes"
-	try_compiler_flags="$try_compiler_flags -Wnested-externs "
-	try_compiler_flags="$try_compiler_flags -Wpointer-arith"
-	try_compiler_flags="$try_compiler_flags -Wextra -Wshadow"
-	try_compiler_flags="$try_compiler_flags -Wcast-align"
-	try_compiler_flags="$try_compiler_flags -Wwrite-strings"
-	try_compiler_flags="$try_compiler_flags -Waggregate-return"
-	try_compiler_flags="$try_compiler_flags -Wstrict-prototypes"
-	try_compiler_flags="$try_compiler_flags -Winline"
-	try_compiler_flags="$try_compiler_flags -Wredundant-decls"
-	try_compiler_flags="$try_compiler_flags -Wno-sign-compare"
-	try_compiler_flags="$try_compiler_flags -Wlogical-op"
-	try_compiler_flags="$try_compiler_flags $common_flags"
-	if test "$enable_compile_warnings" = "error" ; then
-	    try_compiler_flags="$try_compiler_flags -Werror"
-	fi
-	;;
-    *)
-	AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings)
-	;;
-    esac
-
-    COMPILER_FLAGS=
-    for option in $try_compiler_flags; do
-        gl_COMPILER_FLAGS($option)
-    done
-    unset option
-    unset try_compiler_flags
-
-    AC_ARG_ENABLE(iso-c,
-                  AC_HELP_STRING([--enable-iso-c],
-                                 [Try to warn if code is not ISO C ]),,
-                  [enable_iso_c=no])
-
-    AC_MSG_CHECKING(what language compliance flags to pass to the C compiler)
-    complCFLAGS=
-    if test "x$enable_iso_c" != "xno"; then
-	if test "x$GCC" = "xyes"; then
-	case " $CFLAGS " in
-	    *[\ \	]-ansi[\ \	]*) ;;
-	    *) complCFLAGS="$complCFLAGS -ansi" ;;
-	esac
-	case " $CFLAGS " in
-	    *[\ \	]-pedantic[\ \	]*) ;;
-	    *) complCFLAGS="$complCFLAGS -pedantic" ;;
-	esac
-	fi
-    fi
-    AC_MSG_RESULT($complCFLAGS)
-
-    WARN_CFLAGS="$COMPILER_FLAGS $complCFLAGS"
-    WARN_LDFLAGS=$WARN_CFLAGS
-    AC_SUBST([WARN_CFLAGS])
-    AC_SUBST([WARN_LDFLAGS])
-
-    dnl Needed to keep compile quiet on python 2.4
-    COMPILER_FLAGS=
-    gl_COMPILER_FLAGS(-Wno-redundant-decls)
-    WARN_PYTHON_CFLAGS=$COMPILER_FLAGS
-    AC_SUBST(WARN_PYTHON_CFLAGS)
-])
-
-
-dnl
-dnl To support the old pkg-config from RHEL4 vintage, we need
-dnl to define the PKG_PROG_PKG_CONFIG macro if its not already
-dnl present
-m4_ifndef([PKG_PROG_PKG_CONFIG],
-  [AC_DEFUN([PKG_PROG_PKG_CONFIG],
-[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-        AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-fi
-if test -n "$PKG_CONFIG"; then
-        _pkg_min_version=m4_default([$1], [0.9.0])
-        AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
-        if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-                AC_MSG_RESULT([yes])
-        else
-                AC_MSG_RESULT([no])
-                PKG_CONFIG=""
-        fi
-fi[]dnl
-])])

autobuild.sh

@@ -1,103 +0,0 @@
-#!/bin/sh
-
-set -e
-set -v
-
-# Make things clean.
-
-test -n "$1" && RESULTS=$1 || RESULTS=results.log
-: ${AUTOBUILD_INSTALL_ROOT=$HOME/builder}
-
-test -f Makefile && make -k distclean || :
-rm -rf coverage
-
-#rm -rf build
-#mkdir build
-#cd build
-
-./autogen.sh --prefix="$AUTOBUILD_INSTALL_ROOT" \
-  --enable-test-coverage \
-  --enable-compile-warnings=error
-
-# If the MAKEFLAGS envvar does not yet include a -j option,
-# add -jN where N depends on the number of processors.
-case $MAKEFLAGS in
-  *-j*) ;;
-  *) n=$(getconf _NPROCESSORS_ONLN 2> /dev/null)
-    test "$n" -gt 0 || n=1
-    n=$(expr $n + 1)
-    MAKEFLAGS="$MAKEFLAGS -j$n"
-    export MAKEFLAGS
-    ;;
-esac
-
-make
-make install
-
-# set -o pipefail is a bashism; this use of exec is the POSIX alternative
-exec 3>&1
-st=$(
-  exec 4>&1 >&3
-  { make check syntax-check 2>&1 3>&- 4>&-; echo $? >&4; } | tee "$RESULTS"
-)
-exec 3>&-
-test "$st" = 0
-test -x /usr/bin/lcov && make cov
-
-rm -f *.tar.gz
-make dist
-
-if [ -n "$AUTOBUILD_COUNTER" ]; then
-  EXTRA_RELEASE=".auto$AUTOBUILD_COUNTER"
-else
-  NOW=`date +"%s"`
-  EXTRA_RELEASE=".$USER$NOW"
-fi
-
-if [ -f /usr/bin/rpmbuild ]; then
-  rpmbuild --nodeps \
-     --define "extra_release $EXTRA_RELEASE" \
-     --define "_sourcedir `pwd`" \
-     -ba --clean libvirt.spec
-fi
-
-if [ -x /usr/bin/i686-pc-mingw32-gcc ]; then
-  make distclean
-
-  PKG_CONFIG_PATH="$AUTOBUILD_INSTALL_ROOT/i686-pc-mingw32/sys-root/mingw/lib/pkgconfig" \
-  CC="i686-pc-mingw32-gcc" \
-  ./configure \
-    --build=$(uname -m)-pc-linux \
-    --host=i686-pc-mingw32 \
-    --prefix="$AUTOBUILD_INSTALL_ROOT/i686-pc-mingw32/sys-root/mingw" \
-    --enable-compile-warnings=error \
-    --without-sasl \
-    --without-avahi \
-    --without-polkit \
-    --without-python \
-    --without-xen \
-    --without-qemu \
-    --without-lxc \
-    --without-uml \
-    --without-vbox \
-    --without-openvz \
-    --without-one \
-    --without-phyp \
-    --without-netcf \
-    --without-audit \
-    --without-dtrace \
-    --without-libvirtd
-
-  make
-  make install
-
-  #set -o pipefail
-  #make check 2>&1 | tee "$RESULTS"
-
-  if [ -f /usr/bin/rpmbuild ]; then
-    rpmbuild --nodeps \
-       --define "extra_release $EXTRA_RELEASE" \
-       --define "_sourcedir `pwd`" \
-       -ba --clean mingw32-libvirt.spec
-  fi
-fi

autogen.sh

@@ -1,84 +0,0 @@
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-
-srcdir=`dirname "$0"`
-test -z "$srcdir" && srcdir=.
-
-THEDIR=`pwd`
-cd "$srcdir"
-
-test -f src/libvirt.c || {
-    echo "You must run this script in the top-level libvirt directory"
-    exit 1
-}
-
-
-EXTRA_ARGS=
-no_git=
-if test "x$1" = "x--no-git"; then
-  no_git=" $1"
-  shift
-fi
-if test "x$1" = "x--system"; then
-    shift
-    prefix=/usr
-    libdir=$prefix/lib
-    sysconfdir=/etc
-    localstatedir=/var
-    if [ -d /usr/lib64 ]; then
-      libdir=$prefix/lib64
-    fi
-    EXTRA_ARGS="--prefix=$prefix --sysconfdir=$sysconfdir --localstatedir=$localstatedir --libdir=$libdir"
-    echo "Running ./configure with $EXTRA_ARGS $@"
-else
-    if test -z "$*" && test ! -f "$THEDIR/config.status"; then
-        echo "I am going to run ./configure with no arguments - if you wish "
-        echo "to pass any to it, please specify them on the $0 command line."
-    fi
-fi
-
-# Compute the hash we'll use to determine whether rerunning bootstrap
-# is required.  The first is just the SHA1 that selects a gnulib snapshot.
-# The second ensures that whenever we change the set of gnulib modules used
-# by this package, we rerun bootstrap to pull in the matching set of files.
-bootstrap_hash()
-{
-    git submodule status | sed 's/^[ +-]//;s/ .*//'
-    git hash-object bootstrap.conf
-}
-
-# Ensure that whenever we pull in a gnulib update or otherwise change to a
-# different version (i.e., when switching branches), we also rerun ./bootstrap.
-# Also, running 'make rpm' tends to litter the po/ directory, and some people
-# like to run 'git clean -x -f po' to fix it; but only ./bootstrap regenerates
-# the required file po/Makevars.
-# Only run bootstrap from a git checkout, never from a tarball.
-if test -d .git; then
-    curr_status=.git-module-status
-    t=$(bootstrap_hash; git diff .gnulib)
-    if test "$t" = "$(cat $curr_status 2>/dev/null)" \
-        && test -f "po/Makevars"; then
-        # good, it's up to date, all we need is autoreconf
-        autoreconf -if
-    else
-        echo running bootstrap$no_git...
-        ./bootstrap$no_git --bootstrap-sync && bootstrap_hash > $curr_status \
-            || { echo "Failed to bootstrap, please investigate."; exit 1; }
-    fi
-fi
-
-cd "$THEDIR"
-
-if test "x$OBJ_DIR" != x; then
-    mkdir -p "$OBJ_DIR"
-    cd "$OBJ_DIR"
-fi
-
-if test -z "$*" && test -f config.status; then
-    ./config.status --recheck
-else
-    $srcdir/configure $EXTRA_ARGS "$@"
-fi && {
-    echo
-    echo "Now type 'make' to compile libvirt."
-}

bootstrap

@@ -1,946 +0,0 @@
-#! /bin/sh
-# Print a version string.
-scriptversion=2011-01-21.16; # UTC
-
-# Bootstrap this package from checked-out sources.
-
-# Copyright (C) 2003-2011 Free Software Foundation, Inc.
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Originally written by Paul Eggert.  The canonical version of this
-# script is maintained as build-aux/bootstrap in gnulib, however, to
-# be useful to your project, you should place a copy of it under
-# version control in the top-level directory of your project.  The
-# intent is that all customization can be done with a bootstrap.conf
-# file also maintained in your version control; gnulib comes with a
-# template build-aux/bootstrap.conf to get you started.
-
-# Please report bugs or propose patches to bug-gnulib@gnu.org.
-
-nl='
-'
-
-# Ensure file names are sorted consistently across platforms.
-LC_ALL=C
-export LC_ALL
-
-local_gl_dir=gl
-
-# Temporary directory names.
-bt='._bootmp'
-bt_regex=`echo "$bt"| sed 's/\./[.]/g'`
-bt2=${bt}2
-me=$0
-
-usage() {
-  cat <<EOF
-Usage: $me [OPTION]...
-Bootstrap this package from the checked-out sources.
-
-Options:
- --gnulib-srcdir=DIRNAME  specify the local directory where gnulib
-                          sources reside.  Use this if you already
-                          have gnulib sources on your machine, and
-                          do not want to waste your bandwidth downloading
-                          them again.  Defaults to \$GNULIB_SRCDIR
- --bootstrap-sync         if this bootstrap script is not identical to
-                          the version in the local gnulib sources,
-                          update this script, and then restart it with
-                          /bin/sh or the shell \$CONFIG_SHELL
- --no-bootstrap-sync      do not check whether bootstrap is out of sync
- --copy                   copy files instead of creating symbolic links
- --force                  attempt to bootstrap even if the sources seem
-                          not to have been checked out
- --no-git                 do not use git to update gnulib.  Requires that
-                          --gnulib-srcdir point to a correct gnulib snapshot
- --skip-po                do not download po files
-
-If the file $me.conf exists in the same directory as this script, its
-contents are read as shell variables to configure the bootstrap.
-
-For build prerequisites, environment variables like \$AUTOCONF and \$AMTAR
-are honored.
-
-Running without arguments will suffice in most cases.
-EOF
-}
-
-# Configuration.
-
-# Name of the Makefile.am
-gnulib_mk=gnulib.mk
-
-# List of gnulib modules needed.
-gnulib_modules=
-
-# Any gnulib files needed that are not in modules.
-gnulib_files=
-
-# A function to be called to edit gnulib.mk right after it's created.
-# Override it via your own definition in bootstrap.conf.
-gnulib_mk_hook() { :; }
-
-# A function to be called after everything else in this script.
-# Override it via your own definition in bootstrap.conf.
-bootstrap_epilogue() { :; }
-
-# The command to download all .po files for a specified domain into
-# a specified directory.  Fill in the first %s is the domain name, and
-# the second with the destination directory.  Use rsync's -L and -r
-# options because the latest/%s directory and the .po files within are
-# all symlinks.
-po_download_command_format=\
-"rsync --delete --exclude '*.s1' -Lrtvz \
- 'translationproject.org::tp/latest/%s/' '%s'"
-
-extract_package_name='
-  /^AC_INIT(/{
-     /.*,.*,.*, */{
-       s///
-       s/[][]//g
-       s/)$//
-       p
-       q
-     }
-     s/AC_INIT(\[*//
-     s/]*,.*//
-     s/^GNU //
-     y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
-     s/[^A-Za-z0-9_]/-/g
-     p
-  }
-'
-package=`sed -n "$extract_package_name" configure.ac` || exit
-gnulib_name=lib$package
-
-build_aux=build-aux
-source_base=lib
-m4_base=m4
-doc_base=doc
-tests_base=tests
-
-# Extra files from gnulib, which override files from other sources.
-gnulib_extra_files="
-        $build_aux/install-sh
-        $build_aux/missing
-        $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=
-
-# Other locale categories that need message catalogs.
-EXTRA_LOCALE_CATEGORIES=
-
-# Additional xgettext options to use.  Use "\\\newline" to break lines.
-XGETTEXT_OPTIONS='\\\
- --flag=_:1:pass-c-format\\\
- --flag=N_:1:pass-c-format\\\
- --flag=error:3:c-format --flag=error_at_line:5:c-format\\\
-'
-
-# Package bug report address and copyright holder for gettext files
-COPYRIGHT_HOLDER='Free Software Foundation, Inc.'
-MSGID_BUGS_ADDRESS=bug-$package@gnu.org
-
-# Files we don't want to import.
-excluded_files=
-
-# File that should exist in the top directory of a checked out hierarchy,
-# but not in a distribution tarball.
-checkout_only_file=README-hacking
-
-# Whether to use copies instead of symlinks.
-copy=false
-
-# Set this to '.cvsignore .gitignore' in bootstrap.conf if you want
-# those files to be generated in directories like lib/, m4/, and po/.
-# Or set it to 'auto' to make this script select which to use based
-# on which version control system (if any) is used in the source directory.
-vc_ignore=auto
-
-# Set this to true in bootstrap.conf to enable --bootstrap-sync by
-# default.
-bootstrap_sync=false
-
-# Use git to update gnulib sources
-use_git=true
-
-# find_tool ENVVAR NAMES...
-# -------------------------
-# Search for a required program.  Use the value of ENVVAR, if set,
-# otherwise find the first of the NAMES that can be run (i.e.,
-# supports --version).  If found, set ENVVAR to the program name,
-# die otherwise.
-find_tool ()
-{
-  find_tool_envvar=$1
-  shift
-  find_tool_names=$@
-  eval "find_tool_res=\$$find_tool_envvar"
-  if test x"$find_tool_res" = x; then
-    for i
-    do
-      if ($i --version </dev/null) >/dev/null 2>&1; then
-       find_tool_res=$i
-       break
-      fi
-    done
-  else
-    find_tool_error_prefix="\$$find_tool_envvar: "
-  fi
-  if test x"$find_tool_res" = x; then
-    echo >&2 "$me: one of these is required: $find_tool_names"
-    exit 1
-  fi
-  ($find_tool_res --version </dev/null) >/dev/null 2>&1 || {
-    echo >&2 "$me: ${find_tool_error_prefix}cannot run $find_tool_res --version"
-    exit 1
-  }
-  eval "$find_tool_envvar=\$find_tool_res"
-  eval "export $find_tool_envvar"
-}
-
-# Find sha1sum, named gsha1sum on MacPorts, and shasum on MacOS 10.6.
-find_tool SHA1SUM sha1sum gsha1sum shasum
-
-# Override the default configuration, if necessary.
-# Make sure that bootstrap.conf is sourced from the current directory
-# if we were invoked as "sh bootstrap".
-case "$0" in
-  */*) test -r "$0.conf" && . "$0.conf" ;;
-  *) test -r "$0.conf" && . ./"$0.conf" ;;
-esac
-
-
-if test "$vc_ignore" = auto; then
-  vc_ignore=
-  test -d .git && vc_ignore=.gitignore
-  test -d CVS && vc_ignore="$vc_ignore .cvsignore"
-fi
-
-# Translate configuration into internal form.
-
-# Parse options.
-
-for option
-do
-  case $option in
-  --help)
-    usage
-    exit;;
-  --gnulib-srcdir=*)
-    GNULIB_SRCDIR=`expr "X$option" : 'X--gnulib-srcdir=\(.*\)'`;;
-  --skip-po)
-    SKIP_PO=t;;
-  --force)
-    checkout_only_file=;;
-  --copy)
-    copy=true;;
-  --bootstrap-sync)
-    bootstrap_sync=true;;
-  --no-bootstrap-sync)
-    bootstrap_sync=false;;
-  --no-git)
-    use_git=false;;
-  *)
-    echo >&2 "$0: $option: unknown option"
-    exit 1;;
-  esac
-done
-
-if $use_git || test -d "$GNULIB_SRCDIR"; then
-  :
-else
-  echo "$0: Error: --no-git requires --gnulib-srcdir" >&2
-  exit 1
-fi
-
-if test -n "$checkout_only_file" && test ! -r "$checkout_only_file"; then
-  echo "$0: Bootstrapping from a non-checked-out distribution is risky." >&2
-  exit 1
-fi
-
-# If $STR is not already on a line by itself in $FILE, insert it,
-# sorting the new contents of the file and replacing $FILE with the result.
-insert_sorted_if_absent() {
-  file=$1
-  str=$2
-  test -f $file || touch $file
-  echo "$str" | sort -u - $file | cmp - $file > /dev/null \
-    || echo "$str" | sort -u - $file -o $file \
-    || exit 1
-}
-
-# Adjust $PATTERN for $VC_IGNORE_FILE and insert it with
-# insert_sorted_if_absent.
-insert_vc_ignore() {
-  vc_ignore_file="$1"
-  pattern="$2"
-  case $vc_ignore_file in
-  *.gitignore)
-    # A .gitignore entry that does not start with `/' applies
-    # recursively to subdirectories, so prepend `/' to every
-    # .gitignore entry.
-    pattern=`echo "$pattern" | sed s,^,/,`;;
-  esac
-  insert_sorted_if_absent "$vc_ignore_file" "$pattern"
-}
-
-# Die if there is no AC_CONFIG_AUX_DIR($build_aux) line in configure.ac.
-found_aux_dir=no
-grep '^[	 ]*AC_CONFIG_AUX_DIR(\['"$build_aux"'\])' configure.ac \
-    >/dev/null && found_aux_dir=yes
-grep '^[	 ]*AC_CONFIG_AUX_DIR('"$build_aux"')' configure.ac \
-    >/dev/null && found_aux_dir=yes
-if test $found_aux_dir = no; then
-  echo "$0: expected line not found in configure.ac. Add the following:" >&2
-  echo "  AC_CONFIG_AUX_DIR([$build_aux])" >&2
-  exit 1
-fi
-
-# If $build_aux doesn't exist, create it now, otherwise some bits
-# below will malfunction.  If creating it, also mark it as ignored.
-if test ! -d $build_aux; then
-  mkdir $build_aux
-  for dot_ig in x $vc_ignore; do
-    test $dot_ig = x && continue
-    insert_vc_ignore $dot_ig $build_aux
-  done
-fi
-
-# Note this deviates from the version comparison in automake
-# in that it treats 1.5 < 1.5.0, and treats 1.4.4a < 1.4-p3a
-# but this should suffice as we won't be specifying old
-# version formats or redundant trailing .0 in bootstrap.conf.
-# If we did want full compatibility then we should probably
-# use m4_version_compare from autoconf.
-sort_ver() { # sort -V is not generally available
-  ver1="$1"
-  ver2="$2"
-
-  # split on '.' and compare each component
-  i=1
-  while : ; do
-    p1=$(echo "$ver1" | cut -d. -f$i)
-    p2=$(echo "$ver2" | cut -d. -f$i)
-    if [ ! "$p1" ]; then
-      echo "$1 $2"
-      break
-    elif [ ! "$p2" ]; then
-      echo "$2 $1"
-      break
-    elif [ ! "$p1" = "$p2" ]; then
-      if [ "$p1" -gt "$p2" ] 2>/dev/null; then # numeric comparison
-        echo "$2 $1"
-      elif [ "$p2" -gt "$p1" ] 2>/dev/null; then # numeric comparison
-        echo "$1 $2"
-      else # numeric, then lexicographic comparison
-        lp=$(printf "$p1\n$p2\n" | LANG=C sort -n | tail -n1)
-        if [ "$lp" = "$p2" ]; then
-          echo "$1 $2"
-        else
-          echo "$2 $1"
-        fi
-      fi
-      break
-    fi
-    i=$(($i+1))
-  done
-}
-
-get_version() {
-  app=$1
-
-  $app --version >/dev/null 2>&1 || return 1
-
-  $app --version 2>&1 |
-  sed -n '# Move version to start of line.
-          s/.*[v ]\([0-9]\)/\1/
-
-          # Skip lines that do not start with version.
-          /^[0-9]/!d
-
-          # Remove characters after the version.
-          s/[^.a-z0-9-].*//
-
-          # The first component must be digits only.
-          s/^\([0-9]*\)[a-z-].*/\1/
-
-          #the following essentially does s/5.005/5.5/
-          s/\.0*\([1-9]\)/.\1/g
-          p
-          q'
-}
-
-check_versions() {
-  ret=0
-
-  while read app req_ver; do
-    # We only need libtoolize from the libtool package.
-    if test "$app" = libtool; then
-      app=libtoolize
-    fi
-    # Exempt git if --no-git is in effect.
-    if test "$app" = git; then
-      $use_git || continue
-    fi
-    # Honor $APP variables ($TAR, $AUTOCONF, etc.)
-    appvar=`echo $app | tr '[a-z]-' '[A-Z]_'`
-    test "$appvar" = TAR && appvar=AMTAR
-    eval "app=\${$appvar-$app}"
-    inst_ver=$(get_version $app)
-    if [ ! "$inst_ver" ]; then
-      echo "$me: Error: '$app' not found" >&2
-      ret=1
-    elif [ ! "$req_ver" = "-" ]; then
-      latest_ver=$(sort_ver $req_ver $inst_ver | cut -d' ' -f2)
-      if [ ! "$latest_ver" = "$inst_ver" ]; then
-        echo "$me: Error: '$app' version == $inst_ver is too old" >&2
-        echo "       '$app' version >= $req_ver is required" >&2
-        ret=1
-      fi
-    fi
-  done
-
-  return $ret
-}
-
-print_versions() {
-  echo "Program    Min_version"
-  echo "----------------------"
-  printf %s "$buildreq"
-  echo "----------------------"
-  # can't depend on column -t
-}
-
-use_libtool=0
-# We'd like to use grep -E, to see if any of LT_INIT,
-# AC_PROG_LIBTOOL, AM_PROG_LIBTOOL is used in configure.ac,
-# but that's not portable enough (e.g., for Solaris).
-grep '^[	 ]*A[CM]_PROG_LIBTOOL' configure.ac >/dev/null \
-  && use_libtool=1
-grep '^[	 ]*LT_INIT' configure.ac >/dev/null \
-  && use_libtool=1
-if test $use_libtool = 1; then
-  find_tool LIBTOOLIZE glibtoolize libtoolize
-fi
-
-if ! printf "$buildreq" | check_versions; then
-  echo >&2
-  if test -f README-prereq; then
-    echo "$0: See README-prereq for how to get the prerequisite programs" >&2
-  else
-    echo "$0: Please install the prerequisite programs" >&2
-  fi
-  exit 1
-fi
-
-echo "$0: Bootstrapping from checked-out $package sources..."
-
-# See if we can use gnulib's git-merge-changelog merge driver.
-if test -d .git && (git --version) >/dev/null 2>/dev/null ; then
-  if git config merge.merge-changelog.driver >/dev/null ; then
-    :
-  elif (git-merge-changelog --version) >/dev/null 2>/dev/null ; then
-    echo "$0: initializing git-merge-changelog driver"
-    git config merge.merge-changelog.name 'GNU-style ChangeLog merge driver'
-    git config merge.merge-changelog.driver 'git-merge-changelog %O %A %B'
-  else
-    echo "$0: consider installing git-merge-changelog from gnulib"
-  fi
-fi
-
-
-cleanup_gnulib() {
-  status=$?
-  rm -fr "$gnulib_path"
-  exit $status
-}
-
-git_modules_config () {
-  test -f .gitmodules && git config --file .gitmodules "$@"
-}
-
-gnulib_path=`git_modules_config submodule.gnulib.path`
-test -z "$gnulib_path" && gnulib_path=gnulib
-
-# Get gnulib files.
-
-case ${GNULIB_SRCDIR--} in
--)
-  if git_modules_config submodule.gnulib.url >/dev/null; then
-    echo "$0: getting gnulib files..."
-    git submodule init || exit $?
-    git submodule update || 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
-  fi
-  GNULIB_SRCDIR=$gnulib_path
-  ;;
-*)
-  # Use GNULIB_SRCDIR as a reference.
-  if 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 || 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 && git submodule update \
-          || exit $?
-      fi
-    fi
-    GNULIB_SRCDIR=$gnulib_path
-  fi
-  ;;
-esac
-
-if $bootstrap_sync; then
-  cmp -s "$0" "$GNULIB_SRCDIR/build-aux/bootstrap" || {
-    echo "$0: updating bootstrap and restarting..."
-    exec sh -c \
-      'cp "$1" "$2" && shift && exec "${CONFIG_SHELL-/bin/sh}" "$@"' \
-      -- "$GNULIB_SRCDIR/build-aux/bootstrap" \
-      "$0" "$@" --no-bootstrap-sync
-  }
-fi
-
-gnulib_tool=$GNULIB_SRCDIR/gnulib-tool
-<$gnulib_tool || exit
-
-# Get translations.
-
-download_po_files() {
-  subdir=$1
-  domain=$2
-  echo "$me: getting translations into $subdir for $domain..."
-  cmd=`printf "$po_download_command_format" "$domain" "$subdir"`
-  eval "$cmd"
-}
-
-# Mirror .po files to $po_dir/.reference and copy only the new
-# or modified ones into $po_dir.  Also update $po_dir/LINGUAS.
-# Note po files that exist locally only are left in $po_dir but will
-# not be included in LINGUAS and hence will not be distributed.
-update_po_files() {
-  # Directory containing primary .po files.
-  # Overwrite them only when we're sure a .po file is new.
-  po_dir=$1
-  domain=$2
-
-  # Mirror *.po files into this dir.
-  # Usually contains *.s1 checksum files.
-  ref_po_dir="$po_dir/.reference"
-
-  test -d $ref_po_dir || mkdir $ref_po_dir || return
-  download_po_files $ref_po_dir $domain \
-    && ls "$ref_po_dir"/*.po 2>/dev/null |
-      sed 's|.*/||; s|\.po$||' > "$po_dir/LINGUAS" || return
-
-  langs=`cd $ref_po_dir && echo *.po|sed 's/\.po//g'`
-  test "$langs" = '*' && langs=x
-  for po in $langs; do
-    case $po in x) continue;; esac
-    new_po="$ref_po_dir/$po.po"
-    cksum_file="$ref_po_dir/$po.s1"
-    if ! test -f "$cksum_file" ||
-        ! test -f "$po_dir/$po.po" ||
-        ! $SHA1SUM -c --status "$cksum_file" \
-            < "$new_po" > /dev/null; then
-      echo "$me: updated $po_dir/$po.po..."
-      cp "$new_po" "$po_dir/$po.po" \
-          && $SHA1SUM < "$new_po" > "$cksum_file"
-    fi
-  done
-}
-
-case $SKIP_PO in
-'')
-  if test -d po; then
-    update_po_files po $package || exit
-  fi
-
-  if test -d runtime-po; then
-    update_po_files runtime-po $package-runtime || exit
-  fi;;
-esac
-
-symlink_to_dir()
-{
-  src=$1/$2
-  dst=${3-$2}
-
-  test -f "$src" && {
-
-    # If the destination directory doesn't exist, create it.
-    # This is required at least for "lib/uniwidth/cjk.h".
-    dst_dir=`dirname "$dst"`
-    if ! test -d "$dst_dir"; then
-      mkdir -p "$dst_dir"
-
-      # If we've just created a directory like lib/uniwidth,
-      # tell version control system(s) it's ignorable.
-      # FIXME: for now, this does only one level
-      parent=`dirname "$dst_dir"`
-      for dot_ig in x $vc_ignore; do
-        test $dot_ig = x && continue
-        ig=$parent/$dot_ig
-        insert_vc_ignore $ig `echo "$dst_dir"|sed 's,.*/,,'`
-      done
-    fi
-
-    if $copy; then
-      {
-        test ! -h "$dst" || {
-          echo "$me: rm -f $dst" &&
-          rm -f "$dst"
-        }
-      } &&
-      test -f "$dst" &&
-      cmp -s "$src" "$dst" || {
-        echo "$me: cp -fp $src $dst" &&
-        cp -fp "$src" "$dst"
-      }
-    else
-      test -h "$dst" &&
-      src_ls=`ls -diL "$src" 2>/dev/null` && set $src_ls && src_i=$1 &&
-      dst_ls=`ls -diL "$dst" 2>/dev/null` && set $dst_ls && dst_i=$1 &&
-      test "$src_i" = "$dst_i" || {
-        dot_dots=
-        case $src in
-        /*) ;;
-        *)
-          case /$dst/ in
-          *//* | */../* | */./* | /*/*/*/*/*/)
-             echo >&2 "$me: invalid symlink calculation: $src -> $dst"
-             exit 1;;
-          /*/*/*/*/)	dot_dots=../../../;;
-          /*/*/*/)	dot_dots=../../;;
-          /*/*/)	dot_dots=../;;
-          esac;;
-        esac
-
-        echo "$me: ln -fs $dot_dots$src $dst" &&
-        ln -fs "$dot_dots$src" "$dst"
-      }
-    fi
-  }
-}
-
-cp_mark_as_generated()
-{
-  cp_src=$1
-  cp_dst=$2
-
-  if cmp -s "$cp_src" "$GNULIB_SRCDIR/$cp_dst"; then
-    symlink_to_dir "$GNULIB_SRCDIR" "$cp_dst"
-  elif cmp -s "$cp_src" "$local_gl_dir/$cp_dst"; then
-    symlink_to_dir $local_gl_dir "$cp_dst"
-  else
-    case $cp_dst in
-      *.[ch])             c1='/* '; c2=' */';;
-      *.texi)             c1='@c '; c2=     ;;
-      *.m4|*/Make*|Make*) c1='# ' ; c2=     ;;
-      *)                  c1=     ; c2=     ;;
-    esac
-
-    # If the destination directory doesn't exist, create it.
-    # This is required at least for "lib/uniwidth/cjk.h".
-    dst_dir=`dirname "$cp_dst"`
-    test -d "$dst_dir" || mkdir -p "$dst_dir"
-
-    if test -z "$c1"; then
-      cmp -s "$cp_src" "$cp_dst" || {
-        # Copy the file first to get proper permissions if it
-        # doesn't already exist.  Then overwrite the copy.
-        echo "$me: cp -f $cp_src $cp_dst" &&
-        rm -f "$cp_dst" &&
-        cp "$cp_src" "$cp_dst-t" &&
-        sed "s!$bt_regex/!!g" "$cp_src" > "$cp_dst-t" &&
-        mv -f "$cp_dst-t" "$cp_dst"
-      }
-    else
-      # Copy the file first to get proper permissions if it
-      # doesn't already exist.  Then overwrite the copy.
-      cp "$cp_src" "$cp_dst-t" &&
-      (
-        echo "$c1-*- buffer-read-only: t -*- vi: set ro:$c2" &&
-        echo "${c1}DO NOT EDIT! GENERATED AUTOMATICALLY!$c2" &&
-        sed "s!$bt_regex/!!g" "$cp_src"
-      ) > $cp_dst-t &&
-      if cmp -s "$cp_dst-t" "$cp_dst"; then
-        rm -f "$cp_dst-t"
-      else
-        echo "$me: cp $cp_src $cp_dst # with edits" &&
-        mv -f "$cp_dst-t" "$cp_dst"
-      fi
-    fi
-  fi
-}
-
-version_controlled_file() {
-  dir=$1
-  file=$2
-  found=no
-  if test -d CVS; then
-    grep -F "/$file/" $dir/CVS/Entries 2>/dev/null |
-             grep '^/[^/]*/[0-9]' > /dev/null && found=yes
-  elif test -d .git; then
-    git rm -n "$dir/$file" > /dev/null 2>&1 && found=yes
-  elif test -d .svn; then
-    svn log -r HEAD "$dir/$file" > /dev/null 2>&1 && found=yes
-  else
-    echo "$me: no version control for $dir/$file?" >&2
-  fi
-  test $found = yes
-}
-
-slurp() {
-  for dir in . `(cd $1 && find * -type d -print)`; do
-    copied=
-    sep=
-    for file in `ls -a $1/$dir`; do
-      case $file in
-      .|..) continue;;
-      # FIXME: should all file names starting with "." be ignored?
-      .*) continue;;
-      esac
-      test -d $1/$dir/$file && continue
-      for excluded_file in $excluded_files; do
-        test "$dir/$file" = "$excluded_file" && continue 2
-      done
-      if test $file = Makefile.am && test "X$gnulib_mk" != XMakefile.am; then
-        copied=$copied${sep}$gnulib_mk; sep=$nl
-        remove_intl='/^[^#].*\/intl/s/^/#/;'"s!$bt_regex/!!g"
-        sed "$remove_intl" $1/$dir/$file |
-        cmp - $dir/$gnulib_mk > /dev/null || {
-          echo "$me: Copying $1/$dir/$file to $dir/$gnulib_mk ..." &&
-          rm -f $dir/$gnulib_mk &&
-          sed "$remove_intl" $1/$dir/$file >$dir/$gnulib_mk &&
-          gnulib_mk_hook $dir/$gnulib_mk
-        }
-      elif { test "${2+set}" = set && test -r $2/$dir/$file; } ||
-           version_controlled_file $dir $file; then
-        echo "$me: $dir/$file overrides $1/$dir/$file"
-      else
-        copied=$copied$sep$file; sep=$nl
-        if test $file = gettext.m4; then
-          echo "$me: patching m4/gettext.m4 to remove need for intl/* ..."
-          rm -f $dir/$file
-          sed '
-            /^AC_DEFUN(\[AM_INTL_SUBDIR],/,/^]/c\
-              AC_DEFUN([AM_INTL_SUBDIR], [])
-            /^AC_DEFUN(\[gt_INTL_SUBDIR_CORE],/,/^]/c\
-              AC_DEFUN([gt_INTL_SUBDIR_CORE], [])
-            $a\
-              AC_DEFUN([gl_LOCK_EARLY], [])
-          ' $1/$dir/$file >$dir/$file
-        else
-          cp_mark_as_generated $1/$dir/$file $dir/$file
-        fi
-      fi || exit
-    done
-
-    for dot_ig in x $vc_ignore; do
-      test $dot_ig = x && continue
-      ig=$dir/$dot_ig
-      if test -n "$copied"; then
-        insert_vc_ignore $ig "$copied"
-        # If an ignored file name ends with .in.h, then also add
-        # the name with just ".h".  Many gnulib headers are generated,
-        # e.g., stdint.in.h -> stdint.h, dirent.in.h ->..., etc.
-        # Likewise for .gperf -> .h, .y -> .c, and .sin -> .sed
-        f=`echo "$copied" |
-          sed '
-            s/\.in\.h$/.h/
-            s/\.sin$/.sed/
-            s/\.y$/.c/
-            s/\.gperf$/.h/
-          '
-        `
-        insert_vc_ignore $ig "$f"
-
-        # For files like sys_stat.in.h and sys_time.in.h, record as
-        # ignorable the directory we might eventually create: sys/.
-        f=`echo "$copied"|sed 's/sys_.*\.in\.h$/sys/'`
-        insert_vc_ignore $ig "$f"
-      fi
-    done
-  done
-}
-
-
-# Create boot temporary directories to import from gnulib and gettext.
-rm -fr $bt $bt2 &&
-mkdir $bt $bt2 || exit
-
-# Import from gnulib.
-
-gnulib_tool_options="\
- --import\
- --no-changelog\
- --aux-dir $bt/$build_aux\
- --doc-base $bt/$doc_base\
- --lib $gnulib_name\
- --m4-base $bt/$m4_base/\
- --source-base $bt/$source_base/\
- --tests-base $bt/$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 &&
-slurp $bt || exit
-
-for file in $gnulib_files; do
-  symlink_to_dir "$GNULIB_SRCDIR" $file || exit
-done
-
-
-# Import from gettext.
-with_gettext=yes
-grep '^[	 ]*AM_GNU_GETTEXT_VERSION(' configure.ac >/dev/null || \
-    with_gettext=no
-
-if test $with_gettext = yes; then
-  echo "$0: (cd $bt2; ${AUTOPOINT-autopoint}) ..."
-  cp configure.ac $bt2 &&
-  (cd $bt2 && ${AUTOPOINT-autopoint} && rm configure.ac) &&
-  slurp $bt2 $bt || exit
-fi
-rm -fr $bt $bt2 || exit
-
-# Remove any dangling symlink matching "*.m4" or "*.[ch]" in some
-# gnulib-populated directories.  Such .m4 files would cause aclocal to fail.
-# The following requires GNU find 4.2.3 or newer.  Considering the usual
-# portability constraints of this script, that may seem a very demanding
-# requirement, but it should be ok.  Ignore any failure, which is fine,
-# since this is only a convenience to help developers avoid the relatively
-# unusual case in which a symlinked-to .m4 file is git-removed from gnulib
-# between successive runs of this script.
-find "$m4_base" "$source_base" \
-  -depth \( -name '*.m4' -o -name '*.[ch]' \) \
-  -type l -xtype l -delete > /dev/null 2>&1
-
-# Reconfigure, getting other files.
-
-# Skip autoheader if it's not needed.
-grep -E '^[	 ]*AC_CONFIG_HEADERS?\>' configure.ac >/dev/null ||
-  AUTOHEADER=true
-
-for command in \
-  libtool \
-  "${ACLOCAL-aclocal} --force -I m4 $ACLOCAL_FLAGS" \
-  "${AUTOCONF-autoconf} --force" \
-  "${AUTOHEADER-autoheader} --force" \
-  "${AUTOMAKE-automake} --add-missing --copy --force-missing"
-do
-  if test "$command" = libtool; then
-    test $use_libtool = 0 \
-      && continue
-    command="${LIBTOOLIZE-libtoolize} -c -f"
-  fi
-  echo "$0: $command ..."
-  $command || exit
-done
-
-
-# Get some extra files from gnulib, overriding existing files.
-for file in $gnulib_extra_files; do
-  case $file in
-  */INSTALL) dst=INSTALL;;
-  build-aux/*) dst=$build_aux/`expr "$file" : 'build-aux/\(.*\)'`;;
-  *) dst=$file;;
-  esac
-  symlink_to_dir "$GNULIB_SRCDIR" $file $dst || exit
-done
-
-if test $with_gettext = yes; then
-  # Create gettext configuration.
-  echo "$0: Creating po/Makevars from po/Makevars.template ..."
-  rm -f po/Makevars
-  sed '
-    /^EXTRA_LOCALE_CATEGORIES *=/s/=.*/= '"$EXTRA_LOCALE_CATEGORIES"'/
-    /^COPYRIGHT_HOLDER *=/s/=.*/= '"$COPYRIGHT_HOLDER"'/
-    /^MSGID_BUGS_ADDRESS *=/s|=.*|= '"$MSGID_BUGS_ADDRESS"'|
-    /^XGETTEXT_OPTIONS *=/{
-      s/$/ \\/
-      a\
-          '"$XGETTEXT_OPTIONS"' $${end_of_xgettext_options+}
-    }
-  ' po/Makevars.template >po/Makevars || exit 1
-
-  if test -d runtime-po; then
-    # Similarly for runtime-po/Makevars, but not quite the same.
-    rm -f runtime-po/Makevars
-    sed '
-      /^DOMAIN *=.*/s/=.*/= '"$package"'-runtime/
-      /^subdir *=.*/s/=.*/= runtime-po/
-      /^MSGID_BUGS_ADDRESS *=/s/=.*/= bug-'"$package"'@gnu.org/
-      /^XGETTEXT_OPTIONS *=/{
-        s/$/ \\/
-        a\
-            '"$XGETTEXT_OPTIONS_RUNTIME"' $${end_of_xgettext_options+}
-      }
-    ' po/Makevars.template >runtime-po/Makevars || exit 1
-
-    # Copy identical files from po to runtime-po.
-    (cd po && cp -p Makefile.in.in *-quot *.header *.sed *.sin ../runtime-po)
-  fi
-fi
-
-bootstrap_epilogue
-
-echo "$0: done.  Now you can run './configure'."
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:

bootstrap.conf

@@ -1,177 +0,0 @@
-# Bootstrap configuration.
-
-# Copyright (C) 2010-2011 Red Hat, Inc.
-
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
-
-
-# gnulib modules used by this package.
-gnulib_modules='
-areadlink
-base64
-c-ctype
-canonicalize-lgpl
-chown
-close
-connect
-configmake
-count-one-bits
-crypto/md5
-dirname-lgpl
-fcntl-h
-func
-getaddrinfo
-gethostname
-getpass
-gettext-h
-gettimeofday
-gitlog-to-changelog
-gnumakefile
-ignore-value
-inet_pton
-ioctl
-maintainer-makefile
-mkstemp
-mkstemps
-mktempd
-netdb
-perror
-physmem
-pipe-posix
-poll
-posix-shell
-pthread
-recv
-random_r
-sched
-send
-setsockopt
-sigaction
-sigpipe
-snprintf
-socket
-stpcpy
-strchrnul
-strndup
-strerror
-strerror_r-posix
-strptime
-strsep
-strtok_r
-sys_stat
-sys_wait
-termios
-time_r
-timegm
-uname
-useless-if-before-free
-usleep
-vasprintf
-verify
-vc-list-files
-waitpid
-'
-
-# Additional xgettext options to use.  Use "\\\newline" to break lines.
-XGETTEXT_OPTIONS=$XGETTEXT_OPTIONS'\\\
- --flag=virAsprintf:2:c-format\\\
- --from-code=UTF-8\\\
-'
-
-# This is not a GNU package, so the default bug address is invalid,
-# and the translation project is not in use.
-MSGID_BUGS_ADDRESS=libvir-list@redhat.com
-COPYRIGHT_HOLDER='Red Hat, Inc.'
-SKIP_PO=true
-
-# Enable copy-mode for MSYS/MinGW. MSYS' ln doesn't work well in the way
-# bootstrap uses it with relative paths.
-if test -n "$MSYSTEM"; then
-    copy=true
-fi
-
-# If "AM_GNU_GETTEXT(external" or "AM_GNU_GETTEXT([external]"
-# appears in configure.ac, exclude some unnecessary files.
-# Without grep's -E option (not portable enough, pre-configure),
-# the following test is ugly.  Also, this depends on the existence
-# of configure.ac, not the obsolescent-named configure.in.  But if
-# you're using this infrastructure, you should care about such things.
-
-gettext_external=0
-grep '^[	 ]*AM_GNU_GETTEXT(external\>' configure.ac > /dev/null &&
-  gettext_external=1
-grep '^[	 ]*AM_GNU_GETTEXT(\[external\]' configure.ac > /dev/null &&
-  gettext_external=1
-
-if test $gettext_external = 1; then
-  # Gettext supplies these files, but we don't need them since
-  # we don't have an intl subdirectory.
-  excluded_files='
-      m4/glibc2.m4
-      m4/intdiv0.m4
-      m4/lcmessage.m4
-      m4/uintmax_t.m4
-      m4/ulonglong.m4
-      m4/visibility.m4
-  '
-fi
-
-# Tell gnulib to:
-#   require LGPLv2+
-#   put *.m4 files in new gnulib/m4/ dir
-#   put *.[ch] files in new gnulib/lib/ dir.
-#   import gnulib tests in new gnulib/tests/ dir.
-gnulib_name=libgnu
-m4_base=gnulib/m4
-source_base=gnulib/lib
-tests_base=gnulib/tests
-gnulib_mk=Makefile.am
-gnulib_tool_option_extras="\
- --lgpl=2\
- --with-tests\
-"
-
-# Convince bootstrap to use multiple m4 directories.
-: ${ACLOCAL=aclocal}
-ACLOCAL="$ACLOCAL -I gnulib/m4"
-export ACLOCAL
-
-# Build prerequisites
-buildreq="\
-autoconf   2.59
-automake   1.9.6
-autopoint  -
-gettext    -
-git        1.5.5
-gzip       -
-libtool    -
-perl       5.5
-pkg-config -
-tar        -
-"
-
-# Automake requires that ChangeLog exist.
-touch ChangeLog || exit 1
-
-
-bootstrap_epilogue()
-{
-  # Change paths in gnulib/tests/Makefile.am from "../../.." to "../..",
-  # then ensure that gnulib/tests/Makefile.in is up-to-date.
-  m=gnulib/tests/Makefile.am
-  sed 's,\.\./\.\./\.\.,../..,g' $m > $m-t
-  mv -f $m-t $m
-  ${AUTOMAKE-automake} gnulib/tests/Makefile
-}

cfg.mk

@@ -1,549 +0,0 @@
-# Customize Makefile.maint.                           -*- makefile -*-
-# Copyright (C) 2008-2011 Red Hat, Inc.
-# Copyright (C) 2003-2008 Free Software Foundation, Inc.
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Use alpha.gnu.org for alpha and beta releases.
-# Use ftp.gnu.org for major releases.
-gnu_ftp_host-alpha = alpha.gnu.org
-gnu_ftp_host-beta = alpha.gnu.org
-gnu_ftp_host-major = ftp.gnu.org
-gnu_rel_host = $(gnu_ftp_host-$(RELEASE_TYPE))
-
-url_dir_list = \
-  ftp://$(gnu_rel_host)/gnu/coreutils
-
-# We use .gnulib, not gnulib.
-gnulib_dir = $(srcdir)/.gnulib
-
-# Tests not to run as part of "make distcheck".
-local-checks-to-skip =			\
-  changelog-check			\
-  check-AUTHORS				\
-  makefile-check			\
-  makefile_path_separator_check		\
-  patch-check				\
-  sc_GPL_version			\
-  sc_always_defined_macros		\
-  sc_cast_of_alloca_return_value	\
-  sc_cross_check_PATH_usage_in_tests	\
-  sc_dd_max_sym_length			\
-  sc_error_exit_success			\
-  sc_file_system			\
-  sc_immutable_NEWS			\
-  sc_makefile_path_separator_check	\
-  sc_obsolete_symbols			\
-  sc_prohibit_S_IS_definition		\
-  sc_prohibit_atoi_atof			\
-  sc_prohibit_hash_without_use		\
-  sc_prohibit_jm_in_m4			\
-  sc_prohibit_quote_without_use		\
-  sc_prohibit_quotearg_without_use	\
-  sc_prohibit_stat_st_blocks		\
-  sc_root_tests				\
-  sc_space_tab				\
-  sc_sun_os_names			\
-  sc_system_h_headers			\
-  sc_texinfo_acronym			\
-  sc_tight_scope			\
-  sc_two_space_separator_in_usage	\
-  sc_error_message_uppercase		\
-  sc_program_name			\
-  sc_require_test_exit_idiom		\
-  sc_makefile_check			\
-  sc_useless_cpp_parens
-
-# Files that should never cause syntax check failures.
-VC_LIST_ALWAYS_EXCLUDE_REGEX = ^docs/news.html.in$$
-
-# Functions like free() that are no-ops on NULL arguments.
-useless_free_options =				\
-  --name=VIR_FREE				\
-  --name=sexpr_free				\
-  --name=virBitmapFree                          \
-  --name=virCPUDefFree				\
-  --name=virCapabilitiesFree			\
-  --name=virCapabilitiesFreeGuest		\
-  --name=virCapabilitiesFreeGuestDomain		\
-  --name=virCapabilitiesFreeGuestFeature	\
-  --name=virCapabilitiesFreeGuestMachine	\
-  --name=virCapabilitiesFreeHostNUMACell	\
-  --name=virCapabilitiesFreeMachines		\
-  --name=virCgroupFree				\
-  --name=virCommandFree				\
-  --name=virConfFreeList			\
-  --name=virConfFreeValue			\
-  --name=virDomainChrDefFree			\
-  --name=virDomainChrSourceDefFree		\
-  --name=virDomainControllerDefFree		\
-  --name=virDomainDefFree			\
-  --name=virDomainDeviceDefFree			\
-  --name=virDomainDiskDefFree			\
-  --name=virDomainEventCallbackListFree		\
-  --name=virDomainEventFree			\
-  --name=virDomainEventQueueFree		\
-  --name=virDomainFSDefFree			\
-  --name=virDomainGraphicsDefFree		\
-  --name=virDomainHostdevDefFree		\
-  --name=virDomainInputDefFree			\
-  --name=virDomainNetDefFree			\
-  --name=virDomainObjFree			\
-  --name=virDomainSmartcardDefFree		\
-  --name=virDomainSnapshotDefFree		\
-  --name=virDomainSnapshotObjFree		\
-  --name=virDomainSoundDefFree			\
-  --name=virDomainVideoDefFree			\
-  --name=virDomainWatchdogDefFree		\
-  --name=virInterfaceDefFree			\
-  --name=virInterfaceIpDefFree			\
-  --name=virInterfaceObjFree			\
-  --name=virInterfaceProtocolDefFree		\
-  --name=virJSONValueFree			\
-  --name=virLastErrFreeData			\
-  --name=virNWFilterDefFree			\
-  --name=virNWFilterEntryFree			\
-  --name=virNWFilterHashTableFree		\
-  --name=virNWFilterIPAddrLearnReqFree		\
-  --name=virNWFilterIncludeDefFree		\
-  --name=virNWFilterObjFree			\
-  --name=virNWFilterRuleDefFree			\
-  --name=virNWFilterRuleInstFree		\
-  --name=virNetworkDefFree			\
-  --name=virNetworkObjFree			\
-  --name=virNodeDeviceDefFree			\
-  --name=virNodeDeviceObjFree			\
-  --name=virSecretDefFree			\
-  --name=virStorageEncryptionFree		\
-  --name=virStorageEncryptionSecretFree		\
-  --name=virStoragePoolDefFree			\
-  --name=virStoragePoolObjFree			\
-  --name=virStoragePoolSourceFree		\
-  --name=virStorageVolDefFree			\
-  --name=virThreadPoolFree			\
-  --name=xmlFree				\
-  --name=xmlXPathFreeContext			\
-  --name=xmlXPathFreeObject
-
-# The following template was generated by this command:
-# make ID && aid free|grep '^vi'|sed 's/ .*//;s/^/#   /'
-# N virBufferFreeAndReset
-# y virCPUDefFree
-# y virCapabilitiesFree
-# y virCapabilitiesFreeGuest
-# y virCapabilitiesFreeGuestDomain
-# y virCapabilitiesFreeGuestFeature
-# y virCapabilitiesFreeGuestMachine
-# y virCapabilitiesFreeHostNUMACell
-# y virCapabilitiesFreeMachines
-# N virCapabilitiesFreeNUMAInfo FIXME
-# y virCgroupFree
-# N virConfFree               (diagnoses the "error")
-# y virConfFreeList
-# y virConfFreeValue
-# y virDomainChrDefFree
-# y virDomainControllerDefFree
-# y virDomainDefFree
-# y virDomainDeviceDefFree
-# y virDomainDiskDefFree
-# y virDomainEventCallbackListFree
-# y virDomainEventFree
-# y virDomainEventQueueFree
-# y virDomainFSDefFree
-# n virDomainFree
-# n virDomainFreeName (can't fix -- returns int)
-# y virDomainGraphicsDefFree
-# y virDomainHostdevDefFree
-# y virDomainInputDefFree
-# y virDomainNetDefFree
-# y virDomainObjFree
-# y virDomainSnapshotDefFree
-# n virDomainSnapshotFree (returns int)
-# n virDomainSnapshotFreeName (returns int)
-# y virDomainSnapshotObjFree
-# y virDomainSoundDefFree
-# y virDomainVideoDefFree
-# y virDomainWatchdogDefFree
-# n virDrvNodeGetCellsFreeMemory (returns int)
-# n virDrvNodeGetFreeMemory (returns long long)
-# n virFree (dereferences param)
-# n virFreeError
-# n virHashFree (takes 2 args)
-# y virInterfaceDefFree
-# n virInterfaceFree (returns int)
-# n virInterfaceFreeName
-# y virInterfaceIpDefFree
-# y virInterfaceObjFree
-# n virInterfaceObjListFree
-# y virInterfaceProtocolDefFree
-# y virJSONValueFree
-# y virLastErrFreeData
-# y virNWFilterDefFree
-# y virNWFilterEntryFree
-# n virNWFilterFree (returns int)
-# y virNWFilterHashTableFree
-# y virNWFilterIPAddrLearnReqFree
-# y virNWFilterIncludeDefFree
-# n virNWFilterFreeName (returns int)
-# y virNWFilterObjFree
-# n virNWFilterObjListFree FIXME
-# y virNWFilterRuleDefFree
-# n virNWFilterRuleFreeInstanceData (typedef)
-# y virNWFilterRuleInstFree
-# y virNetworkDefFree
-# n virNetworkFree (returns int)
-# n virNetworkFreeName (returns int)
-# y virNetworkObjFree
-# n virNetworkObjListFree FIXME
-# n virNodeDevCapsDefFree FIXME
-# y virNodeDeviceDefFree
-# n virNodeDeviceFree (returns int)
-# y virNodeDeviceObjFree
-# n virNodeDeviceObjListFree FIXME
-# n virNodeGetCellsFreeMemory (returns int)
-# n virNodeGetFreeMemory (returns non-void)
-# y virSecretDefFree
-# n virSecretFree (returns non-void)
-# n virSecretFreeName (2 args)
-# n virSecurityLabelDefFree FIXME
-# n virStorageBackendDiskMakeFreeExtent (returns non-void)
-# y virStorageEncryptionFree
-# y virStorageEncryptionSecretFree
-# n virStorageFreeType (enum)
-# y virStoragePoolDefFree
-# n virStoragePoolFree (returns non-void)
-# n virStoragePoolFreeName (returns non-void)
-# y virStoragePoolObjFree
-# n virStoragePoolObjListFree FIXME
-# y virStoragePoolSourceFree
-# y virStorageVolDefFree
-# n virStorageVolFree (returns non-void)
-# n virStorageVolFreeName (returns non-void)
-# n virStreamFree
-
-# Avoid uses of write(2).  Either switch to streams (fwrite), or use
-# the safewrite wrapper.
-sc_avoid_write:
-	@prohibit='\<write *\('						\
-	in_vc_files='\.c$$'						\
-	halt='consider using safewrite instead of write'		\
-	  $(_sc_search_regexp)
-
-# Avoid functions that can lead to double-close bugs.
-sc_prohibit_close:
-	@prohibit='([^>.]|^)\<[fp]?close *\('				\
-	halt='use VIR_{FORCE_}[F]CLOSE instead of [f]close'		\
-	  $(_sc_search_regexp)
-	@prohibit='\<fdopen *\('					\
-	halt='use VIR_FDOPEN instead of fdopen'				\
-	  $(_sc_search_regexp)
-
-# Prefer virCommand for all child processes.
-# XXX - eventually, we want to enhance this to also prohibit virExec.
-sc_prohibit_fork_wrappers:
-	@prohibit='= *\<(fork|popen|system) *\('			\
-	halt='use virCommand for child processes'			\
-	  $(_sc_search_regexp)
-
-# Similar to the gnulib maint.mk rule for sc_prohibit_strcmp
-# Use STREQLEN or STRPREFIX rather than comparing strncmp == 0, or != 0.
-sc_prohibit_strncmp:
-	@grep -nE '! *str''ncmp *\(|\<str''ncmp *\(.+\) *[!=]='		\
-	    $$($(VC_LIST_EXCEPT))					\
-	  | grep -vE ':# *define STR(N?EQLEN|PREFIX)\(' &&		\
-	  { echo '$(ME): use STREQLEN or STRPREFIX instead of str''ncmp' \
-		1>&2; exit 1; } || :
-
-# Use virAsprintf rather than as'printf since *strp is undefined on error.
-sc_prohibit_asprintf:
-	@prohibit='\<v?a[s]printf\>'					\
-	halt='use virAsprintf, not as'printf				\
-	  $(_sc_search_regexp)
-
-# Use snprintf rather than s'printf, even if buffer is provably large enough,
-# since gnulib has more guarantees for snprintf portability
-sc_prohibit_sprintf:
-	@prohibit='\<[s]printf\>'					\
-	halt='use snprintf, not s'printf				\
-	  $(_sc_search_regexp)
-
-sc_prohibit_strncpy:
-	@prohibit='strncpy *\('						\
-	halt='use virStrncpy, not strncpy'				\
-	  $(_sc_search_regexp)
-
-sc_prohibit_readlink:
-	@prohibit='readlink *\('					\
-	halt='use virFileResolveLink, not readlink'			\
-	  $(_sc_search_regexp)
-
-sc_prohibit_gethostname:
-	@prohibit='gethostname *\('					\
-	halt='use virGetHostname, not gethostname'			\
-	  $(_sc_search_regexp)
-
-sc_prohibit_gettext_noop:
-	@prohibit='gettext_noop *\('					\
-	halt='use N_, not gettext_noop'					\
-	  $(_sc_search_regexp)
-
-sc_prohibit_VIR_ERR_NO_MEMORY:
-	@prohibit='\<V''IR_ERR_NO_MEMORY\>'				\
-	halt='use virReportOOMError, not V'IR_ERR_NO_MEMORY		\
-	  $(_sc_search_regexp)
-
-# Use a subshell for each function, to give the optimal warning message.
-include $(srcdir)/Makefile.nonreentrant
-sc_prohibit_nonreentrant:
-	@fail=0 ; \
-	for i in $(NON_REENTRANT) ; \
-	do \
-	    (prohibit="\\<$$i *\\("					\
-	     halt="use $${i}_r, not $$i"				\
-	     $(_sc_search_regexp)					\
-	    ) || fail=1;						\
-	done ; \
-	exit $$fail
-
-# Prohibit the inclusion of <ctype.h>.
-sc_prohibit_ctype_h:
-	@prohibit='^# *include  *<ctype\.h>'				\
-	halt="don't use ctype.h; instead, use c-ctype.h"		\
-	  $(_sc_search_regexp)
-
-# Ensure that no C source file, docs, or rng schema uses TABs for
-# indentation.  Also match *.h.in files, to get libvirt.h.in.  Exclude
-# files in gnulib, since they're imported.
-sc_TAB_in_indentation:
-	@prohibit='^ *	'						\
-	in_vc_files='(\.(rng|[ch](\.in)?|html.in)|(daemon|tools)/.*\.in)$$' \
-	halt='use leading spaces, not TAB, in C, sh, html, and RNG schemas' \
-	  $(_sc_search_regexp)
-
-ctype_re = isalnum|isalpha|isascii|isblank|iscntrl|isdigit|isgraph|islower\
-|isprint|ispunct|isspace|isupper|isxdigit|tolower|toupper
-
-sc_avoid_ctype_macros:
-	@prohibit='\b($(ctype_re)) *\('					\
-	halt="don't use ctype macros (use c-ctype.h)"			\
-	  $(_sc_search_regexp)
-
-sc_prohibit_virBufferAdd_with_string_literal:
-	@prohibit='\<virBufferAdd *\([^,]+, *"[^"]'			\
-	halt='use virBufferAddLit, not virBufferAdd, with a string literal' \
-	  $(_sc_search_regexp)
-
-# Not only do they fail to deal well with ipv6, but the gethostby*
-# functions are also not thread-safe.
-sc_prohibit_gethostby:
-	@prohibit='\<gethostby(addr|name2?) *\('			\
-	halt='use getaddrinfo, not gethostby*'				\
-	  $(_sc_search_regexp)
-
-# raw xmlGetProp requires some nasty casts
-sc_prohibit_xmlGetProp:
-	@prohibit='\<xmlGetProp *\('					\
-	halt='use virXMLPropString, not xmlGetProp'			\
-	  $(_sc_search_regexp)
-
-# Many of the function names below came from this filter:
-# git grep -B2 '\<_('|grep -E '\.c- *[[:alpha:]_][[:alnum:]_]* ?\(.*[,;]$' \
-# |sed 's/.*\.c-  *//'|perl -pe 's/ ?\(.*//'|sort -u \
-# |grep -vE '^(qsort|if|close|assert|fputc|free|N_|vir.*GetName|.*Unlock|virNodeListDevices|virHashRemoveEntry|freeaddrinfo|.*[fF]ree|xdrmem_create|xmlXPathFreeObject|virUUIDFormat|openvzSetProgramSentinal|polkit_action_unref)$'
-
-msg_gen_function =
-msg_gen_function += ESX_ERROR
-msg_gen_function += ESX_VI_ERROR
-msg_gen_function += macvtapError
-msg_gen_function += remoteError
-msg_gen_function += lxcError
-msg_gen_function += networkLog
-msg_gen_function += networkReportError
-msg_gen_function += oneError
-msg_gen_function += openvzError
-msg_gen_function += qemuReportError
-msg_gen_function += qemudDispatchClientFailure
-msg_gen_function += regerror
-msg_gen_function += remoteDispatchFormatError
-msg_gen_function += umlReportError
-msg_gen_function += vah_error
-msg_gen_function += vah_warning
-msg_gen_function += vboxError
-msg_gen_function += virCommandError
-msg_gen_function += virConfError
-msg_gen_function += virDomainReportError
-msg_gen_function += virHashError
-msg_gen_function += virLibConnError
-msg_gen_function += virLibDomainError
-msg_gen_function += virNetworkReportError
-msg_gen_function += virNodeDeviceReportError
-msg_gen_function += virRaiseError
-msg_gen_function += virReportErrorHelper
-msg_gen_function += virReportSystemError
-msg_gen_function += virSecurityReportError
-msg_gen_function += virSexprError
-msg_gen_function += virStorageReportError
-msg_gen_function += virXMLError
-msg_gen_function += virXenInotifyError
-msg_gen_function += virXenStoreError
-msg_gen_function += virXendError
-msg_gen_function += vmwareError
-msg_gen_function += xenapiSessionErrorHandler
-msg_gen_function += xenUnifiedError
-msg_gen_function += xenXMError
-msg_gen_function += VIR_ERROR
-msg_gen_function += VIR_ERROR0
-
-# Uncomment the following and run "make syntax-check" to see diagnostics
-# that are not yet marked for translation, but that need to be rewritten
-# so that they are translatable.
-# msg_gen_function += fprintf
-# msg_gen_function += testError
-# msg_gen_function += virXenError
-# msg_gen_function += vshPrint
-# msg_gen_function += vshError
-
-func_or := $(shell printf '$(msg_gen_function)'|tr -s '[[:space:]]' '|')
-func_re := ($(func_or))
-
-# Look for diagnostics that aren't marked for translation.
-# This won't find any for which error's format string is on a separate line.
-# The sed filters eliminate false-positives like these:
-#    _("...: "
-#    "%s", _("no storage vol w..."
-sc_libvirt_unmarked_diagnostics:
-	@grep -nE							\
-	    '\<$(func_re) *\([^"]*"[^"]*[a-z]{3}' $$($(VC_LIST_EXCEPT))	\
-	  | grep -v '_''(' &&						\
-	  { echo '$(ME): found unmarked diagnostic(s)' 1>&2;		\
-	    exit 1; } || :
-	@{ grep     -nE '\<$(func_re) *\(.*;$$' $$($(VC_LIST_EXCEPT));   \
-	   grep -A1 -nE '\<$(func_re) *\(.*,$$' $$($(VC_LIST_EXCEPT)); } \
-	   | sed 's/_("[^"][^"]*"//;s/[	 ]"%s"//'			\
-	   | grep '[	 ]"' &&						\
-	  { echo '$(ME): found unmarked diagnostic(s)' 1>&2;		\
-	    exit 1; } || :
-
-# Like the above, but prohibit a newline at the end of a diagnostic.
-# This is subject to false positives partly because it naively looks for
-# `\n"', which may not be the end of the string, and also because it takes
-# two lines of context (the -A2) after the line with the function name.
-# FIXME: this rule might benefit from a separate function list, in case
-# there are functions to which this one applies but that do not get marked
-# diagnostics.
-sc_prohibit_newline_at_end_of_diagnostic:
-	@grep -A2 -nE							\
-	    '\<$(func_re) *\(' $$($(VC_LIST_EXCEPT))			\
-	    | grep '\\n"'						\
-	  && { echo '$(ME): newline at end of message(s)' 1>&2;		\
-	    exit 1; } || :
-
-# Regex for grep -E that exempts generated files from style rules.
-preprocessor_exempt = ((qemu|remote)_(driver|protocol)\.h)$$
-# Enforce recommended preprocessor indentation style.
-sc_preprocessor_indentation:
-	@if cppi --version >/dev/null 2>&1; then			\
-	  $(VC_LIST_EXCEPT) | grep '\.[ch]$$'				\
-	    | grep -vE '$(preprocessor_exempt)' | xargs cppi -a -c	\
-	    || { echo '$(ME): incorrect preprocessor indentation' 1>&2;	\
-		exit 1; };						\
-	else								\
-	  echo '$(ME): skipping test $@: cppi not installed' 1>&2;	\
-	fi
-
-sc_copyright_format:
-	@require='Copyright .*Red 'Hat', Inc\.'				\
-	containing='Copyright .*Red 'Hat				\
-	halt='Red Hat copyright is missing Inc.'			\
-	  $(_sc_search_regexp)
-	@prohibit='Copyright [^(].*Red 'Hat				\
-	halt='consistently use (C) in Red Hat copyright'		\
-	  $(_sc_search_regexp)
-
-# Some functions/macros produce messages intended solely for developers
-# and maintainers.  Do not mark them for translation.
-sc_prohibit_gettext_markup:
-	@prohibit='\<VIR_(WARN|DEBUG)0? *\(_\('				\
-	halt='do not mark these strings for translation'		\
-	  $(_sc_search_regexp)
-
-# Ensure that the syntax_check_exceptions file list in Makefile.am
-# stays in sync with corresponding files in the repository.
-sce = syntax_check_exceptions
-sc_x_sc_dist_check:
-	@test "$$( ($(VC_LIST) | sed -n '/\.x-sc_/p'			\
-		     | sed 's|^$(_dot_escaped_srcdir)/||';		\
-		   sed -n '/^$(sce) =[	 ]*\\$$/,/[^\]$$/p'		\
-		     $(srcdir)/Makefile.am				\
-		       | sed 's/^  *//;/^$(sce) =/d'			\
-		       | tr -s '\012\\' '  ' | fmt -1			\
-		   ) | sort | uniq -u)"					\
-	  && { echo 'Makefile.am: $(sce) mismatch' >&2; exit 1; } || :;
-
-# We don't use this feature of maint.mk.
-prev_version_file = /dev/null
-
-ifeq (0,$(MAKELEVEL))
-  _curr_status = .git-module-status
-  # The sed filter accommodates those who check out on a commit from which
-  # no tag is reachable.  In that case, git submodule status prints a "-"
-  # in column 1 and does not print a "git describe"-style string after the
-  # submodule name.  Contrast these:
-  # -b653eda3ac4864de205419d9f41eec267cb89eeb .gnulib
-  #  b653eda3ac4864de205419d9f41eec267cb89eeb .gnulib (v0.0-2286-gb653eda)
-  # $ cat .git-module-status
-  # b653eda3ac4864de205419d9f41eec267cb89eeb
-  _submodule_hash = sed 's/^[ +-]//;s/ .*//'
-  _update_required := $(shell						\
-      cd '$(srcdir)';							\
-      test -d .git || { echo 0; exit; };				\
-      test -f po/Makevars || { echo 1; exit; };				\
-      actual=$$(git submodule status | $(_submodule_hash);		\
-		git hash-object bootstrap.conf;				\
-		git diff .gnulib);					\
-      stamp="$$($(_submodule_hash) $(_curr_status) 2>/dev/null)";	\
-      test "$$stamp" = "$$actual"; echo $$?)
-  _clean_requested = $(filter %clean,$(MAKECMDGOALS))
-  ifeq (1,$(_update_required)$(_clean_requested))
-    $(info INFO: gnulib update required; running ./autogen.sh first)
-Makefile: _autogen
-  endif
-endif
-
-# Give credit where due:
-# Ensure that each commit author email address (possibly mapped via
-# git log's .mailmap) appears in our AUTHORS file.
-sc_check_author_list:
-	@fail=0;							\
-	for i in $$(git log --pretty=format:%aE%n|sort -u|grep -v '^$$'); do \
-	  sanitized=$$(echo "$$i"|LC_ALL=C sed 's/\([^a-zA-Z0-9_@-]\)/\\\1/g'); \
-	  grep -iq "<$$sanitized>" $(srcdir)/AUTHORS			\
-	    || { printf '%s\n' "$$i" >&2; fail=1; };			\
-	done;								\
-	test $$fail = 1							\
-	  && echo '$(ME): committer(s) not listed in AUTHORS' >&2;	\
-	test $$fail = 0
-
-# It is necessary to call autogen any time gnulib changes.  Autogen
-# reruns configure, then we regenerate all Makefiles at once.
-.PHONY: _autogen
-_autogen:
-	$(srcdir)/autogen.sh
-	./config.status
-
-# Exempt @...@ uses of these symbols.
-_makefile_at_at_check_exceptions = ' && !/(SCHEMA|SYSCONF)DIR/'
-
-# regenerate HACKING as part of the syntax-check
-syntax-check: $(top_srcdir)/HACKING

daemon/.gitignore

@@ -1,13 +0,0 @@
-*.la
-*.lo
-.deps
-.libs
-Makefile
-Makefile.in
-libvirt_qemud
-libvirtd
-libvirtd.init
-libvirtd*.logrotate
-libvirtd.pod
-libvirtd.8
-probes.h

daemon/Makefile.am

@@ -1,342 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-CLEANFILES =
-
-DAEMON_SOURCES =					\
-		event.c event.h				\
-		libvirtd.c libvirtd.h			\
-		remote.c remote.h			\
-		dispatch.c dispatch.h			\
-		stream.c stream.h			\
-		remote_dispatch_prototypes.h		\
-		remote_dispatch_table.h			\
-		remote_dispatch_args.h			\
-		remote_dispatch_ret.h			\
-		qemu_dispatch_prototypes.h		\
-		qemu_dispatch_table.h			\
-		qemu_dispatch_args.h			\
-		qemu_dispatch_ret.h			\
-		../src/remote/remote_protocol.c		\
-		../src/remote/qemu_protocol.c
-
-AVAHI_SOURCES =						\
-		mdns.c mdns.h
-
-DISTCLEANFILES =
-EXTRA_DIST =						\
-	remote_generate_stubs.pl			\
-	libvirtd.conf					\
-	libvirtd.init.in				\
-	libvirtd.policy-0				\
-	libvirtd.policy-1				\
-	libvirtd.sasl					\
-	libvirtd.sysconf				\
-	libvirtd.aug                                    \
-	libvirtd.qemu.logrotate.in                      \
-	libvirtd.lxc.logrotate.in                       \
-	libvirtd.uml.logrotate.in                       \
-	test_libvirtd.aug                               \
-	THREADING.txt					\
-	libvirtd.pod.in					\
-	libvirtd.stp					\
-	$(AVAHI_SOURCES)				\
-	$(DAEMON_SOURCES)
-
-BUILT_SOURCES =
-
-if WITH_LIBVIRTD
-
-man_MANS = libvirtd.8
-
-sbin_PROGRAMS = libvirtd
-
-confdir = $(sysconfdir)/libvirt/
-conf_DATA = libvirtd.conf
-
-augeasdir = $(datadir)/augeas/lenses
-augeas_DATA = libvirtd.aug
-
-augeastestsdir = $(datadir)/augeas/lenses/tests
-augeastests_DATA = test_libvirtd.aug
-
-POD2MAN = pod2man -c "Virtualization Support" \
-			-r "$(PACKAGE)-$(VERSION)" -s 8
-
-libvirtd.pod: libvirtd.pod.in
-	sed \
-	    -e 's![@]sysconfdir[@]!$(sysconfdir)!g' \
-	    -e 's![@]localstatedir[@]!$(localstatedir)!g' \
-	    -e 's![@]remote_pid_file[@]!$(REMOTE_PID_FILE)!g' \
-	    < $< > $@-t
-	mv $@-t $@
-
-libvirtd.8: libvirtd.pod
-	$(AM_V_GEN)$(POD2MAN) $< $@
-
-libvirtd_SOURCES = $(DAEMON_SOURCES)
-
-#-D_XOPEN_SOURCE=600 -D_XOPEN_SOURCE_EXTENDED=1 -D_POSIX_C_SOURCE=199506L
-libvirtd_CFLAGS = \
-	-I$(top_srcdir)/gnulib/lib -I../gnulib/lib \
-	-I$(top_srcdir)/include -I$(top_builddir)/include \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/util \
-	-I$(top_srcdir)/src/conf \
-	-I$(top_srcdir)/src/remote \
-	$(LIBXML_CFLAGS) $(GNUTLS_CFLAGS) $(SASL_CFLAGS) \
-	$(POLKIT_CFLAGS) \
-	$(WARN_CFLAGS) \
-	$(COVERAGE_CFLAGS) \
-	-DQEMUD_PID_FILE="\"$(QEMUD_PID_FILE)\"" \
-	-DREMOTE_PID_FILE="\"$(REMOTE_PID_FILE)\""
-
-libvirtd_LDFLAGS =					\
-	$(WARN_CFLAGS)					\
-	$(COVERAGE_LDFLAGS)
-
-libvirtd_LDADD =					\
-	$(LIBXML_LIBS)					\
-	$(GNUTLS_LIBS)					\
-	$(SASL_LIBS)					\
-	$(POLKIT_LIBS)
-
-libvirtd_LDADD += ../src/libvirt-qemu.la
-
-if ! WITH_DRIVER_MODULES
-if WITH_QEMU
-    libvirtd_LDADD += ../src/libvirt_driver_qemu.la
-endif
-
-if WITH_LXC
-    libvirtd_LDADD += ../src/libvirt_driver_lxc.la
-endif
-
-if WITH_UML
-    libvirtd_LDADD += ../src/libvirt_driver_uml.la
-endif
-
-if WITH_ONE
-    libvirtd_LDADD += ../src/libvirt_driver_one.la
-endif
-
-if WITH_STORAGE_DIR
-    libvirtd_LDADD += ../src/libvirt_driver_storage.la
-endif
-
-if WITH_NETWORK
-    libvirtd_LDADD += ../src/libvirt_driver_network.la
-endif
-
-if WITH_NETCF
-    libvirtd_LDADD += ../src/libvirt_driver_interface.la
-endif
-
-if WITH_NODE_DEVICES
-    libvirtd_LDADD += ../src/libvirt_driver_nodedev.la
-endif
-
-if WITH_SECRETS
-    libvirtd_LDADD += ../src/libvirt_driver_secret.la
-endif
-
-if WITH_NWFILTER
-    libvirtd_LDADD += ../src/libvirt_driver_nwfilter.la
-endif
-endif
-
-libvirtd_LDADD += ../src/libvirt.la
-
-if HAVE_POLKIT
-if HAVE_POLKIT0
-policydir = $(datadir)/PolicyKit/policy
-policyfile = libvirtd.policy-0
-else
-policydir = $(datadir)/polkit-1/actions
-policyfile = libvirtd.policy-1
-endif
-endif
-
-if HAVE_AVAHI
-libvirtd_SOURCES += $(AVAHI_SOURCES)
-libvirtd_CFLAGS += $(AVAHI_CFLAGS)
-libvirtd_LDADD += $(AVAHI_LIBS)
-endif
-
-EXTRA_DIST += probes.d libvirtd.stp
-
-if WITH_DTRACE
-libvirtd_LDADD += probes.o
-nodist_libvirtd_SOURCES = probes.h
-
-BUILT_SOURCES += probes.h
-
-tapsetdir = $(datadir)/systemtap/tapsets
-tapset_DATA = libvirtd.stp
-
-probes.h: probes.d
-	$(AM_V_GEN)$(DTRACE) -o $@ -h -s $<
-
-probes.o: probes.d
-	$(AM_V_GEN)$(DTRACE) -o $@ -G -s $<
-
-CLEANFILES += probes.h probes.o
-endif
-
-install-data-local: install-init install-data-sasl install-data-polkit \
-                    install-logrotate
-	mkdir -p $(DESTDIR)$(localstatedir)/log/libvirt
-	mkdir -p $(DESTDIR)$(localstatedir)/run/libvirt
-	mkdir -p $(DESTDIR)$(localstatedir)/lib/libvirt
-
-uninstall-local:: uninstall-init uninstall-data-sasl uninstall-data-polkit
-	rmdir $(DESTDIR)$(localstatedir)/log/libvirt || :
-	rmdir $(DESTDIR)$(localstatedir)/run/libvirt || :
-	rmdir $(DESTDIR)$(localstatedir)/lib/libvirt || :
-
-if HAVE_POLKIT
-install-data-polkit:: install-init
-	mkdir -p $(DESTDIR)$(policydir)
-	$(INSTALL_DATA) $(srcdir)/$(policyfile) $(DESTDIR)$(policydir)/org.libvirt.unix.policy
-uninstall-data-polkit:: install-init
-	rm -f $(DESTDIR)$(policydir)/org.libvirt.unix.policy
-else
-install-data-polkit::
-uninstall-data-polkit::
-endif
-
-
-remote.c: \
-	remote_dispatch_prototypes.h \
-	remote_dispatch_table.h \
-	qemu_dispatch_prototypes.h \
-	qemu_dispatch_table.h
-
-remote.h: \
-	remote_dispatch_args.h \
-	remote_dispatch_ret.h \
-	qemu_dispatch_args.h \
-	qemu_dispatch_ret.h
-
-REMOTE_PROTOCOL = $(top_srcdir)/src/remote/remote_protocol.x
-QEMU_PROTOCOL = $(top_srcdir)/src/remote/qemu_protocol.x
-
-remote_dispatch_prototypes.h: $(srcdir)/remote_generate_stubs.pl $(REMOTE_PROTOCOL)
-	$(AM_V_GEN)perl -w $(srcdir)/remote_generate_stubs.pl -c -p remote $(REMOTE_PROTOCOL) > $@
-
-remote_dispatch_table.h: $(srcdir)/remote_generate_stubs.pl $(REMOTE_PROTOCOL)
-	$(AM_V_GEN)perl -w $(srcdir)/remote_generate_stubs.pl -c -t remote $(REMOTE_PROTOCOL) > $@
-
-remote_dispatch_args.h: $(srcdir)/remote_generate_stubs.pl $(REMOTE_PROTOCOL)
-	$(AM_V_GEN)perl -w $(srcdir)/remote_generate_stubs.pl -c -a remote $(REMOTE_PROTOCOL) > $@
-
-remote_dispatch_ret.h: $(srcdir)/remote_generate_stubs.pl $(REMOTE_PROTOCOL)
-	$(AM_V_GEN)perl -w $(srcdir)/remote_generate_stubs.pl -c -r remote $(REMOTE_PROTOCOL) > $@
-
-qemu_dispatch_prototypes.h: $(srcdir)/remote_generate_stubs.pl $(QEMU_PROTOCOL)
-	$(AM_V_GEN)perl -w $(srcdir)/remote_generate_stubs.pl -p qemu $(QEMU_PROTOCOL) > $@
-
-qemu_dispatch_table.h: $(srcdir)/remote_generate_stubs.pl $(QEMU_PROTOCOL)
-	$(AM_V_GEN)perl -w $(srcdir)/remote_generate_stubs.pl -t qemu $(QEMU_PROTOCOL) > $@
-
-qemu_dispatch_args.h: $(srcdir)/remote_generate_stubs.pl $(QEMU_PROTOCOL)
-	$(AM_V_GEN)perl -w $(srcdir)/remote_generate_stubs.pl -a qemu $(QEMU_PROTOCOL) > $@
-
-qemu_dispatch_ret.h: $(srcdir)/remote_generate_stubs.pl $(QEMU_PROTOCOL)
-	$(AM_V_GEN)perl -w $(srcdir)/remote_generate_stubs.pl -r qemu $(QEMU_PROTOCOL) > $@
-
-LOGROTATE_CONFS = libvirtd.qemu.logrotate libvirtd.lxc.logrotate \
-                  libvirtd.uml.logrotate
-
-BUILT_SOURCES += $(LOGROTATE_CONFS)
-
-libvirtd.qemu.logrotate: libvirtd.qemu.logrotate.in
-	sed							\
-	    -e 's![@]localstatedir[@]!$(localstatedir)!g'	\
-	    < $< > $@-t
-	mv $@-t $@
-
-libvirtd.lxc.logrotate: libvirtd.lxc.logrotate.in
-	$(AM_V_GEN)sed						\
-	    -e 's![@]localstatedir[@]!$(localstatedir)!g'	\
-	    < $< > $@-t &&					\
-	    mv $@-t $@
-
-libvirtd.uml.logrotate: libvirtd.uml.logrotate.in
-	$(AM_V_GEN)sed						\
-	    -e 's![@]localstatedir[@]!$(localstatedir)!g'	\
-	    < $< > $@-t &&					\
-	    mv $@-t $@
-
-install-logrotate: $(LOGROTATE_CONFS)
-	mkdir -p $(DESTDIR)$(localstatedir)/log/libvirt/qemu/
-	mkdir -p $(DESTDIR)$(localstatedir)/log/libvirt/lxc/
-	mkdir -p $(DESTDIR)$(localstatedir)/log/libvirt/uml/
-	mkdir -p $(DESTDIR)$(sysconfdir)/logrotate.d/
-	$(INSTALL_DATA) libvirtd.qemu.logrotate $(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd.qemu
-	$(INSTALL_DATA) libvirtd.lxc.logrotate $(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd.lxc
-	$(INSTALL_DATA) libvirtd.uml.logrotate $(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd.uml
-
-if LIBVIRT_INIT_SCRIPT_RED_HAT
-install-init: libvirtd.init
-	mkdir -p $(DESTDIR)$(sysconfdir)/rc.d/init.d
-	$(INSTALL_SCRIPT) libvirtd.init \
-	  $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirtd
-	mkdir -p $(DESTDIR)$(sysconfdir)/sysconfig
-	$(INSTALL_DATA) $(srcdir)/libvirtd.sysconf \
-	  $(DESTDIR)$(sysconfdir)/sysconfig/libvirtd
-
-uninstall-init:
-	rm -f $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirtd \
-		$(DESTDIR)$(sysconfdir)/sysconfig/libvirtd
-
-BUILT_SOURCES += libvirtd.init
-
-libvirtd.init: libvirtd.init.in $(top_builddir)/config.status
-	$(AM_V_GEN)sed					\
-	    -e s!\@localstatedir\@!@localstatedir@!g	\
-	    -e s!\@sbindir\@!@sbindir@!g		\
-	    -e s!\@sysconfdir\@!@sysconfdir@!g		\
-	    < $< > $@-t &&				\
-	    chmod a+x $@-t &&				\
-	    mv $@-t $@
-
-check-local:
-	$(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
-	  '$(AUGPARSE)' -I $(srcdir) $(srcdir)/test_libvirtd.aug; \
-	fi
-
-else
-
-install-init:
-uninstall-init:
-libvirtd.init:
-
-endif # LIBVIRT_INIT_SCRIPT_RED_HAT
-
-# This must be added last, since functions it provides/replaces
-# are used by nearly every other library.
-libvirtd_LDADD += ../gnulib/lib/libgnu.la $(LIBSOCKET)
-
-else # WITH_LIBVIRTD
-install-data-local: install-data-sasl
-uninstall-local:: uninstall-data-sasl
-endif # WITH_LIBVIRTD
-
-# This is needed for clients too, so can't wrap in
-# the WITH_LIBVIRTD conditional
-if HAVE_SASL
-install-data-sasl:
-	mkdir -p $(DESTDIR)$(sysconfdir)/sasl2/
-	$(INSTALL_DATA) $(srcdir)/libvirtd.sasl $(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf
-
-uninstall-data-sasl:
-	rm -f $(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf
-	rmdir $(DESTDIR)$(sysconfdir)/sasl2/
-else
-install-data-sasl:
-uninstall-data-sasl:
-endif
-
-
-CLEANFILES += $(BUILT_SOURCES) $(man_MANS) libvirtd.pod
-CLEANFILES += *.cov *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda

daemon/THREADING.txt

@@ -1,52 +0,0 @@
-
-     Threading in the libvirtd daemon
-     ================================
-
-To allow efficient processing of RPC requests, the libvirtd daemon
-makes use of threads.
-
- - The process leader. This is the initial thread of control
-   when the daemon starts running. It is responsible for
-   initializing all the state, and starting the event loop.
-   Once that's all done, this thread does nothing except
-   wait for the event loop to quit, thus indicating an orderly
-   shutdown is required.
-
- - The event loop. This thread runs the event loop, sitting
-   in poll() on all monitored file handles, and calculating
-   and dispatching any timers that may be registered. When
-   this thread quits, the entire daemon will shutdown.
-
- - The workers. These 'n' threads all sit around waiting to
-   process incoming RPC requests. Since RPC requests may take
-   a long time to complete, with long idle periods, there will
-   be quite a few workers running.
-
-The use of threads obviously requires locking to ensure safety when
-accessing/changing data structures.
-
- - the top level lock is on 'struct qemud_server'. This must be
-   held before acquiring any other lock
-
- - Each 'struct qemud_client' object has a lock. The server lock
-   must be held before acquiring it. Once the client lock is acquired
-   the server lock can (optionally) be dropped.
-
- - The event loop has its own self-contained lock. You can ignore
-   this as a caller of virEvent APIs.
-
-
-The server lock is used in conjunction with a condition variable
-to pass jobs from the event loop thread to the workers. The main
-event loop thread handles I/O from the client socket, and once a
-complete RPC message has been read off the wire (and optionally
-decrypted), it will be placed onto the 'dx' job queue for the
-associated client object. The job condition will be signalled and
-a worker will wakup and process it.
-
-The worker thread must quickly drop its locks on the server and
-client to allow the main event loop thread to continue running
-with its other work. Critically important, is that now libvirt
-API call will ever be made with the server or client locks held.
-
--- End

daemon/dispatch.c

@@ -1,707 +0,0 @@
-/*
- * dispatch.h: RPC message dispatching infrastructure
- *
- * Copyright (C) 2007, 2008, 2009 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
- *
- * Author: Richard W.M. Jones <rjones@redhat.com>
- * Author: Daniel P. Berrange <berrange@redhat.com>
- */
-
-#include <config.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <stdbool.h>
-
-#include "dispatch.h"
-#include "remote.h"
-
-#include "memory.h"
-
-/* Convert a libvirt  virError object into wire format */
-static void
-remoteDispatchCopyError (remote_error *rerr,
-                         virErrorPtr verr)
-{
-    rerr->code = verr->code;
-    rerr->domain = verr->domain;
-    rerr->message = verr->message ? malloc(sizeof(char*)) : NULL;
-    if (rerr->message) *rerr->message = strdup(verr->message);
-    rerr->level = verr->level;
-    rerr->str1 = verr->str1 ? malloc(sizeof(char*)) : NULL;
-    if (rerr->str1) *rerr->str1 = strdup(verr->str1);
-    rerr->str2 = verr->str2 ? malloc(sizeof(char*)) : NULL;
-    if (rerr->str2) *rerr->str2 = strdup(verr->str2);
-    rerr->str3 = verr->str3 ? malloc(sizeof(char*)) : NULL;
-    if (rerr->str3) *rerr->str3 = strdup(verr->str3);
-    rerr->int1 = verr->int1;
-    rerr->int2 = verr->int2;
-}
-
-
-/* A set of helpers for sending back errors to client
-   in various ways .... */
-
-static void
-remoteDispatchStringError (remote_error *rerr,
-                           int code, const char *msg)
-{
-    virError verr;
-
-    memset(&verr, 0, sizeof verr);
-
-    /* Construct the dummy libvirt virError. */
-    verr.code = code;
-    verr.domain = VIR_FROM_REMOTE;
-    verr.message = (char *)msg;
-    verr.level = VIR_ERR_ERROR;
-    verr.str1 = (char *)msg;
-
-    remoteDispatchCopyError(rerr, &verr);
-}
-
-
-void remoteDispatchAuthError (remote_error *rerr)
-{
-    remoteDispatchStringError (rerr, VIR_ERR_AUTH_FAILED, "authentication failed");
-}
-
-
-void remoteDispatchFormatError (remote_error *rerr,
-                                const char *fmt, ...)
-{
-    va_list args;
-    char msgbuf[1024];
-    char *msg = msgbuf;
-
-    va_start (args, fmt);
-    vsnprintf (msgbuf, sizeof msgbuf, fmt, args);
-    va_end (args);
-
-    remoteDispatchStringError (rerr, VIR_ERR_RPC, msg);
-}
-
-
-void remoteDispatchGenericError (remote_error *rerr)
-{
-    remoteDispatchStringError(rerr,
-                              VIR_ERR_INTERNAL_ERROR,
-                              "library function returned error but did not set virterror");
-}
-
-
-void remoteDispatchOOMError (remote_error *rerr)
-{
-    remoteDispatchStringError(rerr,
-                              VIR_ERR_NO_MEMORY,
-                              "out of memory");
-}
-
-
-void remoteDispatchConnError (remote_error *rerr,
-                              virConnectPtr conn)
-{
-    virErrorPtr verr;
-
-    if (conn)
-        verr = virConnGetLastError(conn);
-    else
-        verr = virGetLastError();
-    if (verr)
-        remoteDispatchCopyError(rerr, verr);
-    else
-        remoteDispatchGenericError(rerr);
-}
-
-static int
-remoteSerializeError(struct qemud_client *client,
-                     remote_error *rerr,
-                     int program,
-                     int version,
-                     int procedure,
-                     int type,
-                     int serial)
-{
-    XDR xdr;
-    unsigned int len;
-    struct qemud_client_message *msg = NULL;
-
-    DEBUG("prog=%d ver=%d proc=%d type=%d serial=%d, msg=%s",
-          program, version, procedure, type, serial,
-          rerr->message ? *rerr->message : "(none)");
-
-    if (VIR_ALLOC(msg) < 0)
-        goto fatal_error;
-
-    /* Return header. */
-    msg->hdr.prog = program;
-    msg->hdr.vers = version;
-    msg->hdr.proc = procedure;
-    msg->hdr.type = type;
-    msg->hdr.serial = serial;
-    msg->hdr.status = REMOTE_ERROR;
-
-    msg->bufferLength = sizeof(msg->buffer);
-
-    /* Serialise the return header. */
-    xdrmem_create (&xdr,
-                   msg->buffer,
-                   msg->bufferLength,
-                   XDR_ENCODE);
-
-    len = 0; /* We'll come back and write this later. */
-    if (!xdr_u_int (&xdr, &len))
-        goto xdr_error;
-
-    if (!xdr_remote_message_header (&xdr, &msg->hdr))
-        goto xdr_error;
-
-    /* Error was not set, so synthesize a generic error message. */
-    if (rerr->code == 0)
-        remoteDispatchGenericError(rerr);
-
-    if (!xdr_remote_error (&xdr, rerr))
-        goto xdr_error;
-
-    /* Write the length word. */
-    len = xdr_getpos (&xdr);
-    if (xdr_setpos (&xdr, 0) == 0)
-        goto xdr_error;
-
-    if (!xdr_u_int (&xdr, &len))
-        goto xdr_error;
-
-    xdr_destroy (&xdr);
-
-    msg->bufferLength = len;
-    msg->bufferOffset = 0;
-
-    /* Put reply on end of tx queue to send out  */
-    qemudClientMessageQueuePush(&client->tx, msg);
-    qemudUpdateClientEvent(client);
-    xdr_free((xdrproc_t)xdr_remote_error,  (char *)rerr);
-
-    return 0;
-
-xdr_error:
-    VIR_WARN("Failed to serialize remote error '%s' as XDR",
-             rerr->message ? *rerr->message : "<unknown>");
-    xdr_destroy(&xdr);
-    VIR_FREE(msg);
-fatal_error:
-    xdr_free((xdrproc_t)xdr_remote_error,  (char *)rerr);
-    return -1;
-}
-
-
-/*
- * @client: the client to send the error to
- * @rerr: the error object to send
- * @req: the message this error is in reply to
- *
- * Send an error message to the client
- *
- * Returns 0 if the error was sent, -1 upon fatal error
- */
-int
-remoteSerializeReplyError(struct qemud_client *client,
-                          remote_error *rerr,
-                          remote_message_header *req) {
-    /*
-     * For data streams, errors are sent back as data streams
-     * For method calls, errors are sent back as method replies
-     */
-    return remoteSerializeError(client,
-                                rerr,
-                                req->prog,
-                                req->vers,
-                                req->proc,
-                                req->type == REMOTE_STREAM ? REMOTE_STREAM : REMOTE_REPLY,
-                                req->serial);
-}
-
-int
-remoteSerializeStreamError(struct qemud_client *client,
-                           remote_error *rerr,
-                           int proc,
-                           int serial)
-{
-    return remoteSerializeError(client,
-                                rerr,
-                                REMOTE_PROGRAM,
-                                REMOTE_PROTOCOL_VERSION,
-                                proc,
-                                REMOTE_STREAM,
-                                serial);
-}
-
-/*
- * @msg: the complete incoming message, whose header to decode
- *
- * Decodes the header part of the client message, but does not
- * validate the decoded fields in the header. It expects
- * bufferLength to refer to length of the data packet. Upon
- * return bufferOffset will refer to the amount of the packet
- * consumed by decoding of the header.
- *
- * returns 0 if successfully decoded, -1 upon fatal error
- */
-int
-remoteDecodeClientMessageHeader (struct qemud_client_message *msg)
-{
-    XDR xdr;
-    int ret = -1;
-
-    msg->bufferOffset = REMOTE_MESSAGE_HEADER_XDR_LEN;
-
-    /* Parse the header. */
-    xdrmem_create (&xdr,
-                   msg->buffer + msg->bufferOffset,
-                   msg->bufferLength - msg->bufferOffset,
-                   XDR_DECODE);
-
-    if (!xdr_remote_message_header (&xdr, &msg->hdr))
-        goto cleanup;
-
-    msg->bufferOffset += xdr_getpos(&xdr);
-
-    ret = 0;
-
-cleanup:
-    xdr_destroy(&xdr);
-    return ret;
-}
-
-
-/*
- * @msg: the outgoing message, whose header to encode
- *
- * Encodes the header part of the client message, setting the
- * message offset ready to encode the payload. Leaves space
- * for the length field later. Upon return bufferLength will
- * refer to the total available space for message, while
- * bufferOffset will refer to current space used by header
- *
- * returns 0 if successfully encoded, -1 upon fatal error
- */
-int
-remoteEncodeClientMessageHeader (struct qemud_client_message *msg)
-{
-    XDR xdr;
-    int ret = -1;
-    unsigned int len = 0;
-
-    msg->bufferLength = sizeof(msg->buffer);
-    msg->bufferOffset = 0;
-
-    /* Format the header. */
-    xdrmem_create (&xdr,
-                   msg->buffer,
-                   msg->bufferLength,
-                   XDR_ENCODE);
-
-    /* The real value is filled in shortly */
-    if (!xdr_u_int (&xdr, &len)) {
-        goto cleanup;
-    }
-
-    if (!xdr_remote_message_header (&xdr, &msg->hdr))
-        goto cleanup;
-
-    len = xdr_getpos(&xdr);
-    xdr_setpos(&xdr, 0);
-
-    /* Fill in current length - may be re-written later
-     * if a payload is added
-     */
-    if (!xdr_u_int (&xdr, &len)) {
-        goto cleanup;
-    }
-
-    msg->bufferOffset += len;
-
-    ret = 0;
-
-cleanup:
-    xdr_destroy(&xdr);
-    return ret;
-}
-
-
-static int
-remoteDispatchClientCall (struct qemud_server *server,
-                          struct qemud_client *client,
-                          struct qemud_client_message *msg,
-                          bool qemu_protocol);
-
-
-/*
- * @server: the unlocked server object
- * @client: the locked client object
- * @msg: the complete incoming message packet, with header already decoded
- *
- * This function gets called from qemud when it pulls a incoming
- * remote protocol message off the dispatch queue for processing.
- *
- * The @msg parameter must have had its header decoded already by
- * calling remoteDecodeClientMessageHeader
- *
- * Returns 0 if the message was dispatched, -1 upon fatal error
- */
-int
-remoteDispatchClientRequest(struct qemud_server *server,
-                            struct qemud_client *client,
-                            struct qemud_client_message *msg)
-{
-    int ret;
-    remote_error rerr;
-    bool qemu_call;
-
-    DEBUG("prog=%d ver=%d type=%d status=%d serial=%d proc=%d",
-          msg->hdr.prog, msg->hdr.vers, msg->hdr.type,
-          msg->hdr.status, msg->hdr.serial, msg->hdr.proc);
-
-    memset(&rerr, 0, sizeof rerr);
-
-    /* Check version, etc. */
-    if (msg->hdr.prog == REMOTE_PROGRAM)
-        qemu_call = false;
-    else if (msg->hdr.prog == QEMU_PROGRAM)
-        qemu_call = true;
-    else {
-        remoteDispatchFormatError (&rerr,
-                                   _("program mismatch (actual %x, expected %x or %x)"),
-                                   msg->hdr.prog, REMOTE_PROGRAM, QEMU_PROGRAM);
-        goto error;
-    }
-
-    if (!qemu_call && msg->hdr.vers != REMOTE_PROTOCOL_VERSION) {
-        remoteDispatchFormatError (&rerr,
-                                   _("version mismatch (actual %x, expected %x)"),
-                                   msg->hdr.vers, REMOTE_PROTOCOL_VERSION);
-        goto error;
-    }
-    else if (qemu_call && msg->hdr.vers != QEMU_PROTOCOL_VERSION) {
-        remoteDispatchFormatError (&rerr,
-                                   _("version mismatch (actual %x, expected %x)"),
-                                   msg->hdr.vers, QEMU_PROTOCOL_VERSION);
-        goto error;
-    }
-
-    switch (msg->hdr.type) {
-    case REMOTE_CALL:
-        return remoteDispatchClientCall(server, client, msg, qemu_call);
-
-    case REMOTE_STREAM:
-        /* Since stream data is non-acked, async, we may continue to received
-         * stream packets after we closed down a stream. Just drop & ignore
-         * these.
-         */
-        VIR_INFO("Ignoring unexpected stream data serial=%d proc=%d status=%d",
-                 msg->hdr.serial, msg->hdr.proc, msg->hdr.status);
-        qemudClientMessageRelease(client, msg);
-        break;
-
-    default:
-        remoteDispatchFormatError (&rerr, _("type (%d) != REMOTE_CALL"),
-                                   (int) msg->hdr.type);
-        goto error;
-    }
-
-    return 0;
-
-error:
-    ret = remoteSerializeReplyError(client, &rerr, &msg->hdr);
-
-    if (ret >= 0)
-        VIR_FREE(msg);
-
-    return ret;
-}
-
-
-/*
- * @server: the unlocked server object
- * @client: the locked client object
- * @msg: the complete incoming method call, with header already decoded
- *
- * This method is used to dispatch an message representing an
- * incoming method call from a client. It decodes the payload
- * to obtain method call arguments, invokves the method and
- * then sends a reply packet with the return values
- *
- * Returns 0 if the reply was sent, or -1 upon fatal error
- */
-static int
-remoteDispatchClientCall (struct qemud_server *server,
-                          struct qemud_client *client,
-                          struct qemud_client_message *msg,
-                          bool qemu_protocol)
-{
-    XDR xdr;
-    remote_error rerr;
-    dispatch_args args;
-    dispatch_ret ret;
-    const dispatch_data *data = NULL;
-    int rv = -1;
-    unsigned int len;
-    virConnectPtr conn = NULL;
-
-    memset(&args, 0, sizeof args);
-    memset(&ret, 0, sizeof ret);
-    memset(&rerr, 0, sizeof rerr);
-
-    if (msg->hdr.status != REMOTE_OK) {
-        remoteDispatchFormatError (&rerr, _("status (%d) != REMOTE_OK"),
-                                   (int) msg->hdr.status);
-        goto rpc_error;
-    }
-
-    /* If client is marked as needing auth, don't allow any RPC ops,
-     * except for authentication ones
-     */
-    if (client->auth) {
-        if (msg->hdr.proc != REMOTE_PROC_AUTH_LIST &&
-            msg->hdr.proc != REMOTE_PROC_AUTH_SASL_INIT &&
-            msg->hdr.proc != REMOTE_PROC_AUTH_SASL_START &&
-            msg->hdr.proc != REMOTE_PROC_AUTH_SASL_STEP &&
-            msg->hdr.proc != REMOTE_PROC_AUTH_POLKIT
-            ) {
-            /* Explicitly *NOT* calling  remoteDispatchAuthError() because
-               we want back-compatability with libvirt clients which don't
-               support the VIR_ERR_AUTH_FAILED error code */
-            remoteDispatchFormatError (&rerr, "%s", _("authentication required"));
-            goto rpc_error;
-        }
-    }
-
-    if (qemu_protocol)
-        data = qemuGetDispatchData(msg->hdr.proc);
-    else
-        data = remoteGetDispatchData(msg->hdr.proc);
-
-    if (!data) {
-        remoteDispatchFormatError (&rerr, _("unknown procedure: %d"),
-                                   msg->hdr.proc);
-        goto rpc_error;
-    }
-
-    /* De-serialize payload with args from the wire message */
-    xdrmem_create (&xdr,
-                   msg->buffer + msg->bufferOffset,
-                   msg->bufferLength - msg->bufferOffset,
-                   XDR_DECODE);
-    if (!((data->args_filter)(&xdr, &args))) {
-        xdr_destroy (&xdr);
-        remoteDispatchFormatError (&rerr, "%s", _("parse args failed"));
-        goto rpc_error;
-    }
-    xdr_destroy (&xdr);
-
-    /* Call function. */
-    conn = client->conn;
-    virMutexUnlock(&client->lock);
-
-    /*
-     * When the RPC handler is called:
-     *
-     *  - Server object is unlocked
-     *  - Client object is unlocked
-     *
-     * Without locking, it is safe to use:
-     *
-     *   'conn', 'rerr', 'args and 'ret'
-     */
-    rv = (data->fn)(server, client, conn, &msg->hdr, &rerr, &args, &ret);
-
-    virMutexLock(&server->lock);
-    virMutexLock(&client->lock);
-    virMutexUnlock(&server->lock);
-
-    xdr_free (data->args_filter, (char*)&args);
-
-    if (rv < 0)
-        goto rpc_error;
-
-    /* Return header. We're re-using same message object, so
-     * only need to tweak type/status fields */
-    /*msg->hdr.prog = msg->hdr.prog;*/
-    /*msg->hdr.vers = msg->hdr.vers;*/
-    /*msg->hdr.proc = msg->hdr.proc;*/
-    msg->hdr.type = REMOTE_REPLY;
-    /*msg->hdr.serial = msg->hdr.serial;*/
-    msg->hdr.status = REMOTE_OK;
-
-    if (remoteEncodeClientMessageHeader(msg) < 0) {
-        xdr_free (data->ret_filter, (char*)&ret);
-        remoteDispatchFormatError(&rerr, "%s", _("failed to serialize reply header"));
-        goto xdr_hdr_error;
-    }
-
-
-    /* Now for the payload */
-    xdrmem_create (&xdr,
-                   msg->buffer,
-                   msg->bufferLength,
-                   XDR_ENCODE);
-
-    if (xdr_setpos(&xdr, msg->bufferOffset) == 0) {
-        remoteDispatchFormatError(&rerr, "%s", _("failed to change XDR reply offset"));
-        goto xdr_error;
-    }
-
-    /* If OK, serialise return structure, if error serialise error. */
-    /* Serialise reply data */
-    if (!((data->ret_filter) (&xdr, &ret))) {
-        remoteDispatchFormatError(&rerr, "%s", _("failed to serialize reply payload (probable message size limit)"));
-        goto xdr_error;
-    }
-
-    /* Update the length word. */
-    msg->bufferOffset += xdr_getpos (&xdr);
-    len = msg->bufferOffset;
-    if (xdr_setpos (&xdr, 0) == 0) {
-        remoteDispatchFormatError(&rerr, "%s", _("failed to change XDR reply offset"));
-        goto xdr_error;
-    }
-
-    if (!xdr_u_int (&xdr, &len)) {
-        remoteDispatchFormatError(&rerr, "%s", _("failed to update reply length header"));
-        goto xdr_error;
-    }
-
-    xdr_destroy (&xdr);
-    xdr_free (data->ret_filter, (char*)&ret);
-
-    /* Reset ready for I/O */
-    msg->bufferLength = len;
-    msg->bufferOffset = 0;
-
-    /* Put reply on end of tx queue to send out  */
-    qemudClientMessageQueuePush(&client->tx, msg);
-    qemudUpdateClientEvent(client);
-
-    return 0;
-
-xdr_error:
-    /* Bad stuff serializing reply. Try to send a little info
-     * back to client to assist in bug reporting/diagnosis */
-    xdr_free (data->ret_filter, (char*)&ret);
-    xdr_destroy (&xdr);
-    /* fallthrough */
-
-xdr_hdr_error:
-    VIR_WARN("Failed to serialize reply for program '%d' proc '%d' as XDR",
-             msg->hdr.prog, msg->hdr.proc);
-    /* fallthrough */
-
-rpc_error:
-    /* Bad stuff (de-)serializing message, but we have an
-     * RPC error message we can send back to the client */
-    rv = remoteSerializeReplyError(client, &rerr, &msg->hdr);
-
-    if (rv >= 0)
-        VIR_FREE(msg);
-
-    return rv;
-}
-
-
-int
-remoteSendStreamData(struct qemud_client *client,
-                     struct qemud_client_stream *stream,
-                     const char *data,
-                     unsigned int len)
-{
-    struct qemud_client_message *msg;
-    XDR xdr;
-
-    DEBUG("client=%p stream=%p data=%p len=%d", client, stream, data, len);
-
-    if (VIR_ALLOC(msg) < 0) {
-        return -1;
-    }
-
-    /* Return header. We're re-using same message object, so
-     * only need to tweak type/status fields */
-    msg->hdr.prog = REMOTE_PROGRAM;
-    msg->hdr.vers = REMOTE_PROTOCOL_VERSION;
-    msg->hdr.proc = stream->procedure;
-    msg->hdr.type = REMOTE_STREAM;
-    msg->hdr.serial = stream->serial;
-    /*
-     * NB
-     *   data != NULL + len > 0    => REMOTE_CONTINUE   (Sending back data)
-     *   data != NULL + len == 0   => REMOTE_CONTINUE   (Sending read EOF)
-     *   data == NULL              => REMOTE_OK         (Sending finish handshake confirmation)
-     */
-    msg->hdr.status = data ? REMOTE_CONTINUE : REMOTE_OK;
-
-    if (remoteEncodeClientMessageHeader(msg) < 0)
-        goto fatal_error;
-
-    if (data && len) {
-        if ((msg->bufferLength - msg->bufferOffset) < len)
-            goto fatal_error;
-
-        /* Now for the payload */
-        xdrmem_create (&xdr,
-                       msg->buffer,
-                       msg->bufferLength,
-                       XDR_ENCODE);
-
-        /* Skip over existing header already written */
-        if (xdr_setpos(&xdr, msg->bufferOffset) == 0)
-            goto xdr_error;
-
-        memcpy(msg->buffer + msg->bufferOffset, data, len);
-        msg->bufferOffset += len;
-
-        /* Update the length word. */
-        len = msg->bufferOffset;
-        if (xdr_setpos (&xdr, 0) == 0)
-            goto xdr_error;
-
-        if (!xdr_u_int (&xdr, &len))
-            goto xdr_error;
-
-        xdr_destroy (&xdr);
-
-        DEBUG("Total %d", msg->bufferOffset);
-    }
-    if (data)
-        msg->streamTX = 1;
-
-    /* Reset ready for I/O */
-    msg->bufferLength = msg->bufferOffset;
-    msg->bufferOffset = 0;
-
-    /* Put reply on end of tx queue to send out  */
-    qemudClientMessageQueuePush(&client->tx, msg);
-    qemudUpdateClientEvent(client);
-
-    return 0;
-
-xdr_error:
-    xdr_destroy (&xdr);
-fatal_error:
-    VIR_FREE(msg);
-    VIR_WARN("Failed to serialize stream data for proc %d as XDR",
-             stream->procedure);
-    return -1;
-}

daemon/dispatch.h

@@ -1,70 +0,0 @@
-/*
- * dispatch.h: RPC message dispatching infrastructure
- *
- * Copyright (C) 2007, 2008, 2009 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
- *
- * Author: Richard W.M. Jones <rjones@redhat.com>
- * Author: Daniel P. Berrange <berrange@redhat.com>
- */
-
-#ifndef __LIBVIRTD_DISPATCH_H__
-# define __LIBVIRTD_DISPATCH_H__
-
-
-# include "libvirtd.h"
-
-
-int
-remoteDecodeClientMessageHeader (struct qemud_client_message *req);
-int
-remoteEncodeClientMessageHeader (struct qemud_client_message *req);
-
-int
-remoteDispatchClientRequest (struct qemud_server *server,
-                             struct qemud_client *client,
-                             struct qemud_client_message *req);
-
-
-void remoteDispatchFormatError (remote_error *rerr,
-                                const char *fmt, ...)
-    ATTRIBUTE_FMT_PRINTF(2, 3);
-
-void remoteDispatchAuthError (remote_error *rerr);
-void remoteDispatchGenericError (remote_error *rerr);
-void remoteDispatchOOMError (remote_error *rerr);
-void remoteDispatchConnError (remote_error *rerr,
-                              virConnectPtr conn);
-
-
-int
-remoteSerializeReplyError(struct qemud_client *client,
-                          remote_error *rerr,
-                          remote_message_header *req);
-int
-remoteSerializeStreamError(struct qemud_client *client,
-                           remote_error *rerr,
-                           int proc,
-                           int serial);
-
-
-int
-remoteSendStreamData(struct qemud_client *client,
-                     struct qemud_client_stream *stream,
-                     const char *data,
-                     unsigned int len);
-
-#endif /* __LIBVIRTD_DISPATCH_H__ */

daemon/event.c

@@ -1,706 +0,0 @@
-/*
- * event.c: event loop for monitoring file handles
- *
- * Copyright (C) 2007, 2010-2011 Red Hat, Inc.
- * Copyright (C) 2007 Daniel P. Berrange
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
- */
-
-#include <config.h>
-
-#include <stdlib.h>
-#include <string.h>
-#include <poll.h>
-#include <sys/time.h>
-#include <errno.h>
-#include <unistd.h>
-
-#include "threads.h"
-#include "logging.h"
-#include "event.h"
-#include "memory.h"
-#include "util.h"
-#include "ignore-value.h"
-
-#define EVENT_DEBUG(fmt, ...) DEBUG(fmt, __VA_ARGS__)
-
-static int virEventInterruptLocked(void);
-
-/* State for a single file handle being monitored */
-struct virEventHandle {
-    int watch;
-    int fd;
-    int events;
-    virEventHandleCallback cb;
-    virFreeCallback ff;
-    void *opaque;
-    int deleted;
-};
-
-/* State for a single timer being generated */
-struct virEventTimeout {
-    int timer;
-    int frequency;
-    unsigned long long expiresAt;
-    virEventTimeoutCallback cb;
-    virFreeCallback ff;
-    void *opaque;
-    int deleted;
-};
-
-/* Allocate extra slots for virEventHandle/virEventTimeout
-   records in this multiple */
-#define EVENT_ALLOC_EXTENT 10
-
-/* State for the main event loop */
-struct virEventLoop {
-    virMutex lock;
-    int running;
-    virThread leader;
-    int wakeupfd[2];
-    size_t handlesCount;
-    size_t handlesAlloc;
-    struct virEventHandle *handles;
-    size_t timeoutsCount;
-    size_t timeoutsAlloc;
-    struct virEventTimeout *timeouts;
-};
-
-/* Only have one event loop */
-static struct virEventLoop eventLoop;
-
-/* Unique ID for the next FD watch to be registered */
-static int nextWatch = 1;
-
-/* Unique ID for the next timer to be registered */
-static int nextTimer = 1;
-
-/*
- * Register a callback for monitoring file handle events.
- * NB, it *must* be safe to call this from within a callback
- * For this reason we only ever append to existing list.
- */
-int virEventAddHandleImpl(int fd, int events,
-                          virEventHandleCallback cb,
-                          void *opaque,
-                          virFreeCallback ff) {
-    int watch;
-    EVENT_DEBUG("Add handle fd=%d events=%d cb=%p opaque=%p", fd, events, cb, opaque);
-    virMutexLock(&eventLoop.lock);
-    if (eventLoop.handlesCount == eventLoop.handlesAlloc) {
-        EVENT_DEBUG("Used %zu handle slots, adding at least %d more",
-                    eventLoop.handlesAlloc, EVENT_ALLOC_EXTENT);
-        if (VIR_RESIZE_N(eventLoop.handles, eventLoop.handlesAlloc,
-                         eventLoop.handlesCount, EVENT_ALLOC_EXTENT) < 0) {
-            virMutexUnlock(&eventLoop.lock);
-            return -1;
-        }
-    }
-
-    watch = nextWatch++;
-
-    eventLoop.handles[eventLoop.handlesCount].watch = watch;
-    eventLoop.handles[eventLoop.handlesCount].fd = fd;
-    eventLoop.handles[eventLoop.handlesCount].events =
-                                         virEventHandleTypeToPollEvent(events);
-    eventLoop.handles[eventLoop.handlesCount].cb = cb;
-    eventLoop.handles[eventLoop.handlesCount].ff = ff;
-    eventLoop.handles[eventLoop.handlesCount].opaque = opaque;
-    eventLoop.handles[eventLoop.handlesCount].deleted = 0;
-
-    eventLoop.handlesCount++;
-
-    virEventInterruptLocked();
-    virMutexUnlock(&eventLoop.lock);
-
-    return watch;
-}
-
-void virEventUpdateHandleImpl(int watch, int events) {
-    int i;
-    EVENT_DEBUG("Update handle w=%d e=%d", watch, events);
-
-    if (watch <= 0) {
-        VIR_WARN("Ignoring invalid update watch %d", watch);
-        return;
-    }
-
-    virMutexLock(&eventLoop.lock);
-    for (i = 0 ; i < eventLoop.handlesCount ; i++) {
-        if (eventLoop.handles[i].watch == watch) {
-            eventLoop.handles[i].events =
-                    virEventHandleTypeToPollEvent(events);
-            virEventInterruptLocked();
-            break;
-        }
-    }
-    virMutexUnlock(&eventLoop.lock);
-}
-
-/*
- * Unregister a callback from a file handle
- * NB, it *must* be safe to call this from within a callback
- * For this reason we only ever set a flag in the existing list.
- * Actual deletion will be done out-of-band
- */
-int virEventRemoveHandleImpl(int watch) {
-    int i;
-    EVENT_DEBUG("Remove handle w=%d", watch);
-
-    if (watch <= 0) {
-        VIR_WARN("Ignoring invalid remove watch %d", watch);
-        return -1;
-    }
-
-    virMutexLock(&eventLoop.lock);
-    for (i = 0 ; i < eventLoop.handlesCount ; i++) {
-        if (eventLoop.handles[i].deleted)
-            continue;
-
-        if (eventLoop.handles[i].watch == watch) {
-            EVENT_DEBUG("mark delete %d %d", i, eventLoop.handles[i].fd);
-            eventLoop.handles[i].deleted = 1;
-            virEventInterruptLocked();
-            virMutexUnlock(&eventLoop.lock);
-            return 0;
-        }
-    }
-    virMutexUnlock(&eventLoop.lock);
-    return -1;
-}
-
-
-/*
- * Register a callback for a timer event
- * NB, it *must* be safe to call this from within a callback
- * For this reason we only ever append to existing list.
- */
-int virEventAddTimeoutImpl(int frequency,
-                           virEventTimeoutCallback cb,
-                           void *opaque,
-                           virFreeCallback ff) {
-    struct timeval now;
-    int ret;
-    EVENT_DEBUG("Adding timer %d with %d ms freq", nextTimer, frequency);
-    if (gettimeofday(&now, NULL) < 0) {
-        return -1;
-    }
-
-    virMutexLock(&eventLoop.lock);
-    if (eventLoop.timeoutsCount == eventLoop.timeoutsAlloc) {
-        EVENT_DEBUG("Used %zu timeout slots, adding at least %d more",
-                    eventLoop.timeoutsAlloc, EVENT_ALLOC_EXTENT);
-        if (VIR_RESIZE_N(eventLoop.timeouts, eventLoop.timeoutsAlloc,
-                         eventLoop.timeoutsCount, EVENT_ALLOC_EXTENT) < 0) {
-            virMutexUnlock(&eventLoop.lock);
-            return -1;
-        }
-    }
-
-    eventLoop.timeouts[eventLoop.timeoutsCount].timer = nextTimer++;
-    eventLoop.timeouts[eventLoop.timeoutsCount].frequency = frequency;
-    eventLoop.timeouts[eventLoop.timeoutsCount].cb = cb;
-    eventLoop.timeouts[eventLoop.timeoutsCount].ff = ff;
-    eventLoop.timeouts[eventLoop.timeoutsCount].opaque = opaque;
-    eventLoop.timeouts[eventLoop.timeoutsCount].deleted = 0;
-    eventLoop.timeouts[eventLoop.timeoutsCount].expiresAt =
-        frequency >= 0 ? frequency +
-        (((unsigned long long)now.tv_sec)*1000) +
-        (((unsigned long long)now.tv_usec)/1000) : 0;
-
-    eventLoop.timeoutsCount++;
-    ret = nextTimer-1;
-    virEventInterruptLocked();
-    virMutexUnlock(&eventLoop.lock);
-    return ret;
-}
-
-void virEventUpdateTimeoutImpl(int timer, int frequency) {
-    struct timeval tv;
-    int i;
-    EVENT_DEBUG("Updating timer %d timeout with %d ms freq", timer, frequency);
-
-    if (timer <= 0) {
-        VIR_WARN("Ignoring invalid update timer %d", timer);
-        return;
-    }
-
-    if (gettimeofday(&tv, NULL) < 0) {
-        return;
-    }
-
-    virMutexLock(&eventLoop.lock);
-    for (i = 0 ; i < eventLoop.timeoutsCount ; i++) {
-        if (eventLoop.timeouts[i].timer == timer) {
-            eventLoop.timeouts[i].frequency = frequency;
-            eventLoop.timeouts[i].expiresAt =
-                frequency >= 0 ? frequency +
-                (((unsigned long long)tv.tv_sec)*1000) +
-                (((unsigned long long)tv.tv_usec)/1000) : 0;
-            virEventInterruptLocked();
-            break;
-        }
-    }
-    virMutexUnlock(&eventLoop.lock);
-}
-
-/*
- * Unregister a callback for a timer
- * NB, it *must* be safe to call this from within a callback
- * For this reason we only ever set a flag in the existing list.
- * Actual deletion will be done out-of-band
- */
-int virEventRemoveTimeoutImpl(int timer) {
-    int i;
-    EVENT_DEBUG("Remove timer %d", timer);
-
-    if (timer <= 0) {
-        VIR_WARN("Ignoring invalid remove timer %d", timer);
-        return -1;
-    }
-
-    virMutexLock(&eventLoop.lock);
-    for (i = 0 ; i < eventLoop.timeoutsCount ; i++) {
-        if (eventLoop.timeouts[i].deleted)
-            continue;
-
-        if (eventLoop.timeouts[i].timer == timer) {
-            eventLoop.timeouts[i].deleted = 1;
-            virEventInterruptLocked();
-            virMutexUnlock(&eventLoop.lock);
-            return 0;
-        }
-    }
-    virMutexUnlock(&eventLoop.lock);
-    return -1;
-}
-
-/* Iterates over all registered timeouts and determine which
- * will be the first to expire.
- * @timeout: filled with expiry time of soonest timer, or -1 if
- *           no timeout is pending
- * returns: 0 on success, -1 on error
- */
-static int virEventCalculateTimeout(int *timeout) {
-    unsigned long long then = 0;
-    int i;
-    EVENT_DEBUG("Calculate expiry of %zu timers", eventLoop.timeoutsCount);
-    /* Figure out if we need a timeout */
-    for (i = 0 ; i < eventLoop.timeoutsCount ; i++) {
-        if (eventLoop.timeouts[i].frequency < 0)
-            continue;
-
-        EVENT_DEBUG("Got a timeout scheduled for %llu", eventLoop.timeouts[i].expiresAt);
-        if (then == 0 ||
-            eventLoop.timeouts[i].expiresAt < then)
-            then = eventLoop.timeouts[i].expiresAt;
-    }
-
-    /* Calculate how long we should wait for a timeout if needed */
-    if (then > 0) {
-        struct timeval tv;
-
-        if (gettimeofday(&tv, NULL) < 0) {
-            return -1;
-        }
-
-        *timeout = then -
-            ((((unsigned long long)tv.tv_sec)*1000) +
-             (((unsigned long long)tv.tv_usec)/1000));
-
-        if (*timeout < 0)
-            *timeout = 0;
-    } else {
-        *timeout = -1;
-    }
-
-    EVENT_DEBUG("Timeout at %llu due in %d ms", then, *timeout);
-
-    return 0;
-}
-
-/*
- * Allocate a pollfd array containing data for all registered
- * file handles. The caller must free the returned data struct
- * returns: the pollfd array, or NULL on error
- */
-static struct pollfd *virEventMakePollFDs(int *nfds) {
-    struct pollfd *fds;
-    int i;
-
-    *nfds = 0;
-    for (i = 0 ; i < eventLoop.handlesCount ; i++) {
-        if (eventLoop.handles[i].events)
-            (*nfds)++;
-    }
-
-    /* Setup the poll file handle data structs */
-    if (VIR_ALLOC_N(fds, *nfds) < 0)
-        return NULL;
-
-    *nfds = 0;
-    for (i = 0 ; i < eventLoop.handlesCount ; i++) {
-        EVENT_DEBUG("Prepare n=%d w=%d, f=%d e=%d", i,
-                    eventLoop.handles[i].watch,
-                    eventLoop.handles[i].fd,
-                    eventLoop.handles[i].events);
-        if (!eventLoop.handles[i].events)
-            continue;
-        fds[*nfds].fd = eventLoop.handles[i].fd;
-        fds[*nfds].events = eventLoop.handles[i].events;
-        fds[*nfds].revents = 0;
-        (*nfds)++;
-        //EVENT_DEBUG("Wait for %d %d", eventLoop.handles[i].fd, eventLoop.handles[i].events);
-    }
-
-    return fds;
-}
-
-
-/*
- * Iterate over all timers and determine if any have expired.
- * Invoke the user supplied callback for each timer whose
- * expiry time is met, and schedule the next timeout. Does
- * not try to 'catch up' on time if the actual expiry time
- * was later than the requested time.
- *
- * This method must cope with new timers being registered
- * by a callback, and must skip any timers marked as deleted.
- *
- * Returns 0 upon success, -1 if an error occurred
- */
-static int virEventDispatchTimeouts(void) {
-    struct timeval tv;
-    unsigned long long now;
-    int i;
-    /* Save this now - it may be changed during dispatch */
-    int ntimeouts = eventLoop.timeoutsCount;
-    DEBUG("Dispatch %d", ntimeouts);
-
-    if (gettimeofday(&tv, NULL) < 0) {
-        return -1;
-    }
-    now = (((unsigned long long)tv.tv_sec)*1000) +
-        (((unsigned long long)tv.tv_usec)/1000);
-
-    for (i = 0 ; i < ntimeouts ; i++) {
-        if (eventLoop.timeouts[i].deleted || eventLoop.timeouts[i].frequency < 0)
-            continue;
-
-        /* Add 20ms fuzz so we don't pointlessly spin doing
-         * <10ms sleeps, particularly on kernels with low HZ
-         * it is fine that a timer expires 20ms earlier than
-         * requested
-         */
-        if (eventLoop.timeouts[i].expiresAt <= (now+20)) {
-            virEventTimeoutCallback cb = eventLoop.timeouts[i].cb;
-            int timer = eventLoop.timeouts[i].timer;
-            void *opaque = eventLoop.timeouts[i].opaque;
-            eventLoop.timeouts[i].expiresAt =
-                now + eventLoop.timeouts[i].frequency;
-
-            virMutexUnlock(&eventLoop.lock);
-            (cb)(timer, opaque);
-            virMutexLock(&eventLoop.lock);
-        }
-    }
-    return 0;
-}
-
-
-/* Iterate over all file handles and dispatch any which
- * have pending events listed in the poll() data. Invoke
- * the user supplied callback for each handle which has
- * pending events
- *
- * This method must cope with new handles being registered
- * by a callback, and must skip any handles marked as deleted.
- *
- * Returns 0 upon success, -1 if an error occurred
- */
-static int virEventDispatchHandles(int nfds, struct pollfd *fds) {
-    int i, n;
-    DEBUG("Dispatch %d", nfds);
-
-    /* NB, use nfds not eventLoop.handlesCount, because new
-     * fds might be added on end of list, and they're not
-     * in the fds array we've got */
-    for (i = 0, n = 0 ; n < nfds && i < eventLoop.handlesCount ; n++) {
-        while ((eventLoop.handles[i].fd != fds[n].fd ||
-                eventLoop.handles[i].events == 0) &&
-               i < eventLoop.handlesCount) {
-            i++;
-        }
-        if (i == eventLoop.handlesCount)
-            break;
-
-        DEBUG("i=%d w=%d", i, eventLoop.handles[i].watch);
-        if (eventLoop.handles[i].deleted) {
-            EVENT_DEBUG("Skip deleted n=%d w=%d f=%d", i,
-                        eventLoop.handles[i].watch, eventLoop.handles[i].fd);
-            continue;
-        }
-
-        if (fds[n].revents) {
-            virEventHandleCallback cb = eventLoop.handles[i].cb;
-            int watch = eventLoop.handles[i].watch;
-            void *opaque = eventLoop.handles[i].opaque;
-            int hEvents = virPollEventToEventHandleType(fds[n].revents);
-            EVENT_DEBUG("Dispatch n=%d f=%d w=%d e=%d %p", i,
-                        fds[n].fd, watch, fds[n].revents, opaque);
-            virMutexUnlock(&eventLoop.lock);
-            (cb)(watch, fds[n].fd, hEvents, opaque);
-            virMutexLock(&eventLoop.lock);
-        }
-    }
-
-    return 0;
-}
-
-
-/* Used post dispatch to actually remove any timers that
- * were previously marked as deleted. This asynchronous
- * cleanup is needed to make dispatch re-entrant safe.
- */
-static int virEventCleanupTimeouts(void) {
-    int i;
-    size_t gap;
-    DEBUG("Cleanup %zu", eventLoop.timeoutsCount);
-
-    /* Remove deleted entries, shuffling down remaining
-     * entries as needed to form contiguous series
-     */
-    for (i = 0 ; i < eventLoop.timeoutsCount ; ) {
-        if (!eventLoop.timeouts[i].deleted) {
-            i++;
-            continue;
-        }
-
-        EVENT_DEBUG("Purging timeout %d with id %d", i,
-                    eventLoop.timeouts[i].timer);
-        if (eventLoop.timeouts[i].ff)
-            (eventLoop.timeouts[i].ff)(eventLoop.timeouts[i].opaque);
-
-        if ((i+1) < eventLoop.timeoutsCount) {
-            memmove(eventLoop.timeouts+i,
-                    eventLoop.timeouts+i+1,
-                    sizeof(struct virEventTimeout)*(eventLoop.timeoutsCount
-                                                    -(i+1)));
-        }
-        eventLoop.timeoutsCount--;
-    }
-
-    /* Release some memory if we've got a big chunk free */
-    gap = eventLoop.timeoutsAlloc - eventLoop.timeoutsCount;
-    if (eventLoop.timeoutsCount == 0 ||
-        (gap > eventLoop.timeoutsCount && gap > EVENT_ALLOC_EXTENT)) {
-        EVENT_DEBUG("Found %zu out of %zu timeout slots used, releasing %zu",
-                    eventLoop.timeoutsCount, eventLoop.timeoutsAlloc, gap);
-        VIR_SHRINK_N(eventLoop.timeouts, eventLoop.timeoutsAlloc, gap);
-    }
-    return 0;
-}
-
-/* Used post dispatch to actually remove any handles that
- * were previously marked as deleted. This asynchronous
- * cleanup is needed to make dispatch re-entrant safe.
- */
-static int virEventCleanupHandles(void) {
-    int i;
-    size_t gap;
-    DEBUG("Cleanup %zu", eventLoop.handlesCount);
-
-    /* Remove deleted entries, shuffling down remaining
-     * entries as needed to form contiguous series
-     */
-    for (i = 0 ; i < eventLoop.handlesCount ; ) {
-        if (!eventLoop.handles[i].deleted) {
-            i++;
-            continue;
-        }
-
-        if (eventLoop.handles[i].ff)
-            (eventLoop.handles[i].ff)(eventLoop.handles[i].opaque);
-
-        if ((i+1) < eventLoop.handlesCount) {
-            memmove(eventLoop.handles+i,
-                    eventLoop.handles+i+1,
-                    sizeof(struct virEventHandle)*(eventLoop.handlesCount
-                                                   -(i+1)));
-        }
-        eventLoop.handlesCount--;
-    }
-
-    /* Release some memory if we've got a big chunk free */
-    gap = eventLoop.handlesAlloc - eventLoop.handlesCount;
-    if (eventLoop.handlesCount == 0 ||
-        (gap > eventLoop.handlesCount && gap > EVENT_ALLOC_EXTENT)) {
-        EVENT_DEBUG("Found %zu out of %zu handles slots used, releasing %zu",
-                    eventLoop.handlesCount, eventLoop.handlesAlloc, gap);
-        VIR_SHRINK_N(eventLoop.handles, eventLoop.handlesAlloc, gap);
-    }
-    return 0;
-}
-
-/*
- * Run a single iteration of the event loop, blocking until
- * at least one file handle has an event, or a timer expires
- */
-int virEventRunOnce(void) {
-    struct pollfd *fds = NULL;
-    int ret, timeout, nfds;
-
-    virMutexLock(&eventLoop.lock);
-    eventLoop.running = 1;
-    virThreadSelf(&eventLoop.leader);
-
-    if (virEventCleanupTimeouts() < 0 ||
-        virEventCleanupHandles() < 0)
-        goto error;
-
-    if (!(fds = virEventMakePollFDs(&nfds)) ||
-        virEventCalculateTimeout(&timeout) < 0)
-        goto error;
-
-    virMutexUnlock(&eventLoop.lock);
-
- retry:
-    EVENT_DEBUG("Poll on %d handles %p timeout %d", nfds, fds, timeout);
-    ret = poll(fds, nfds, timeout);
-    if (ret < 0) {
-        EVENT_DEBUG("Poll got error event %d", errno);
-        if (errno == EINTR) {
-            goto retry;
-        }
-        goto error_unlocked;
-    }
-    EVENT_DEBUG("Poll got %d event(s)", ret);
-
-    virMutexLock(&eventLoop.lock);
-    if (virEventDispatchTimeouts() < 0)
-        goto error;
-
-    if (ret > 0 &&
-        virEventDispatchHandles(nfds, fds) < 0)
-        goto error;
-
-    if (virEventCleanupTimeouts() < 0 ||
-        virEventCleanupHandles() < 0)
-        goto error;
-
-    eventLoop.running = 0;
-    virMutexUnlock(&eventLoop.lock);
-    VIR_FREE(fds);
-    return 0;
-
-error:
-    virMutexUnlock(&eventLoop.lock);
-error_unlocked:
-    VIR_FREE(fds);
-    return -1;
-}
-
-
-static void virEventHandleWakeup(int watch ATTRIBUTE_UNUSED,
-                                 int fd,
-                                 int events ATTRIBUTE_UNUSED,
-                                 void *opaque ATTRIBUTE_UNUSED)
-{
-    char c;
-    virMutexLock(&eventLoop.lock);
-    ignore_value(saferead(fd, &c, sizeof(c)));
-    virMutexUnlock(&eventLoop.lock);
-}
-
-int virEventInit(void)
-{
-    if (virMutexInit(&eventLoop.lock) < 0)
-        return -1;
-
-    if (pipe(eventLoop.wakeupfd) < 0 ||
-        virSetNonBlock(eventLoop.wakeupfd[0]) < 0 ||
-        virSetNonBlock(eventLoop.wakeupfd[1]) < 0 ||
-        virSetCloseExec(eventLoop.wakeupfd[0]) < 0 ||
-        virSetCloseExec(eventLoop.wakeupfd[1]) < 0)
-        return -1;
-
-    if (virEventAddHandleImpl(eventLoop.wakeupfd[0],
-                              VIR_EVENT_HANDLE_READABLE,
-                              virEventHandleWakeup, NULL, NULL) < 0)
-        return -1;
-
-    return 0;
-}
-
-static int virEventInterruptLocked(void)
-{
-    char c = '\0';
-
-    if (!eventLoop.running ||
-        virThreadIsSelf(&eventLoop.leader)) {
-        VIR_DEBUG("Skip interrupt, %d %d", eventLoop.running,
-                  virThreadID(&eventLoop.leader));
-        return 0;
-    }
-
-    VIR_DEBUG0("Interrupting");
-    if (safewrite(eventLoop.wakeupfd[1], &c, sizeof(c)) != sizeof(c))
-        return -1;
-    return 0;
-}
-
-int virEventInterrupt(void)
-{
-    int ret;
-    virMutexLock(&eventLoop.lock);
-    ret = virEventInterruptLocked();
-    virMutexUnlock(&eventLoop.lock);
-    return ret;
-}
-
-int
-virEventHandleTypeToPollEvent(int events)
-{
-    int ret = 0;
-    if(events & VIR_EVENT_HANDLE_READABLE)
-        ret |= POLLIN;
-    if(events & VIR_EVENT_HANDLE_WRITABLE)
-        ret |= POLLOUT;
-    if(events & VIR_EVENT_HANDLE_ERROR)
-        ret |= POLLERR;
-    if(events & VIR_EVENT_HANDLE_HANGUP)
-        ret |= POLLHUP;
-    return ret;
-}
-
-int
-virPollEventToEventHandleType(int events)
-{
-    int ret = 0;
-    if(events & POLLIN)
-        ret |= VIR_EVENT_HANDLE_READABLE;
-    if(events & POLLOUT)
-        ret |= VIR_EVENT_HANDLE_WRITABLE;
-    if(events & POLLERR)
-        ret |= VIR_EVENT_HANDLE_ERROR;
-    if(events & POLLNVAL) /* Treat NVAL as error, since libvirt doesn't distinguish */
-        ret |= VIR_EVENT_HANDLE_ERROR;
-    if(events & POLLHUP)
-        ret |= VIR_EVENT_HANDLE_HANGUP;
-    return ret;
-}

daemon/event.h

@@ -1,134 +0,0 @@
-/*
- * event.h: event loop for monitoring file handles
- *
- * Copyright (C) 2007 Daniel P. Berrange
- * Copyright (C) 2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
- */
-
-#ifndef __VIRTD_EVENT_H__
-# define __VIRTD_EVENT_H__
-
-# include "internal.h"
-
-/**
- * virEventAddHandleImpl: register a callback for monitoring file handle events
- *
- * @fd: file handle to monitor for events
- * @events: bitset of events to watch from POLLnnn constants
- * @cb: callback to invoke when an event occurs
- * @opaque: user data to pass to callback
- *
- * returns -1 if the file handle cannot be registered, 0 upon success
- */
-int virEventAddHandleImpl(int fd, int events,
-                          virEventHandleCallback cb,
-                          void *opaque,
-                          virFreeCallback ff);
-
-/**
- * virEventUpdateHandleImpl: change event set for a monitored file handle
- *
- * @watch: watch whose handle to update
- * @events: bitset of events to watch from POLLnnn constants
- *
- * Will not fail if fd exists
- */
-void virEventUpdateHandleImpl(int watch, int events);
-
-/**
- * virEventRemoveHandleImpl: unregister a callback from a file handle
- *
- * @watch: watch whose handle to remove
- *
- * returns -1 if the file handle was not registered, 0 upon success
- */
-int virEventRemoveHandleImpl(int watch);
-
-/**
- * virEventAddTimeoutImpl: register a callback for a timer event
- *
- * @frequency: time between events in milliseconds
- * @cb: callback to invoke when an event occurs
- * @opaque: user data to pass to callback
- *
- * Setting frequency to -1 will disable the timer. Setting the frequency
- * to zero will cause it to fire on every event loop iteration.
- *
- * returns -1 if the file handle cannot be registered, a positive
- * integer timer id upon success
- */
-int virEventAddTimeoutImpl(int frequency,
-                           virEventTimeoutCallback cb,
-                           void *opaque,
-                           virFreeCallback ff);
-
-/**
- * virEventUpdateTimeoutImpl: change frequency for a timer
- *
- * @timer: timer id to change
- * @frequency: time between events in milliseconds
- *
- * Setting frequency to -1 will disable the timer. Setting the frequency
- * to zero will cause it to fire on every event loop iteration.
- *
- * Will not fail if timer exists
- */
-void virEventUpdateTimeoutImpl(int timer, int frequency);
-
-/**
- * virEventRemoveTimeoutImpl: unregister a callback for a timer
- *
- * @timer: the timer id to remove
- *
- * returns -1 if the timer was not registered, 0 upon success
- */
-int virEventRemoveTimeoutImpl(int timer);
-
-/**
- * virEventInit: Initialize the event loop
- *
- * returns -1 if initialization failed
- */
-int virEventInit(void);
-
-/**
- * virEventRunOnce: run a single iteration of the event loop.
- *
- * Blocks the caller until at least one file handle has an
- * event or the first timer expires.
- *
- * returns -1 if the event monitoring failed
- */
-int virEventRunOnce(void);
-
-int
-virEventHandleTypeToPollEvent(int events);
-int
-virPollEventToEventHandleType(int events);
-
-
-/**
- * virEventInterrupt: wakeup any thread waiting in poll()
- *
- * return -1 if wakup failed
- */
-int virEventInterrupt(void);
-
-
-#endif /* __VIRTD_EVENT_H__ */

daemon/libvirtd.aug

@@ -1,86 +0,0 @@
-(* /etc/libvirt/libvirtd.conf *)
-
-module Libvirtd =
-   autoload xfm
-
-   let eol   = del /[ \t]*\n/ "\n"
-   let value_sep   = del /[ \t]*=[ \t]*/  " = "
-   let indent = del /[ \t]*/ ""
-
-   let array_sep  = del /,[ \t\n]*/ ", "
-   let array_start = del /\[[ \t\n]*/ "[ "
-   let array_end = del /\]/ "]"
-
-   let str_val = del /\"/ "\"" . store /[^\"]*/ . del /\"/ "\""
-   let bool_val = store /0|1/
-   let int_val = store /[0-9]+/
-   let str_array_element = [ seq "el" . str_val ] . del /[ \t\n]*/ ""
-   let str_array_val = counter "el" . array_start . ( str_array_element . ( array_sep . str_array_element ) * ) ? . array_end
-
-   let str_entry       (kw:string) = [ key kw . value_sep . str_val ]
-   let bool_entry      (kw:string) = [ key kw . value_sep . bool_val ]
-   let int_entry      (kw:string) = [ key kw . value_sep . int_val ]
-   let str_array_entry (kw:string) = [ key kw . value_sep . str_array_val ]
-
-
-   (* Config entry grouped by function - same order as example config *)
-   let network_entry = bool_entry "listen_tls"
-                     | bool_entry "listen_tcp"
-                     | str_entry "tls_port"
-                     | str_entry "tcp_port"
-                     | str_entry "listen_addr"
-                     | bool_entry "mdns_adv"
-                     | str_entry "mdns_name"
-
-   let sock_acl_entry = str_entry "unix_sock_group"
-                      | str_entry "unix_sock_ro_perms"
-                      | str_entry "unix_sock_rw_perms"
-                      | str_entry "unix_sock_dir"
-
-   let authentication_entry = str_entry "auth_unix_ro"
-                            | str_entry "auth_unix_rw"
-                            | str_entry "auth_tcp"
-                            | str_entry "auth_tls"
-
-   let certificate_entry = str_entry "key_file"
-                         | str_entry "cert_file"
-                         | str_entry "ca_file"
-                         | str_entry "crl_file"
-
-   let authorization_entry = bool_entry "tls_no_verify_certificate"
-                           | str_array_entry "tls_allowed_dn_list"
-                           | str_array_entry "sasl_allowed_username_list"
-
-   let processing_entry = int_entry "min_workers"
-                        | int_entry "max_workers"
-                        | int_entry "max_clients"
-                        | int_entry "max_requests"
-                        | int_entry "max_client_requests"
-
-   let logging_entry = int_entry "log_level"
-                     | str_entry "log_filters"
-                     | str_entry "log_outputs"
-
-   let auditing_entry = int_entry "audit_level"
-                      | bool_entry "audit_logging"
-
-   (* Each enty in the config is one of the following three ... *)
-   let entry = network_entry
-             | sock_acl_entry
-             | authentication_entry
-             | certificate_entry
-             | authorization_entry
-             | processing_entry
-             | logging_entry
-             | auditing_entry
-   let comment = [ label "#comment" . del /#[ \t]*/ "# " .  store /([^ \t\n][^\n]*)?/ . del /\n/ "\n" ]
-   let empty = [ label "#empty" . eol ]
-
-   let record = indent . entry . eol
-
-   let lns = ( record | comment | empty ) *
-
-   let filter = incl "/etc/libvirt/libvirtd.conf"
-              . Util.stdexcl
-
-   let xfm = transform lns filter

daemon/libvirtd.conf

@@ -1,346 +0,0 @@
-# Master libvirt daemon configuration file
-#
-# For further information consult http://libvirt.org/format.html
-#
-# NOTE: the tests/daemon-conf regression test script requires
-# that each "PARAMETER = VALUE" line in this file have the parameter
-# name just after a leading "#".
-
-#################################################################
-#
-# Network connectivity controls
-#
-
-# Flag listening for secure TLS connections on the public TCP/IP port.
-# NB, must pass the --listen flag to the libvirtd process for this to
-# have any effect.
-#
-# It is necessary to setup a CA and issue server certificates before
-# using this capability.
-#
-# This is enabled by default, uncomment this to disable it
-#listen_tls = 0
-
-# Listen for unencrypted TCP connections on the public TCP/IP port.
-# NB, must pass the --listen flag to the libvirtd process for this to
-# have any effect.
-#
-# Using the TCP socket requires SASL authentication by default. Only
-# SASL mechanisms which support data encryption are allowed. This is
-# DIGEST_MD5 and GSSAPI (Kerberos5)
-#
-# This is disabled by default, uncomment this to enable it.
-#listen_tcp = 1
-
-
-
-# Override the port for accepting secure TLS connections
-# This can be a port number, or service name
-#
-#tls_port = "16514"
-
-# Override the port for accepting insecure TCP connections
-# This can be a port number, or service name
-#
-#tcp_port = "16509"
-
-
-# Override the default configuration which binds to all network
-# interfaces. This can be a numeric IPv4/6 address, or hostname
-#
-#listen_addr = "192.168.0.1"
-
-
-# Flag toggling mDNS advertizement of the libvirt service.
-#
-# Alternatively can disable for all services on a host by
-# stopping the Avahi daemon
-#
-# This is enabled by default, uncomment this to disable it
-#mdns_adv = 0
-
-# Override the default mDNS advertizement name. This must be
-# unique on the immediate broadcast network.
-#
-# The default is "Virtualization Host HOSTNAME", where HOSTNAME
-# is subsituted for the short hostname of the machine (without domain)
-#
-#mdns_name = "Virtualization Host Joe Demo"
-
-
-#################################################################
-#
-# UNIX socket access controls
-#
-
-# Set the UNIX domain socket group ownership. This can be used to
-# allow a 'trusted' set of users access to management capabilities
-# without becoming root.
-#
-# This is restricted to 'root' by default.
-#unix_sock_group = "libvirt"
-
-# Set the UNIX socket permissions for the R/O socket. This is used
-# for monitoring VM status only
-#
-# Default allows any user. If setting group ownership may want to
-# restrict this to:
-#unix_sock_ro_perms = "0777"
-
-# Set the UNIX socket permissions for the R/W socket. This is used
-# for full management of VMs
-#
-# Default allows only root. If PolicyKit is enabled on the socket,
-# the default will change to allow everyone (eg, 0777)
-#
-# If not using PolicyKit and setting group ownership for access
-# control then you may want to relax this to:
-#unix_sock_rw_perms = "0770"
-
-# Set the name of the directory in which sockets will be found/created.
-#unix_sock_dir = "/var/run/libvirt"
-
-#################################################################
-#
-# Authentication.
-#
-#  - none: do not perform auth checks. If you can connect to the
-#          socket you are allowed. This is suitable if there are
-#          restrictions on connecting to the socket (eg, UNIX
-#          socket permissions), or if there is a lower layer in
-#          the network providing auth (eg, TLS/x509 certificates)
-#
-#  - sasl: use SASL infrastructure. The actual auth scheme is then
-#          controlled from /etc/sasl2/libvirt.conf. For the TCP
-#          socket only GSSAPI & DIGEST-MD5 mechanisms will be used.
-#          For non-TCP or TLS sockets,  any scheme is allowed.
-#
-#  - polkit: use PolicyKit to authenticate. This is only suitable
-#            for use on the UNIX sockets. The default policy will
-#            require a user to supply their own password to gain
-#            full read/write access (aka sudo like), while anyone
-#            is allowed read/only access.
-#
-# Set an authentication scheme for UNIX read-only sockets
-# By default socket permissions allow anyone to connect
-#
-# To restrict monitoring of domains you may wish to enable
-# an authentication mechanism here
-#auth_unix_ro = "none"
-
-# Set an authentication scheme for UNIX read-write sockets
-# By default socket permissions only allow root. If PolicyKit
-# support was compiled into libvirt, the default will be to
-# use 'polkit' auth.
-#
-# If the unix_sock_rw_perms are changed you may wish to enable
-# an authentication mechanism here
-#auth_unix_rw = "none"
-
-# Change the authentication scheme for TCP sockets.
-#
-# If you don't enable SASL, then all TCP traffic is cleartext.
-# Don't do this outside of a dev/test scenario. For real world
-# use, always enable SASL and use the GSSAPI or DIGEST-MD5
-# mechanism in /etc/sasl2/libvirt.conf
-#auth_tcp = "sasl"
-
-# Change the authentication scheme for TLS sockets.
-#
-# TLS sockets already have encryption provided by the TLS
-# layer, and limited authentication is done by certificates
-#
-# It is possible to make use of any SASL authentication
-# mechanism as well, by using 'sasl' for this option
-#auth_tls = "none"
-
-
-
-#################################################################
-#
-# TLS x509 certificate configuration
-#
-
-
-# Override the default server key file path
-#
-#key_file = "/etc/pki/libvirt/private/serverkey.pem"
-
-# Override the default server certificate file path
-#
-#cert_file = "/etc/pki/libvirt/servercert.pem"
-
-# Override the default CA certificate path
-#
-#ca_file = "/etc/pki/CA/cacert.pem"
-
-# Specify a certificate revocation list.
-#
-# Defaults to not using a CRL, uncomment to enable it
-#crl_file = "/etc/pki/CA/crl.pem"
-
-
-
-#################################################################
-#
-# Authorization controls
-#
-
-
-# Flag to disable verification of client certificates
-#
-# Client certificate verification is the primary authentication mechanism.
-# Any client which does not present a certificate signed by the CA
-# will be rejected.
-#
-# Default is to always verify. Uncommenting this will disable
-# verification - make sure an IP whitelist is set
-#tls_no_verify_certificate = 1
-
-
-# A whitelist of allowed x509  Distinguished Names
-# This list may contain wildcards such as
-#
-#    "C=GB,ST=London,L=London,O=Red Hat,CN=*"
-#
-# See the POSIX fnmatch function for the format of the wildcards.
-#
-# NB If this is an empty list, no client can connect, so comment out
-# entirely rather than using empty list to disable these checks
-#
-# By default, no DN's are checked
-#tls_allowed_dn_list = ["DN1", "DN2"]
-
-
-# A whitelist of allowed SASL usernames. The format for usernames
-# depends on the SASL authentication mechanism. Kerberos usernames
-# look like username@REALM
-#
-# This list may contain wildcards such as
-#
-#    "*@EXAMPLE.COM"
-#
-# See the POSIX fnmatch function for the format of the wildcards.
-#
-# NB If this is an empty list, no client can connect, so comment out
-# entirely rather than using empty list to disable these checks
-#
-# By default, no Username's are checked
-#sasl_allowed_username_list = ["joe@EXAMPLE.COM", "fred@EXAMPLE.COM" ]
-
-
-
-#################################################################
-#
-# Processing controls
-#
-
-# The maximum number of concurrent client connections to allow
-# over all sockets combined.
-#max_clients = 20
-
-
-# The minimum limit sets the number of workers to start up
-# initially. If the number of active clients exceeds this,
-# then more threads are spawned, upto max_workers limit.
-# Typically you'd want max_workers to equal maximum number
-# of clients allowed
-#min_workers = 5
-#max_workers = 20
-
-# Total global limit on concurrent RPC calls. Should be
-# at least as large as max_workers. Beyond this, RPC requests
-# will be read into memory and queued. This directly impact
-# memory usage, currently each request requires 256 KB of
-# memory. So by default upto 5 MB of memory is used
-#
-# XXX this isn't actually enforced yet, only the per-client
-# limit is used so far
-#max_requests = 20
-
-# Limit on concurrent requests from a single client
-# connection. To avoid one client monopolizing the server
-# this should be a small fraction of the global max_requests
-# and max_workers parameter
-#max_client_requests = 5
-
-#################################################################
-#
-# Logging controls
-#
-
-# Logging level: 4 errors, 3 warnings, 2 informations, 1 debug
-# basically 1 will log everything possible
-#log_level = 3
-
-# Logging filters:
-# A filter allows to select a different logging level for a given category
-# of logs
-# The format for a filter is:
-#    x:name
-#      where name is a match string e.g. remote or qemu
-# the x prefix is the minimal level where matching messages should be logged
-#    1: DEBUG
-#    2: INFO
-#    3: WARNING
-#    4: ERROR
-#
-# Multiple filter can be defined in a single @filters, they just need to be
-# separated by spaces.
-#
-# e.g:
-# log_filters="3:remote 4:event"
-# to only get warning or errors from the remote layer and only errors from
-# the event layer.
-
-# Logging outputs:
-# An output is one of the places to save logging informations
-# The format for an output can be:
-#    x:stderr
-#      output goes to stderr
-#    x:syslog:name
-#      use syslog for the output and use the given name as the ident
-#    x:file:file_path
-#      output to a file, with the given filepath
-# In all case the x prefix is the minimal level, acting as a filter
-#    1: DEBUG
-#    2: INFO
-#    3: WARNING
-#    4: ERROR
-#
-# Multiple output can be defined, they just need to be separated by spaces.
-# e.g.:
-# log_outputs="3:syslog:libvirtd"
-# to log all warnings and errors to syslog under the libvirtd ident
-
-
-##################################################################
-#
-# Auditing
-#
-# This setting allows usage of the auditing subsystem to be altered:
-#
-#   audit_level == 0  -> disable all auditing
-#   audit_level == 1  -> enable auditing, only if enabled on host (default)
-#   audit_level == 2  -> enable auditing, and exit if disabled on host
-#
-#audit_level = 2
-#
-# If set to 1, then audit messages will also be sent
-# via libvirt logging infrastructure. Defaults to 0
-#
-#audit_logging = 1
-
-###################################################################
-# UUID of the host:
-# Provide the UUID of the host here in case the command
-# 'dmidecode -s system-uuid' does not provide a valid uuid. In case
-# 'dmidecode' does not provide a valid UUID and none is provided here, a
-# temporary UUID will be generated.
-# Keep the format of the example UUID below. UUID must not have all digits
-# be the same.
-
-# NB This default all-zeros UUID will not work. Replace
-# it with the output of the 'uuidgen' command and then
-# uncomment this entry
-#host_uuid = "00000000-0000-0000-0000-000000000000"

daemon/libvirtd.h

@@ -1,338 +0,0 @@
-/*
- * libvirtd.h: daemon data structure definitions
- *
- * Copyright (C) 2006-2010 Red Hat, Inc.
- * Copyright (C) 2006 Daniel P. Berrange
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
- */
-
-
-#ifndef QEMUD_INTERNAL_H__
-# define QEMUD_INTERNAL_H__
-
-# include <config.h>
-
-# include <gnutls/gnutls.h>
-# include <gnutls/x509.h>
-# include "gnutls_1_0_compat.h"
-# if HAVE_SASL
-#  include <sasl/sasl.h>
-# endif
-
-# if HAVE_POLKIT0
-#  include <dbus/dbus.h>
-# endif
-
-# ifdef HAVE_SYS_SYSLIMITS_H
-#  include <sys/syslimits.h>
-# endif
-
-# include <rpc/types.h>
-# include <rpc/xdr.h>
-# include "remote_protocol.h"
-# include "qemu_protocol.h"
-# include "logging.h"
-# include "threads.h"
-# include "network.h"
-
-# if WITH_DTRACE
-#  ifndef LIBVIRTD_PROBES_H
-#   define LIBVIRTD_PROBES_H
-#   include "probes.h"
-#  endif /* LIBVIRTD_PROBES_H */
-#  define PROBE(NAME, FMT, ...)                              \
-    VIR_DEBUG_INT("trace." __FILE__ , __func__, __LINE__,    \
-                  #NAME ": " FMT, __VA_ARGS__);              \
-    if (LIBVIRTD_ ## NAME ## _ENABLED()) {                   \
-        LIBVIRTD_ ## NAME(__VA_ARGS__);                      \
-    }
-# else
-#  define PROBE(NAME, FMT, ...)                              \
-    VIR_DEBUG_INT("trace." __FILE__, __func__, __LINE__,     \
-                  #NAME ": " FMT, __VA_ARGS__);
-# endif
-
-# ifdef __GNUC__
-#  ifdef HAVE_ANSIDECL_H
-#   include <ansidecl.h>
-#  endif
-
-#  ifndef __GNUC_PREREQ
-#   if defined __GNUC__ && defined __GNUC_MINOR__
-#    define __GNUC_PREREQ(maj, min)                                        \
-    ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
-#   else
-#    define __GNUC_PREREQ(maj,min) 0
-#   endif
-#  endif
-
-/**
- * ATTRIBUTE_UNUSED:
- *
- * Macro to flag conciously unused parameters to functions
- */
-#  ifndef ATTRIBUTE_UNUSED
-#   define ATTRIBUTE_UNUSED __attribute__((__unused__))
-#  endif
-
-/**
- * ATTRIBUTE_FMT_PRINTF
- *
- * Macro used to check printf like functions, if compiling
- * with gcc.
- *
- * We use gnulib which guarentees we always have GNU style
- * printf format specifiers even on broken Win32 platforms
- * hence we have to force 'gnu_printf' for new GCC
- */
-#  ifndef ATTRIBUTE_FMT_PRINTF
-#   if __GNUC_PREREQ (4, 4)
-#    define ATTRIBUTE_FMT_PRINTF(fmtpos,argpos) __attribute__((__format__ (gnu_printf, fmtpos,argpos)))
-#   else
-#    define ATTRIBUTE_FMT_PRINTF(fmtpos,argpos) __attribute__((__format__ (printf, fmtpos,argpos)))
-#   endif
-#  endif
-
-#  ifndef ATTRIBUTE_RETURN_CHECK
-#   if __GNUC_PREREQ (3, 4)
-#    define ATTRIBUTE_RETURN_CHECK __attribute__((__warn_unused_result__))
-#   else
-#    define ATTRIBUTE_RETURN_CHECK
-#   endif
-#  endif
-
-# else
-#  ifndef ATTRIBUTE_UNUSED
-#   define ATTRIBUTE_UNUSED
-#  endif
-#  ifndef ATTRIBUTE_FMT_PRINTF
-#   define ATTRIBUTE_FMT_PRINTF(...)
-#  endif
-#  ifndef ATTRIBUTE_RETURN_CHECK
-#   define ATTRIBUTE_RETURN_CHECK
-#  endif
-# endif
-
-# define qemudDebug DEBUG
-
-/* Whether we're passing reads & writes through a sasl SSF */
-enum qemud_sasl_ssf {
-    QEMUD_SASL_SSF_NONE = 0,
-    QEMUD_SASL_SSF_READ = 1,
-    QEMUD_SASL_SSF_WRITE = 2,
-};
-
-enum qemud_sock_type {
-    QEMUD_SOCK_TYPE_UNIX = 0,
-    QEMUD_SOCK_TYPE_TCP = 1,
-    QEMUD_SOCK_TYPE_TLS = 2,
-};
-
-struct qemud_client_message {
-    char buffer [REMOTE_MESSAGE_MAX + REMOTE_MESSAGE_HEADER_XDR_LEN];
-    unsigned int bufferLength;
-    unsigned int bufferOffset;
-
-    unsigned int async : 1;
-    unsigned int streamTX : 1;
-
-    remote_message_header hdr;
-
-    struct qemud_client_message *next;
-};
-
-struct qemud_client;
-
-/* Allow for filtering of incoming messages to a custom
- * dispatch processing queue, instead of client->dx.
- */
-typedef int (*qemud_client_filter_func)(struct qemud_client *client,
-                                        struct qemud_client_message *msg, void *opaque);
-struct qemud_client_filter {
-    qemud_client_filter_func query;
-    void *opaque;
-
-    struct qemud_client_filter *next;
-};
-
-struct qemud_client_stream {
-    virStreamPtr st;
-    int procedure;
-    int serial;
-
-    unsigned int recvEOF : 1;
-    unsigned int closed : 1;
-
-    struct qemud_client_filter filter;
-
-    struct qemud_client_message *rx;
-    int tx;
-
-    struct qemud_client_stream *next;
-};
-
-/* Stores the per-client connection state */
-struct qemud_client {
-    virMutex lock;
-
-    int magic;
-
-    int fd;
-    int watch;
-    unsigned int readonly :1;
-    unsigned int closing :1;
-    int domainEventCallbackID[VIR_DOMAIN_EVENT_ID_LAST];
-
-    virSocketAddr addr;
-    const char *addrstr;
-
-    int type; /* qemud_sock_type */
-    gnutls_session_t tlssession;
-    int auth;
-    unsigned int handshake :1; /* If we're in progress for TLS handshake */
-# if HAVE_SASL
-    sasl_conn_t *saslconn;
-    int saslSSF;
-    const char *saslDecoded;
-    unsigned int saslDecodedLength;
-    unsigned int saslDecodedOffset;
-    const char *saslEncoded;
-    unsigned int saslEncodedLength;
-    unsigned int saslEncodedOffset;
-    char *saslUsername;
-# endif
-
-    /* Count of meages in 'dx' or 'tx' queue
-     * ie RPC calls in progress. Does not count
-     * async events which are not used for
-     * throttling calculations */
-    int nrequests;
-    /* Zero or one messages being received. Zero if
-     * nrequests >= max_clients and throttling */
-    struct qemud_client_message *rx;
-    /* Zero or many messages waiting for a worker
-     * to process them */
-    struct qemud_client_message *dx;
-    /* Zero or many messages waiting for transmit
-     * back to client, including async events */
-    struct qemud_client_message *tx;
-    /* Filters to capture messages that would otherwise
-     * end up on the 'dx' queue */
-    struct qemud_client_filter *filters;
-
-    /* Data streams */
-    struct qemud_client_stream *streams;
-
-
-    /* This is only valid if a remote open call has been made on this
-     * connection, otherwise it will be NULL.  Also if remote close is
-     * called, it will be set back to NULL if that succeeds.
-     */
-    virConnectPtr conn;
-    int refs;
-
-};
-
-# define QEMUD_CLIENT_MAGIC 0x7788aaee
-
-
-struct qemud_socket {
-    char *path;
-
-    virSocketAddr addr;
-    const char *addrstr;
-
-    int fd;
-    int watch;
-    int readonly;
-    int type; /* qemud_sock_type */
-    int auth;
-
-    struct qemud_socket *next;
-};
-
-struct qemud_worker {
-    pthread_t thread;
-    unsigned int hasThread :1;
-    unsigned int processingCall :1;
-    unsigned int quitRequest :1;
-
-    /* back-pointer to our server */
-    struct qemud_server *server;
-};
-
-/* Main server state */
-struct qemud_server {
-    virMutex lock;
-    virCond job;
-
-    int privileged;
-
-    size_t nworkers;
-    size_t nactiveworkers;
-    struct qemud_worker *workers;
-    size_t nsockets;
-    struct qemud_socket *sockets;
-    size_t nclients;
-    size_t nclients_max;
-    struct qemud_client **clients;
-
-    int sigread;
-    int sigwrite;
-    char *logDir;
-    pthread_t eventThread;
-    unsigned int hasEventThread :1;
-    unsigned int quitEventThread :1;
-# ifdef HAVE_AVAHI
-    struct libvirtd_mdns *mdns;
-# endif
-# if HAVE_SASL
-    char **saslUsernameWhitelist;
-# endif
-# if HAVE_POLKIT0
-    DBusConnection *sysbus;
-# endif
-};
-
-void qemudLog(int priority, const char *fmt, ...)
-    ATTRIBUTE_FMT_PRINTF(2,3);
-
-
-
-int qemudRegisterClientEvent(struct qemud_server *server,
-                             struct qemud_client *client);
-void qemudUpdateClientEvent(struct qemud_client *client);
-
-void qemudDispatchClientFailure(struct qemud_client *client);
-
-void
-qemudClientMessageQueuePush(struct qemud_client_message **queue,
-                            struct qemud_client_message *msg);
-struct qemud_client_message *
-qemudClientMessageQueueServe(struct qemud_client_message **queue);
-
-void
-qemudClientMessageRelease(struct qemud_client *client,
-                          struct qemud_client_message *msg);
-
-
-# if HAVE_POLKIT
-int qemudGetSocketIdentity(int fd, uid_t *uid, pid_t *pid);
-# endif
-
-#endif

daemon/libvirtd.init.in

@@ -1,116 +0,0 @@
-#!/bin/sh
-
-# the following is the LSB init header see
-# http://www.linux-foundation.org/spec//booksets/LSB-Core-generic/LSB-Core-generic.html#INITSCRCOMCONV
-#
-### BEGIN INIT INFO
-# Provides: libvirtd
-# Required-Start: $network messagebus
-# Should-Start: $named
-# Should-Start: xend
-# Should-Start: hal
-# Should-Start: avahi-daemon
-# Required-Stop: $network messagebus
-# Should-Stop: $named
-# Default-Start: 3 4 5
-# Short-Description: daemon for libvirt virtualization API
-# Description: This is a daemon for managing guest instances
-#              and libvirt virtual networks
-#              See http://libvirt.org
-### END INIT INFO
-
-# the following is chkconfig init header
-#
-# libvirtd:   guest and virtual network management daemon
-#
-# chkconfig: 345 97 03
-# description:  This is a daemon for managing guest instances \
-#               and libvirt virtual networks \
-#               See http://libvirt.org
-#
-# processname: libvirtd
-# pidfile: @localstatedir@/run/libvirtd.pid
-#
-
-# Source function library.
-. @sysconfdir@/rc.d/init.d/functions
-
-SERVICE=libvirtd
-PROCESS=libvirtd
-PIDFILE=@localstatedir@/run/$SERVICE.pid
-
-LIBVIRTD_CONFIG=
-LIBVIRTD_ARGS=
-KRB5_KTNAME=/etc/libvirt/krb5.tab
-
-test -f @sysconfdir@/sysconfig/libvirtd && . @sysconfdir@/sysconfig/libvirtd
-
-export QEMU_AUDIO_DRV
-export SDL_AUDIODRIVER
-
-LIBVIRTD_CONFIG_ARGS=
-if [ -n "$LIBVIRTD_CONFIG" ]
-then
-    LIBVIRTD_CONFIG_ARGS="--config $LIBVIRTD_CONFIG"
-fi
-
-RETVAL=0
-
-start() {
-    echo -n $"Starting $SERVICE daemon: "
-    mkdir -p @localstatedir@/cache/libvirt
-    rm -rf @localstatedir@/cache/libvirt/*
-    KRB5_KTNAME=$KRB5_KTNAME daemon --pidfile $PIDFILE --check $SERVICE $PROCESS --daemon $LIBVIRTD_CONFIG_ARGS $LIBVIRTD_ARGS
-    RETVAL=$?
-    echo
-    [ $RETVAL -eq 0 ] && touch @localstatedir@/lock/subsys/$SERVICE
-}
-
-stop() {
-    echo -n $"Stopping $SERVICE daemon: "
-
-    killproc -p $PIDFILE $PROCESS
-    RETVAL=$?
-    echo
-    if [ $RETVAL -eq 0 ]; then
-        rm -f @localstatedir@/lock/subsys/$SERVICE
-        rm -f $PIDFILE
-        rm -rf @localstatedir@/cache/libvirt/*
-    fi
-}
-
-restart() {
-    stop
-    start
-}
-
-reload() {
-    echo -n $"Reloading $SERVICE configuration: "
-
-    killproc -p $PIDFILE $PROCESS -HUP
-    RETVAL=$?
-    echo
-    return $RETVAL
-}
-
-# See how we were called.
-case "$1" in
-    start|stop|restart|reload)
-        $1
-        ;;
-    status)
-        status -p $PIDFILE $PROCESS
-        RETVAL=$?
-        ;;
-    force-reload)
-        reload
-        ;;
-    condrestart|try-restart)
-        [ -f @localstatedir@/lock/subsys/$SERVICE ] && restart || :
-        ;;
-    *)
-        echo $"Usage: $0 {start|stop|status|restart|condrestart|reload|force-reload|try-restart}"
-        exit 2
-        ;;
-esac
-exit $RETVAL

daemon/libvirtd.lxc.logrotate.in

@@ -1,9 +0,0 @@
-@localstatedir@/log/libvirt/lxc/*.log {
-        weekly
-        missingok
-        rotate 4
-        compress
-        delaycompress
-        copytruncate
-        minsize 100k
-}

daemon/libvirtd.pod.in

@@ -1,168 +0,0 @@
-=head1 NAME
-
-libvirtd - libvirtd management daemon
-
-=head1 SYNOPSIS
-
-B<libvirtd> [ -dlv ] [ -f config_file ] [ -p pid_file ] [ -t timeout_seconds ]
-
-B<libvirtd> --version
-
-=head1 DESCRIPTION
-
-The B<libvirtd> program is the server side daemon component of the libvirt
-virtualization management system.
-
-This daemon runs on host servers and performs required management tasks for
-virtualized guests.  This includes activities such as starting, stopping
-and migrating guests between host servers, configuring and manipulating
-networking, and managing storage for use by guests.
-
-The libvirt client libraries and utilities connect to this daemon to issue
-tasks and collect information about the configuration and resources of the host
-system and guests.
-
-By default, the libvirtd daemon listens for requests on a local Unix domain
-socket.  Using the B<-l>|B<--listen> command line option, the libvirtd daemon
-can be instructed to additionally listen on a TCP/IP socket.  The TCP/IP socket
-to use is defined in the libvirtd configuration file.
-
-Restarting libvirtd does not impact running guests.  Guests continue to operate
-and will be picked up automatically if their XML configuration has been
-defined.  Any guests whose XML configuration has not been defined will be lost
-from the configuration.
-
-=head1 OPTIONS
-
-=over
-
-=item B<-d, --daemon>
-
-Run as a daemon & write PID file.
-
-=item B<-f, --config> I<FILE>
-
-Use this configuration file, overriding the default value.
-
-=item B<-l, --listen>
-
-Listen for TCP/IP connections.
-
-=item B<-p, --pid-file> I<FILE>
-
-Use this name for the PID file, overriding the default value.
-
-=item B<-t, --timeout> I<SECONDS>
-
-Exit after timeout period (in seconds) expires.
-
-=item B<-v, --verbose>
-
-Enable output of verbose messages.
-
-=item B<    --version>
-
-Display version information then exit.
-
-=back
-
-=head1 SIGNALS
-
-On receipt of B<SIGHUP> libvirtd will reload its configuration.
-
-=head1 FILES
-
-=over
-
-=item F<@sysconfdir@/libvirtd.conf>
-
-The default configuration file used by libvirtd, unless overridden on the
-command line using the B<-f>|B<--config> option.
-
-=item F<@localstatedir@/run/libvirt/libvirt-sock>
-
-=item F<@localstatedir@/run/libvirt/libvirt-sock-ro>
-
-The sockets libvirtd will use when B<run as root>.
-
-=item F<$HOME/.libvirt/libvirt-sock>
-
-The socket libvirtd will use when run as a B<non-root> user.
-
-=item F<@sysconfdir@/pki/CA/cacert.pem>
-
-The TLS B<Certificate Authority> certificate libvirtd will use.
-
-=item F<@sysconfdir@/pki/libvirt/servercert.pem>
-
-The TLS B<Server> certificate libvirtd will use.
-
-=item F<@sysconfdir@/pki/libvirt/private/serverkey.pem>
-
-The TLS B<Server> private key libvirtd will use.
-
-=item F<@remote_pid_file@>
-
-The PID file to use, unless overridden by the B<-p>|B<--pid-file> option.
-
-=back
-
-=head1 EXAMPLES
-
-To retrieve the version of libvirtd:
-
- # libvirtd --version
- libvirtd (libvirt) 0.8.2
- #
-
-To start libvirtd, instructing it to daemonize and create a PID file:
-
- # libvirtd -d
- # ls -la @remote_pid_file@
- -rw-r--r-- 1 root root 6 Jul  9 02:40 @remote_pid_file@
- #
-
-=head1 BUGS
-
-Please report all bugs you discover.  This should be done via either:
-
-=over
-
-=item a) the mailing list
-
-L<http://libvirt.org/contact.html>
-
-=item or,
-
-B<>
-
-=item b) the bug tracker
-
-L<http://libvirt.org/bugs.html>
-
-=item Alternatively, you may report bugs to your software distributor / vendor.
-
-=back
-
-=head1 AUTHORS
-
-Please refer to the AUTHORS file distributed with libvirt.
-
-=head1 COPYRIGHT
-
-Copyright (C) 2006-2010 Red Hat, Inc., and the authors listed in the
-libvirt AUTHORS file.
-
-=head1 LICENSE
-
-libvirtd is distributed under the terms of the GNU LGPL v2.1+.
-This is free software; see the source for copying conditions. There
-is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR
-PURPOSE
-
-=head1 SEE ALSO
-
-L<virsh(1)>, L<virt-install(1)>, L<virt-xml-validate(1)>, L<virt-top(1)>,
-L<virt-df(1)>, L<http://www.libvirt.org/>
-
-=cut

daemon/libvirtd.policy-0

@@ -1,42 +0,0 @@
-<!DOCTYPE policyconfig PUBLIC
- "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd">
-
-<!--
-Policy definitions for libvirt daemon
-
-Copyright (c) 2007 Daniel P. Berrange <berrange redhat com>
-
-libvirt is licensed to you under the GNU Lesser General Public License
-version 2. See COPYING for details.
-
-NOTE: If you make changes to this file, make sure to validate the file
-using the polkit-policy-file-validate(1) tool. Changes made to this
-file are instantly applied.
--->
-
-<policyconfig>
-    <action id="org.libvirt.unix.monitor">
-      <description>Monitor local virtualized systems</description>
-      <message>System policy prevents monitoring of local virtualized systems</message>
-      <defaults>
-        <!-- Any program can use libvirt in read-only mode for monitoring,
-             even if not part of a session -->
-        <allow_any>yes</allow_any>
-        <allow_inactive>yes</allow_inactive>
-        <allow_active>yes</allow_active>
-      </defaults>
-    </action>
-
-    <action id="org.libvirt.unix.manage">
-      <description>Manage local virtualized systems</description>
-      <message>System policy prevents management of local virtualized systems</message>
-      <defaults>
-        <!-- Only a program in the active host session can use libvirt in
-             read-write mode for management, and we require user password -->
-        <allow_any>no</allow_any>
-        <allow_inactive>no</allow_inactive>
-        <allow_active>auth_admin_keep_session</allow_active>
-      </defaults>
-    </action>
-</policyconfig>

daemon/libvirtd.policy-1

@@ -1,42 +0,0 @@
-<!DOCTYPE policyconfig PUBLIC
- "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd">
-
-<!--
-Policy definitions for libvirt daemon
-
-Copyright (c) 2007 Daniel P. Berrange <berrange redhat com>
-
-libvirt is licensed to you under the GNU Lesser General Public License
-version 2. See COPYING for details.
-
-NOTE: If you make changes to this file, make sure to validate the file
-using the polkit-policy-file-validate(1) tool. Changes made to this
-file are instantly applied.
--->
-
-<policyconfig>
-    <action id="org.libvirt.unix.monitor">
-      <description>Monitor local virtualized systems</description>
-      <message>System policy prevents monitoring of local virtualized systems</message>
-      <defaults>
-        <!-- Any program can use libvirt in read-only mode for monitoring,
-             even if not part of a session -->
-        <allow_any>yes</allow_any>
-        <allow_inactive>yes</allow_inactive>
-        <allow_active>yes</allow_active>
-      </defaults>
-    </action>
-
-    <action id="org.libvirt.unix.manage">
-      <description>Manage local virtualized systems</description>
-      <message>System policy prevents management of local virtualized systems</message>
-      <defaults>
-        <!-- Only a program in the active host session can use libvirt in
-             read-write mode for management, and we require user password -->
-        <allow_any>no</allow_any>
-        <allow_inactive>no</allow_inactive>
-        <allow_active>auth_admin_keep</allow_active>
-      </defaults>
-    </action>
-</policyconfig>

daemon/libvirtd.qemu.logrotate.in

@@ -1,9 +0,0 @@
-@localstatedir@/log/libvirt/qemu/*.log {
-        weekly
-        missingok
-        rotate 4
-        compress
-        delaycompress
-        copytruncate
-        minsize 100k
-}

daemon/libvirtd.sasl

@@ -1,28 +0,0 @@
-# If you want to use the non-TLS socket, then you *must* include
-# the GSSAPI or DIGEST-MD5 mechanisms, because they are the only
-# ones that can offer session encryption as well as authentication.
-#
-# If you're only using TLS, then you can turn on any mechanisms
-# you like for authentication, because TLS provides the encryption
-#
-# Default to a simple username+password mechanism
-mech_list: digest-md5
-
-# Before you can use GSSAPI, you need a service principle on the
-# KDC server for libvirt, and that to be exported to the keytab
-# file listed below
-#mech_list: gssapi
-#
-# You can also list many mechanisms at once, then the user can choose
-# by adding  '?auth=sasl.gssapi' to their libvirt URI, eg
-#   qemu+tcp://hostname/system?auth=sasl.gssapi
-#mech_list: digest-md5 gssapi
-
-# MIT kerberos ignores this option & needs KRB5_KTNAME env var.
-# May be useful for other non-Linux OS though....
-keytab: /etc/libvirt/krb5.tab
-
-# If using digest-md5 for username/passwds, then this is the file
-# containing the passwds. Use 'saslpasswd2 -a libvirt [username]'
-# to add entries, and 'sasldblistusers2 -a libvirt' to browse it
-sasldb_path: /etc/libvirt/passwd.db

daemon/libvirtd.stp

@@ -1,65 +0,0 @@
-probe libvirt.daemon.client.connect = process("libvirtd").mark("client_connect")
-{
-  fd = $arg1;
-  readonly = $arg2;
-  localAddr = user_string($arg3);
-  remoteAddr = user_string($arg4);
-}
-
-probe libvirt.daemon.client.disconnect = process("libvirtd").mark("client_disconnect")
-{
-  fd = $arg1;
-}
-
-
-probe libvirt.daemon.client.tls_allow = process("libvirtd").mark("client_tls_allow")
-{
-  fd = $arg1;
-  x509dname = user_string($arg2);
-}
-
-probe libvirt.daemon.client.tls_deny = process("libvirtd").mark("client_tls_deny")
-{
-  fd = $arg1;
-  x509dname = user_string($arg2);
-}
-
-probe libvirt.daemon.client.tls_fail = process("libvirtd").mark("client_tls_fail")
-{
-  fd = $arg1;
-}
-
-
-function authtype_to_string(authtype) {
-  if (authtype == 0)
-    return "none"
-  if (authtype == 1)
-    return "sasl"
-  if (authtype == 2)
-    return "polkit"
-  return "unknown"
-}
-
-
-probe libvirt.daemon.client.auth_allow = process("libvirtd").mark("client_auth_allow")
-{
-  fd = $arg1;
-  authtype = $arg2;
-  authname = authtype_to_string($arg2);
-  identity = user_string($arg3);
-}
-
-probe libvirt.daemon.client.auth_deny = process("libvirtd").mark("client_auth_deny")
-{
-  fd = $arg1;
-  authtype = $arg2;
-  authname = authtype_to_string($arg2);
-  identity = user_string($arg3);
-}
-
-probe libvirt.daemon.client.auth_fail = process("libvirtd").mark("client_auth_fail")
-{
-  fd = $arg1;
-  authtype = $arg2;
-  authname = authtype_to_string($arg2);
-}

daemon/libvirtd.sysconf

@@ -1,18 +0,0 @@
-# Override the default config file
-#LIBVIRTD_CONFIG=/etc/libvirt/libvirtd.conf
-
-# Listen for TCP/IP connections
-# NB. must setup TLS/SSL keys prior to using this
-#LIBVIRTD_ARGS="--listen"
-
-# Override Kerberos service keytab for SASL/GSSAPI
-#KRB5_KTNAME=/etc/libvirt/krb5.tab
-
-# Override the QEMU/SDL default audio driver probing when
-# starting virtual machines using SDL graphics
-#
-# NB these have no effect for VMs using VNC, unless vnc_allow_host_audio
-# is enabled in /etc/libvirt/qemu.conf
-#QEMU_AUDIO_DRV=sdl
-#
-#SDL_AUDIODRIVER=pulse

daemon/libvirtd.uml.logrotate.in

@@ -1,9 +0,0 @@
-@localstatedir@/log/libvirt/uml/*.log {
-        weekly
-        missingok
-        rotate 4
-        compress
-        delaycompress
-        copytruncate
-        minsize 100k
-}

daemon/mdns.c

@@ -1,508 +0,0 @@
-/*
- * mdns.c: advertise libvirt hypervisor connections
- *
- * Copyright (C) 2007 Daniel P. Berrange
- *
- * Derived from Avahi example service provider code.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
- */
-
-#include <config.h>
-
-#include <time.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <avahi-client/client.h>
-#include <avahi-client/publish.h>
-
-#include <avahi-common/alternative.h>
-#include <avahi-common/simple-watch.h>
-#include <avahi-common/malloc.h>
-#include <avahi-common/error.h>
-#include <avahi-common/timeval.h>
-
-#include "libvirtd.h"
-#include "mdns.h"
-#include "event.h"
-#include "memory.h"
-
-#define AVAHI_DEBUG(fmt, ...) DEBUG(fmt, __VA_ARGS__)
-
-struct libvirtd_mdns_entry {
-    char *type;
-    int port;
-    struct libvirtd_mdns_entry *next;
-};
-
-struct libvirtd_mdns_group {
-    struct libvirtd_mdns *mdns;
-    AvahiEntryGroup *handle;
-    char *name;
-    struct libvirtd_mdns_entry *entry;
-    struct libvirtd_mdns_group *next;
-};
-
-struct libvirtd_mdns {
-    AvahiClient *client;
-    AvahiPoll *poller;
-    struct libvirtd_mdns_group *group;
-};
-
-/* Avahi API requires this struct names in the app :-( */
-struct AvahiWatch {
-    int watch;
-    int fd;
-    int revents;
-    AvahiWatchCallback callback;
-    void *userdata;
-};
-
-/* Avahi API requires this struct names in the app :-( */
-struct AvahiTimeout {
-    int timer;
-    AvahiTimeoutCallback callback;
-    void  *userdata;
-};
-
-
-static void libvirtd_mdns_create_services(struct libvirtd_mdns_group *group);
-
-/* Called whenever the entry group state changes */
-static void libvirtd_mdns_group_callback(AvahiEntryGroup *g ATTRIBUTE_UNUSED, AvahiEntryGroupState state, void *userdata) {
-    struct libvirtd_mdns_group *group = (struct libvirtd_mdns_group *)userdata;
-
-    switch (state) {
-    case AVAHI_ENTRY_GROUP_ESTABLISHED:
-        /* The entry group has been established successfully */
-        AVAHI_DEBUG("Group '%s' established", group->name);
-        break;
-
-    case AVAHI_ENTRY_GROUP_COLLISION:
-        {
-            char *n;
-
-            /* A service name collision happened. Let's pick a new name */
-            n = avahi_alternative_service_name(group->name);
-            VIR_FREE(group->name);
-            group->name = n;
-
-            AVAHI_DEBUG("Group name collision, renaming service to '%s'", group->name);
-
-            /* And recreate the services */
-            libvirtd_mdns_create_services(group);
-        }
-        break;
-
-    case AVAHI_ENTRY_GROUP_FAILURE :
-        AVAHI_DEBUG("Group failure: %s", avahi_strerror(avahi_client_errno(group->mdns->client)));
-
-        /* Some kind of failure happened while we were registering our services */
-        //avahi_simple_poll_quit(simple_poll);
-        break;
-
-    case AVAHI_ENTRY_GROUP_UNCOMMITED:
-    case AVAHI_ENTRY_GROUP_REGISTERING:
-        ;
-    }
-}
-
-static void libvirtd_mdns_create_services(struct libvirtd_mdns_group *group) {
-    struct libvirtd_mdns *mdns = group->mdns;
-    struct libvirtd_mdns_entry *entry;
-    int ret;
-    AVAHI_DEBUG("Adding services to '%s'", group->name);
-
-    /* If we've no services to advertise, just reset the group to make
-     * sure it is emptied of any previously advertised services */
-    if (!group->entry) {
-        if (group->handle)
-            avahi_entry_group_reset(group->handle);
-        return;
-    }
-
-    /* If this is the first time we're called, let's create a new entry group */
-    if (!group->handle) {
-        AVAHI_DEBUG("Creating initial group %s", group->name);
-        if (!(group->handle = avahi_entry_group_new(mdns->client, libvirtd_mdns_group_callback, group))) {
-            AVAHI_DEBUG("avahi_entry_group_new() failed: %s", avahi_strerror(avahi_client_errno(mdns->client)));
-            return;
-        }
-    }
-
-    entry = group->entry;
-    while (entry) {
-        if ((ret = avahi_entry_group_add_service(group->handle,
-                                                 AVAHI_IF_UNSPEC,
-                                                 AVAHI_PROTO_UNSPEC,
-                                                 0,
-                                                 group->name,
-                                                 entry->type,
-                                                 NULL,
-                                                 NULL,
-                                                 entry->port,
-                                                 NULL)) < 0) {
-            AVAHI_DEBUG("Failed to add %s service on port %d: %s",
-                        entry->type, entry->port, avahi_strerror(ret));
-            avahi_entry_group_reset(group->handle);
-            return;
-        }
-        entry = entry->next;
-    }
-
-    /* Tell the server to register the service */
-    if ((ret = avahi_entry_group_commit(group->handle)) < 0) {
-        avahi_entry_group_reset(group->handle);
-        AVAHI_DEBUG("Failed to commit entry_group: %s", avahi_strerror(ret));
-        return;
-    }
-}
-
-
-static void libvirtd_mdns_client_callback(AvahiClient *c, AvahiClientState state, void *userdata) {
-    struct libvirtd_mdns *mdns = (struct libvirtd_mdns *)userdata;
-    struct libvirtd_mdns_group *group;
-    if (!mdns->client)
-        mdns->client = c;
-
-    /* Called whenever the client or server state changes */
-    switch (state) {
-        case AVAHI_CLIENT_S_RUNNING:
-            /* The server has startup successfully and registered its host
-             * name on the network, so it's time to create our services */
-            AVAHI_DEBUG("Client running %p", mdns->client);
-            group = mdns->group;
-            while (group) {
-                libvirtd_mdns_create_services(group);
-                group = group->next;
-            }
-            break;
-
-        case AVAHI_CLIENT_FAILURE:
-            AVAHI_DEBUG("Client failure: %s", avahi_strerror(avahi_client_errno(c)));
-            libvirtd_mdns_stop(mdns);
-            libvirtd_mdns_start(mdns);
-            break;
-
-        case AVAHI_CLIENT_S_COLLISION:
-            /* Let's drop our registered services. When the server is back
-             * in AVAHI_SERVER_RUNNING state we will register them
-             * again with the new host name. */
-
-            /* Fallthrough */
-
-        case AVAHI_CLIENT_S_REGISTERING:
-            /* The server records are now being established. This
-             * might be caused by a host name change. We need to wait
-             * for our own records to register until the host name is
-             * properly established. */
-            AVAHI_DEBUG("Client collision/connecting %p", mdns->client);
-            group = mdns->group;
-            while (group) {
-                if (group->handle)
-                    avahi_entry_group_reset(group->handle);
-                group = group->next;
-            }
-            break;
-
-        case AVAHI_CLIENT_CONNECTING:
-            AVAHI_DEBUG("Client connecting.... %p", mdns->client);
-            ;
-    }
-}
-
-
-static void libvirtd_mdns_watch_dispatch(int watch, int fd, int events, void *opaque)
-{
-    AvahiWatch *w = (AvahiWatch*)opaque;
-    int fd_events = virEventHandleTypeToPollEvent(events);
-    AVAHI_DEBUG("Dispatch watch %d FD %d Event %d", watch, fd, fd_events);
-    w->revents = fd_events;
-    w->callback(w, fd, fd_events, w->userdata);
-}
-
-static void libvirtd_mdns_watch_dofree(void *w)
-{
-    VIR_FREE(w);
-}
-
-
-static AvahiWatch *libvirtd_mdns_watch_new(const AvahiPoll *api ATTRIBUTE_UNUSED,
-                                           int fd, AvahiWatchEvent event,
-                                           AvahiWatchCallback cb, void *userdata) {
-    AvahiWatch *w;
-    virEventHandleType hEvents;
-    if (VIR_ALLOC(w) < 0)
-        return NULL;
-
-    w->fd = fd;
-    w->revents = 0;
-    w->callback = cb;
-    w->userdata = userdata;
-
-    AVAHI_DEBUG("New handle %p FD %d Event %d", w, w->fd, event);
-    hEvents = virPollEventToEventHandleType(event);
-    if ((w->watch = virEventAddHandleImpl(fd, hEvents,
-                                          libvirtd_mdns_watch_dispatch,
-                                          w,
-                                          libvirtd_mdns_watch_dofree)) < 0) {
-        VIR_FREE(w);
-        return NULL;
-    }
-
-    return w;
-}
-
-static void libvirtd_mdns_watch_update(AvahiWatch *w, AvahiWatchEvent event)
-{
-    AVAHI_DEBUG("Update handle %p FD %d Event %d", w, w->fd, event);
-    virEventUpdateHandleImpl(w->watch, event);
-}
-
-static AvahiWatchEvent libvirtd_mdns_watch_get_events(AvahiWatch *w)
-{
-    AVAHI_DEBUG("Get handle events %p %d", w, w->fd);
-    return w->revents;
-}
-
-static void libvirtd_mdns_watch_free(AvahiWatch *w)
-{
-    AVAHI_DEBUG("Free handle %p %d", w, w->fd);
-    virEventRemoveHandleImpl(w->watch);
-}
-
-static void libvirtd_mdns_timeout_dispatch(int timer ATTRIBUTE_UNUSED, void *opaque)
-{
-    AvahiTimeout *t = (AvahiTimeout*)opaque;
-    AVAHI_DEBUG("Dispatch timeout %p %d", t, timer);
-    virEventUpdateTimeoutImpl(t->timer, -1);
-    t->callback(t, t->userdata);
-}
-
-static void libvirtd_mdns_timeout_dofree(void *t)
-{
-    VIR_FREE(t);
-}
-
-static AvahiTimeout *libvirtd_mdns_timeout_new(const AvahiPoll *api ATTRIBUTE_UNUSED,
-                                                const struct timeval *tv,
-                                                AvahiTimeoutCallback cb,
-                                                void *userdata)
-{
-    AvahiTimeout *t;
-    struct timeval now;
-    long long nowms, thenms, timeout;
-    AVAHI_DEBUG("Add timeout TV %p", tv);
-    if (VIR_ALLOC(t) < 0)
-        return NULL;
-
-    if (gettimeofday(&now, NULL) < 0) {
-        VIR_FREE(t);
-        return NULL;
-    }
-
-    AVAHI_DEBUG("Trigger timed for %d %d      %d %d",
-               (int)now.tv_sec, (int)now.tv_usec,
-               (int)(tv ? tv->tv_sec : 0), (int)(tv ? tv->tv_usec : 0));
-    nowms = (now.tv_sec * 1000ll) + (now.tv_usec / 1000ll);
-    if (tv) {
-        thenms = (tv->tv_sec * 1000ll) + (tv->tv_usec/1000ll);
-        timeout = thenms > nowms ? nowms - thenms : 0;
-        if (timeout < 0)
-            timeout = 0;
-    } else {
-        timeout = -1;
-    }
-
-    t->timer = virEventAddTimeoutImpl(timeout,
-                                      libvirtd_mdns_timeout_dispatch,
-                                      t,
-                                      libvirtd_mdns_timeout_dofree);
-    t->callback = cb;
-    t->userdata = userdata;
-
-    if (t->timer < 0) {
-        VIR_FREE(t);
-        return NULL;
-    }
-
-    return t;
-}
-
-static void libvirtd_mdns_timeout_update(AvahiTimeout *t, const struct timeval *tv)
-{
-    struct timeval now;
-    long long nowms, thenms, timeout;
-    AVAHI_DEBUG("Update timeout %p TV %p", t, tv);
-    if (gettimeofday(&now, NULL) < 0) {
-        VIR_FREE(t);
-        return;
-    }
-
-    nowms = (now.tv_sec * 1000ll) + (now.tv_usec / 1000ll);
-    if (tv) {
-        thenms = ((tv->tv_sec * 1000ll) + (tv->tv_usec/1000ll));
-        timeout = thenms > nowms ? nowms - thenms : 0;
-        if (timeout < 0)
-            timeout = 0;
-    } else {
-        timeout = -1;
-    }
-
-    virEventUpdateTimeoutImpl(t->timer, timeout);
-}
-
-static void libvirtd_mdns_timeout_free(AvahiTimeout *t)
-{
-    AVAHI_DEBUG("Free timeout %p", t);
-    virEventRemoveTimeoutImpl(t->timer);
-}
-
-
-static AvahiPoll *libvirtd_create_poll(void)
-{
-    AvahiPoll *p;
-    if (VIR_ALLOC(p) < 0)
-        return NULL;
-
-    p->userdata = NULL;
-
-    p->watch_new = libvirtd_mdns_watch_new;
-    p->watch_update = libvirtd_mdns_watch_update;
-    p->watch_get_events = libvirtd_mdns_watch_get_events;
-    p->watch_free = libvirtd_mdns_watch_free;
-
-    p->timeout_new = libvirtd_mdns_timeout_new;
-    p->timeout_update = libvirtd_mdns_timeout_update;
-    p->timeout_free = libvirtd_mdns_timeout_free;
-
-    return p;
-}
-
-struct libvirtd_mdns *libvirtd_mdns_new(void)
-{
-    struct libvirtd_mdns *mdns;
-    if (VIR_ALLOC(mdns) < 0)
-        return NULL;
-
-    /* Allocate main loop object */
-    if (!(mdns->poller = libvirtd_create_poll())) {
-        VIR_FREE(mdns);
-        return NULL;
-    }
-
-    return mdns;
-}
-
-int libvirtd_mdns_start(struct libvirtd_mdns *mdns)
-{
-    int error;
-    AVAHI_DEBUG("Starting client %p", mdns);
-    mdns->client = avahi_client_new(mdns->poller, AVAHI_CLIENT_NO_FAIL, libvirtd_mdns_client_callback, mdns, &error);
-
-    if (!mdns->client) {
-        AVAHI_DEBUG("Failed to create mDNS client: %s", avahi_strerror(error));
-        return -1;
-    }
-
-    return 0;
-}
-
-struct libvirtd_mdns_group *libvirtd_mdns_add_group(struct libvirtd_mdns *mdns, const char *name) {
-    struct libvirtd_mdns_group *group;
-
-    AVAHI_DEBUG("Adding group '%s'", name);
-    if (VIR_ALLOC(group) < 0)
-        return NULL;
-
-    if (!(group->name = strdup(name))) {
-        VIR_FREE(group);
-        return NULL;
-    }
-    group->mdns = mdns;
-    group->next = mdns->group;
-    mdns->group = group;
-    return group;
-}
-
-void libvirtd_mdns_remove_group(struct libvirtd_mdns *mdns, struct libvirtd_mdns_group *group) {
-    struct libvirtd_mdns_group *tmp = mdns->group, *prev = NULL;
-
-    while (tmp) {
-        if (tmp == group) {
-            VIR_FREE(group->name);
-            if (prev)
-                prev->next = group->next;
-            else
-                group->mdns->group = group->next;
-            VIR_FREE(group);
-            return;
-        }
-        prev = tmp;
-        tmp = tmp->next;
-    }
-}
-
-struct libvirtd_mdns_entry *libvirtd_mdns_add_entry(struct libvirtd_mdns_group *group, const char *type, int port) {
-    struct libvirtd_mdns_entry *entry;
-
-    AVAHI_DEBUG("Adding entry %s %d to group %s", type, port, group->name);
-    if (VIR_ALLOC(entry) < 0)
-        return NULL;
-
-    entry->port = port;
-    if (!(entry->type = strdup(type))) {
-        VIR_FREE(entry);
-        return NULL;
-    }
-    entry->next = group->entry;
-    group->entry = entry;
-    return entry;
-}
-
-void libvirtd_mdns_remove_entry(struct libvirtd_mdns_group *group, struct libvirtd_mdns_entry *entry) {
-    struct libvirtd_mdns_entry *tmp = group->entry, *prev = NULL;
-
-    while (tmp) {
-        if (tmp == entry) {
-            VIR_FREE(entry->type);
-            if (prev)
-                prev->next = entry->next;
-            else
-                group->entry = entry->next;
-            return;
-        }
-        prev = tmp;
-        tmp = tmp->next;
-    }
-}
-
-void libvirtd_mdns_stop(struct libvirtd_mdns *mdns)
-{
-    struct libvirtd_mdns_group *group = mdns->group;
-    while (group) {
-        if (group->handle) {
-            avahi_entry_group_free(group->handle);
-            group->handle = NULL;
-        }
-        group = group->next;
-    }
-    if (mdns->client)
-        avahi_client_free(mdns->client);
-    mdns->client = NULL;
-}

daemon/mdns.h

@@ -1,96 +0,0 @@
-/*
- * mdns.c: advertise libvirt hypervisor connections
- *
- * Copyright (C) 2007 Daniel P. Berrange
- *
- * Derived from Avahi example service provider code.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
- */
-
-#include "internal.h"
-
-#ifndef __VIRTD_MDNS_H__
-# define __VIRTD_MDNS_H__
-
-struct libvirtd_mdns;
-struct libvirtd_mdns_group;
-struct libvirtd_mdns_entry;
-
-/**
- * Prepares a new mdns manager object for use
- */
-struct libvirtd_mdns *libvirtd_mdns_new(void);
-
-/**
- * Starts the mdns client, advertising any groups/entries currently registered
- *
- * @mdns: manager to start advertising
- *
- * Starts the mdns client. Services may not be immediately visible, since
- * it may asynchronously wait for the mdns service to startup
- *
- * returns -1 upon failure, 0 upon success.
- */
-int libvirtd_mdns_start(struct libvirtd_mdns *mdns);
-
-/**
- * Stops the mdns client, removing any advertisements
- *
- * @mdns: manager to start advertising
- *
- */
-void libvirtd_mdns_stop(struct libvirtd_mdns *mdns);
-
-/**
- * Adds a group container for advertisement
- *
- * @mdns manager to attach the group to
- * @name unique human readable service name
- *
- * returns the group record, or NULL upon failure
- */
-struct libvirtd_mdns_group *libvirtd_mdns_add_group(struct libvirtd_mdns *mdns, const char *name);
-
-/**
- * Removes a group container from advertisement
- *
- * @mdns amanger to detach group from
- * @group group to remove
- */
-void libvirtd_mdns_remove_group(struct libvirtd_mdns *mdns, struct libvirtd_mdns_group *group);
-
-/**
- * Adds a service entry in a group
- *
- * @group group to attach the entry to
- * @type service type string
- * @port tcp port number
- *
- * returns the service record, or NULL upon failure
- */
-struct libvirtd_mdns_entry *libvirtd_mdns_add_entry(struct libvirtd_mdns_group *group, const char *type, int port);
-
-/**
- * Removes a service entry from a group
- *
- * @group group to detach service entry from
- * @entry service entry to remove
- */
-void libvirtd_mdns_remove_entry(struct libvirtd_mdns_group *group, struct libvirtd_mdns_entry *entry);
-
-#endif /* __VIRTD_MDNS_H__ */

daemon/probes.d

@@ -1,12 +0,0 @@
-provider libvirtd {
-	 probe client_connect(int fd, int readonly, const char *localAddr, const char *remoteAddr);
-	 probe client_disconnect(int fd);
-
-	 probe client_auth_allow(int fd, int authtype, const char *identity);
-	 probe client_auth_deny(int fd, int authtype, const char *identity);
-	 probe client_auth_fail(int fd, int authtype);
-
-	 probe client_tls_allow(int fd, const char *x509dname);
-	 probe client_tls_deny(int fd, const char *x509dname);
-	 probe client_tls_fail(int fd);
-};

daemon/qemu_dispatch_args.h

@@ -1,5 +0,0 @@
-/* Automatically generated by remote_generate_stubs.pl.
- * Do not edit this file.  Any changes you make will be lost.
- */
-
-    qemu_monitor_command_args val_qemu_monitor_command_args;

daemon/qemu_dispatch_prototypes.h

@@ -1,12 +0,0 @@
-/* Automatically generated by remote_generate_stubs.pl.
- * Do not edit this file.  Any changes you make will be lost.
- */
-
-static int qemuDispatchMonitorCommand(
-    struct qemud_server *server,
-    struct qemud_client *client,
-    virConnectPtr conn,
-    remote_message_header *hdr,
-    remote_error *err,
-    qemu_monitor_command_args *args,
-    qemu_monitor_command_ret *ret);

daemon/qemu_dispatch_ret.h

@@ -1,5 +0,0 @@
-/* Automatically generated by remote_generate_stubs.pl.
- * Do not edit this file.  Any changes you make will be lost.
- */
-
-    qemu_monitor_command_ret val_qemu_monitor_command_ret;

daemon/qemu_dispatch_table.h

@@ -1,14 +0,0 @@
-/* Automatically generated by remote_generate_stubs.pl.
- * Do not edit this file.  Any changes you make will be lost.
- */
-
-{   /* (unused) => 0 */
-    .fn = NULL,
-    .args_filter = (xdrproc_t) xdr_void,
-    .ret_filter = (xdrproc_t) xdr_void,
-},
-{   /* MonitorCommand => 1 */
-    .fn = (dispatch_fn) qemuDispatchMonitorCommand,
-    .args_filter = (xdrproc_t) xdr_qemu_monitor_command_args,
-    .ret_filter = (xdrproc_t) xdr_qemu_monitor_command_ret,
-},

daemon/remote.h

@@ -1,85 +0,0 @@
-/*
- * remote.h: handlers for RPC method calls
- *
- * Copyright (C) 2007, 2008, 2009 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
- *
- * Author: Richard W.M. Jones <rjones@redhat.com>
- * Author: Daniel P. Berrange <berrange@redhat.com>
- */
-
-#ifndef __LIBVIRTD_REMOTE_H__
-# define __LIBVIRTD_REMOTE_H__
-
-
-# include "libvirtd.h"
-
-typedef union {
-# include "remote_dispatch_args.h"
-} dispatch_args;
-verify(sizeof(dispatch_args) > 0);
-
-typedef union {
-# include "remote_dispatch_ret.h"
-} dispatch_ret;
-verify(sizeof(dispatch_ret) > 0);
-
-typedef union {
-# include "qemu_dispatch_args.h"
-} qemu_dispatch_args;
-verify(sizeof(qemu_dispatch_args) > 0);
-
-typedef union {
-# include "qemu_dispatch_ret.h"
-} qemu_dispatch_ret;
-verify(sizeof(qemu_dispatch_ret) > 0);
-
-
-
-/**
- * When the RPC handler is called:
- *
- *  - Server object is unlocked
- *  - Client object is unlocked
- *
- * Both must be locked before use. Server lock must
- * be held before attempting to lock client.
- *
- * Without any locking, it is safe to use:
- *
- *   'conn', 'rerr', 'args and 'ret'
- */
-typedef int (*dispatch_fn) (struct qemud_server *server,
-                            struct qemud_client *client,
-                            virConnectPtr conn,
-                            remote_message_header *hdr,
-                            remote_error *err,
-                            dispatch_args *args,
-                            dispatch_ret *ret);
-
-typedef struct {
-    dispatch_fn fn;
-    xdrproc_t args_filter;
-    xdrproc_t ret_filter;
-} dispatch_data;
-
-
-const dispatch_data const *remoteGetDispatchData(int proc);
-const dispatch_data const *qemuGetDispatchData(int proc);
-
-
-
-#endif /* __LIBVIRTD_REMOTE_H__ */

daemon/remote_dispatch_args.h

@@ -1,174 +0,0 @@
-/* Automatically generated by remote_generate_stubs.pl.
- * Do not edit this file.  Any changes you make will be lost.
- */
-
-    remote_open_args val_remote_open_args;
-    remote_get_max_vcpus_args val_remote_get_max_vcpus_args;
-    remote_domain_attach_device_args val_remote_domain_attach_device_args;
-    remote_domain_create_args val_remote_domain_create_args;
-    remote_domain_create_xml_args val_remote_domain_create_xml_args;
-    remote_domain_define_xml_args val_remote_domain_define_xml_args;
-    remote_domain_destroy_args val_remote_domain_destroy_args;
-    remote_domain_detach_device_args val_remote_domain_detach_device_args;
-    remote_domain_dump_xml_args val_remote_domain_dump_xml_args;
-    remote_domain_get_autostart_args val_remote_domain_get_autostart_args;
-    remote_domain_get_info_args val_remote_domain_get_info_args;
-    remote_domain_get_max_memory_args val_remote_domain_get_max_memory_args;
-    remote_domain_get_max_vcpus_args val_remote_domain_get_max_vcpus_args;
-    remote_domain_get_os_type_args val_remote_domain_get_os_type_args;
-    remote_domain_get_vcpus_args val_remote_domain_get_vcpus_args;
-    remote_list_defined_domains_args val_remote_list_defined_domains_args;
-    remote_domain_lookup_by_id_args val_remote_domain_lookup_by_id_args;
-    remote_domain_lookup_by_name_args val_remote_domain_lookup_by_name_args;
-    remote_domain_lookup_by_uuid_args val_remote_domain_lookup_by_uuid_args;
-    remote_domain_pin_vcpu_args val_remote_domain_pin_vcpu_args;
-    remote_domain_reboot_args val_remote_domain_reboot_args;
-    remote_domain_resume_args val_remote_domain_resume_args;
-    remote_domain_set_autostart_args val_remote_domain_set_autostart_args;
-    remote_domain_set_max_memory_args val_remote_domain_set_max_memory_args;
-    remote_domain_set_memory_args val_remote_domain_set_memory_args;
-    remote_domain_set_vcpus_args val_remote_domain_set_vcpus_args;
-    remote_domain_shutdown_args val_remote_domain_shutdown_args;
-    remote_domain_suspend_args val_remote_domain_suspend_args;
-    remote_domain_undefine_args val_remote_domain_undefine_args;
-    remote_list_defined_networks_args val_remote_list_defined_networks_args;
-    remote_list_domains_args val_remote_list_domains_args;
-    remote_list_networks_args val_remote_list_networks_args;
-    remote_network_create_args val_remote_network_create_args;
-    remote_network_create_xml_args val_remote_network_create_xml_args;
-    remote_network_define_xml_args val_remote_network_define_xml_args;
-    remote_network_destroy_args val_remote_network_destroy_args;
-    remote_network_dump_xml_args val_remote_network_dump_xml_args;
-    remote_network_get_autostart_args val_remote_network_get_autostart_args;
-    remote_network_get_bridge_name_args val_remote_network_get_bridge_name_args;
-    remote_network_lookup_by_name_args val_remote_network_lookup_by_name_args;
-    remote_network_lookup_by_uuid_args val_remote_network_lookup_by_uuid_args;
-    remote_network_set_autostart_args val_remote_network_set_autostart_args;
-    remote_network_undefine_args val_remote_network_undefine_args;
-    remote_domain_core_dump_args val_remote_domain_core_dump_args;
-    remote_domain_restore_args val_remote_domain_restore_args;
-    remote_domain_save_args val_remote_domain_save_args;
-    remote_domain_get_scheduler_type_args val_remote_domain_get_scheduler_type_args;
-    remote_domain_get_scheduler_parameters_args val_remote_domain_get_scheduler_parameters_args;
-    remote_domain_set_scheduler_parameters_args val_remote_domain_set_scheduler_parameters_args;
-    remote_supports_feature_args val_remote_supports_feature_args;
-    remote_domain_migrate_prepare_args val_remote_domain_migrate_prepare_args;
-    remote_domain_migrate_perform_args val_remote_domain_migrate_perform_args;
-    remote_domain_migrate_finish_args val_remote_domain_migrate_finish_args;
-    remote_domain_block_stats_args val_remote_domain_block_stats_args;
-    remote_domain_interface_stats_args val_remote_domain_interface_stats_args;
-    remote_auth_sasl_start_args val_remote_auth_sasl_start_args;
-    remote_auth_sasl_step_args val_remote_auth_sasl_step_args;
-    remote_list_storage_pools_args val_remote_list_storage_pools_args;
-    remote_list_defined_storage_pools_args val_remote_list_defined_storage_pools_args;
-    remote_find_storage_pool_sources_args val_remote_find_storage_pool_sources_args;
-    remote_storage_pool_create_xml_args val_remote_storage_pool_create_xml_args;
-    remote_storage_pool_define_xml_args val_remote_storage_pool_define_xml_args;
-    remote_storage_pool_create_args val_remote_storage_pool_create_args;
-    remote_storage_pool_build_args val_remote_storage_pool_build_args;
-    remote_storage_pool_destroy_args val_remote_storage_pool_destroy_args;
-    remote_storage_pool_delete_args val_remote_storage_pool_delete_args;
-    remote_storage_pool_undefine_args val_remote_storage_pool_undefine_args;
-    remote_storage_pool_refresh_args val_remote_storage_pool_refresh_args;
-    remote_storage_pool_lookup_by_name_args val_remote_storage_pool_lookup_by_name_args;
-    remote_storage_pool_lookup_by_uuid_args val_remote_storage_pool_lookup_by_uuid_args;
-    remote_storage_pool_lookup_by_volume_args val_remote_storage_pool_lookup_by_volume_args;
-    remote_storage_pool_get_info_args val_remote_storage_pool_get_info_args;
-    remote_storage_pool_dump_xml_args val_remote_storage_pool_dump_xml_args;
-    remote_storage_pool_get_autostart_args val_remote_storage_pool_get_autostart_args;
-    remote_storage_pool_set_autostart_args val_remote_storage_pool_set_autostart_args;
-    remote_storage_pool_num_of_volumes_args val_remote_storage_pool_num_of_volumes_args;
-    remote_storage_pool_list_volumes_args val_remote_storage_pool_list_volumes_args;
-    remote_storage_vol_create_xml_args val_remote_storage_vol_create_xml_args;
-    remote_storage_vol_delete_args val_remote_storage_vol_delete_args;
-    remote_storage_vol_lookup_by_name_args val_remote_storage_vol_lookup_by_name_args;
-    remote_storage_vol_lookup_by_key_args val_remote_storage_vol_lookup_by_key_args;
-    remote_storage_vol_lookup_by_path_args val_remote_storage_vol_lookup_by_path_args;
-    remote_storage_vol_get_info_args val_remote_storage_vol_get_info_args;
-    remote_storage_vol_dump_xml_args val_remote_storage_vol_dump_xml_args;
-    remote_storage_vol_get_path_args val_remote_storage_vol_get_path_args;
-    remote_node_get_cells_free_memory_args val_remote_node_get_cells_free_memory_args;
-    remote_domain_block_peek_args val_remote_domain_block_peek_args;
-    remote_domain_memory_peek_args val_remote_domain_memory_peek_args;
-    remote_domain_migrate_prepare2_args val_remote_domain_migrate_prepare2_args;
-    remote_domain_migrate_finish2_args val_remote_domain_migrate_finish2_args;
-    remote_node_num_of_devices_args val_remote_node_num_of_devices_args;
-    remote_node_list_devices_args val_remote_node_list_devices_args;
-    remote_node_device_lookup_by_name_args val_remote_node_device_lookup_by_name_args;
-    remote_node_device_dump_xml_args val_remote_node_device_dump_xml_args;
-    remote_node_device_get_parent_args val_remote_node_device_get_parent_args;
-    remote_node_device_num_of_caps_args val_remote_node_device_num_of_caps_args;
-    remote_node_device_list_caps_args val_remote_node_device_list_caps_args;
-    remote_node_device_dettach_args val_remote_node_device_dettach_args;
-    remote_node_device_re_attach_args val_remote_node_device_re_attach_args;
-    remote_node_device_reset_args val_remote_node_device_reset_args;
-    remote_domain_get_security_label_args val_remote_domain_get_security_label_args;
-    remote_node_device_create_xml_args val_remote_node_device_create_xml_args;
-    remote_node_device_destroy_args val_remote_node_device_destroy_args;
-    remote_storage_vol_create_xml_from_args val_remote_storage_vol_create_xml_from_args;
-    remote_list_interfaces_args val_remote_list_interfaces_args;
-    remote_interface_lookup_by_name_args val_remote_interface_lookup_by_name_args;
-    remote_interface_lookup_by_mac_string_args val_remote_interface_lookup_by_mac_string_args;
-    remote_interface_get_xml_desc_args val_remote_interface_get_xml_desc_args;
-    remote_interface_define_xml_args val_remote_interface_define_xml_args;
-    remote_interface_undefine_args val_remote_interface_undefine_args;
-    remote_interface_create_args val_remote_interface_create_args;
-    remote_interface_destroy_args val_remote_interface_destroy_args;
-    remote_domain_xml_from_native_args val_remote_domain_xml_from_native_args;
-    remote_domain_xml_to_native_args val_remote_domain_xml_to_native_args;
-    remote_list_defined_interfaces_args val_remote_list_defined_interfaces_args;
-    remote_list_secrets_args val_remote_list_secrets_args;
-    remote_secret_lookup_by_uuid_args val_remote_secret_lookup_by_uuid_args;
-    remote_secret_define_xml_args val_remote_secret_define_xml_args;
-    remote_secret_get_xml_desc_args val_remote_secret_get_xml_desc_args;
-    remote_secret_set_value_args val_remote_secret_set_value_args;
-    remote_secret_get_value_args val_remote_secret_get_value_args;
-    remote_secret_undefine_args val_remote_secret_undefine_args;
-    remote_secret_lookup_by_usage_args val_remote_secret_lookup_by_usage_args;
-    remote_domain_migrate_prepare_tunnel_args val_remote_domain_migrate_prepare_tunnel_args;
-    remote_domain_is_active_args val_remote_domain_is_active_args;
-    remote_domain_is_persistent_args val_remote_domain_is_persistent_args;
-    remote_network_is_active_args val_remote_network_is_active_args;
-    remote_network_is_persistent_args val_remote_network_is_persistent_args;
-    remote_storage_pool_is_active_args val_remote_storage_pool_is_active_args;
-    remote_storage_pool_is_persistent_args val_remote_storage_pool_is_persistent_args;
-    remote_interface_is_active_args val_remote_interface_is_active_args;
-    remote_cpu_compare_args val_remote_cpu_compare_args;
-    remote_domain_memory_stats_args val_remote_domain_memory_stats_args;
-    remote_domain_attach_device_flags_args val_remote_domain_attach_device_flags_args;
-    remote_domain_detach_device_flags_args val_remote_domain_detach_device_flags_args;
-    remote_cpu_baseline_args val_remote_cpu_baseline_args;
-    remote_domain_get_job_info_args val_remote_domain_get_job_info_args;
-    remote_domain_abort_job_args val_remote_domain_abort_job_args;
-    remote_storage_vol_wipe_args val_remote_storage_vol_wipe_args;
-    remote_domain_migrate_set_max_downtime_args val_remote_domain_migrate_set_max_downtime_args;
-    remote_domain_events_register_any_args val_remote_domain_events_register_any_args;
-    remote_domain_events_deregister_any_args val_remote_domain_events_deregister_any_args;
-    remote_domain_update_device_flags_args val_remote_domain_update_device_flags_args;
-    remote_nwfilter_lookup_by_name_args val_remote_nwfilter_lookup_by_name_args;
-    remote_nwfilter_lookup_by_uuid_args val_remote_nwfilter_lookup_by_uuid_args;
-    remote_nwfilter_get_xml_desc_args val_remote_nwfilter_get_xml_desc_args;
-    remote_list_nwfilters_args val_remote_list_nwfilters_args;
-    remote_nwfilter_define_xml_args val_remote_nwfilter_define_xml_args;
-    remote_nwfilter_undefine_args val_remote_nwfilter_undefine_args;
-    remote_domain_managed_save_args val_remote_domain_managed_save_args;
-    remote_domain_has_managed_save_image_args val_remote_domain_has_managed_save_image_args;
-    remote_domain_managed_save_remove_args val_remote_domain_managed_save_remove_args;
-    remote_domain_snapshot_create_xml_args val_remote_domain_snapshot_create_xml_args;
-    remote_domain_snapshot_dump_xml_args val_remote_domain_snapshot_dump_xml_args;
-    remote_domain_snapshot_num_args val_remote_domain_snapshot_num_args;
-    remote_domain_snapshot_list_names_args val_remote_domain_snapshot_list_names_args;
-    remote_domain_snapshot_lookup_by_name_args val_remote_domain_snapshot_lookup_by_name_args;
-    remote_domain_has_current_snapshot_args val_remote_domain_has_current_snapshot_args;
-    remote_domain_snapshot_current_args val_remote_domain_snapshot_current_args;
-    remote_domain_revert_to_snapshot_args val_remote_domain_revert_to_snapshot_args;
-    remote_domain_snapshot_delete_args val_remote_domain_snapshot_delete_args;
-    remote_domain_get_block_info_args val_remote_domain_get_block_info_args;
-    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;
-    remote_domain_open_console_args val_remote_domain_open_console_args;
-    remote_domain_is_updated_args val_remote_domain_is_updated_args;
-    remote_get_sysinfo_args val_remote_get_sysinfo_args;

daemon/remote_dispatch_ret.h

@@ -1,141 +0,0 @@
-/* Automatically generated by remote_generate_stubs.pl.
- * Do not edit this file.  Any changes you make will be lost.
- */
-
-    remote_get_type_ret val_remote_get_type_ret;
-    remote_get_version_ret val_remote_get_version_ret;
-    remote_get_max_vcpus_ret val_remote_get_max_vcpus_ret;
-    remote_node_get_info_ret val_remote_node_get_info_ret;
-    remote_get_capabilities_ret val_remote_get_capabilities_ret;
-    remote_domain_create_xml_ret val_remote_domain_create_xml_ret;
-    remote_domain_define_xml_ret val_remote_domain_define_xml_ret;
-    remote_domain_dump_xml_ret val_remote_domain_dump_xml_ret;
-    remote_domain_get_autostart_ret val_remote_domain_get_autostart_ret;
-    remote_domain_get_info_ret val_remote_domain_get_info_ret;
-    remote_domain_get_max_memory_ret val_remote_domain_get_max_memory_ret;
-    remote_domain_get_max_vcpus_ret val_remote_domain_get_max_vcpus_ret;
-    remote_domain_get_os_type_ret val_remote_domain_get_os_type_ret;
-    remote_domain_get_vcpus_ret val_remote_domain_get_vcpus_ret;
-    remote_list_defined_domains_ret val_remote_list_defined_domains_ret;
-    remote_domain_lookup_by_id_ret val_remote_domain_lookup_by_id_ret;
-    remote_domain_lookup_by_name_ret val_remote_domain_lookup_by_name_ret;
-    remote_domain_lookup_by_uuid_ret val_remote_domain_lookup_by_uuid_ret;
-    remote_num_of_defined_domains_ret val_remote_num_of_defined_domains_ret;
-    remote_list_defined_networks_ret val_remote_list_defined_networks_ret;
-    remote_list_domains_ret val_remote_list_domains_ret;
-    remote_list_networks_ret val_remote_list_networks_ret;
-    remote_network_create_xml_ret val_remote_network_create_xml_ret;
-    remote_network_define_xml_ret val_remote_network_define_xml_ret;
-    remote_network_dump_xml_ret val_remote_network_dump_xml_ret;
-    remote_network_get_autostart_ret val_remote_network_get_autostart_ret;
-    remote_network_get_bridge_name_ret val_remote_network_get_bridge_name_ret;
-    remote_network_lookup_by_name_ret val_remote_network_lookup_by_name_ret;
-    remote_network_lookup_by_uuid_ret val_remote_network_lookup_by_uuid_ret;
-    remote_num_of_defined_networks_ret val_remote_num_of_defined_networks_ret;
-    remote_num_of_domains_ret val_remote_num_of_domains_ret;
-    remote_num_of_networks_ret val_remote_num_of_networks_ret;
-    remote_domain_get_scheduler_type_ret val_remote_domain_get_scheduler_type_ret;
-    remote_domain_get_scheduler_parameters_ret val_remote_domain_get_scheduler_parameters_ret;
-    remote_get_hostname_ret val_remote_get_hostname_ret;
-    remote_supports_feature_ret val_remote_supports_feature_ret;
-    remote_domain_migrate_prepare_ret val_remote_domain_migrate_prepare_ret;
-    remote_domain_migrate_finish_ret val_remote_domain_migrate_finish_ret;
-    remote_domain_block_stats_ret val_remote_domain_block_stats_ret;
-    remote_domain_interface_stats_ret val_remote_domain_interface_stats_ret;
-    remote_auth_list_ret val_remote_auth_list_ret;
-    remote_auth_sasl_init_ret val_remote_auth_sasl_init_ret;
-    remote_auth_sasl_start_ret val_remote_auth_sasl_start_ret;
-    remote_auth_sasl_step_ret val_remote_auth_sasl_step_ret;
-    remote_auth_polkit_ret val_remote_auth_polkit_ret;
-    remote_num_of_storage_pools_ret val_remote_num_of_storage_pools_ret;
-    remote_list_storage_pools_ret val_remote_list_storage_pools_ret;
-    remote_num_of_defined_storage_pools_ret val_remote_num_of_defined_storage_pools_ret;
-    remote_list_defined_storage_pools_ret val_remote_list_defined_storage_pools_ret;
-    remote_find_storage_pool_sources_ret val_remote_find_storage_pool_sources_ret;
-    remote_storage_pool_create_xml_ret val_remote_storage_pool_create_xml_ret;
-    remote_storage_pool_define_xml_ret val_remote_storage_pool_define_xml_ret;
-    remote_storage_pool_lookup_by_name_ret val_remote_storage_pool_lookup_by_name_ret;
-    remote_storage_pool_lookup_by_uuid_ret val_remote_storage_pool_lookup_by_uuid_ret;
-    remote_storage_pool_lookup_by_volume_ret val_remote_storage_pool_lookup_by_volume_ret;
-    remote_storage_pool_get_info_ret val_remote_storage_pool_get_info_ret;
-    remote_storage_pool_dump_xml_ret val_remote_storage_pool_dump_xml_ret;
-    remote_storage_pool_get_autostart_ret val_remote_storage_pool_get_autostart_ret;
-    remote_storage_pool_num_of_volumes_ret val_remote_storage_pool_num_of_volumes_ret;
-    remote_storage_pool_list_volumes_ret val_remote_storage_pool_list_volumes_ret;
-    remote_storage_vol_create_xml_ret val_remote_storage_vol_create_xml_ret;
-    remote_storage_vol_lookup_by_name_ret val_remote_storage_vol_lookup_by_name_ret;
-    remote_storage_vol_lookup_by_key_ret val_remote_storage_vol_lookup_by_key_ret;
-    remote_storage_vol_lookup_by_path_ret val_remote_storage_vol_lookup_by_path_ret;
-    remote_storage_vol_get_info_ret val_remote_storage_vol_get_info_ret;
-    remote_storage_vol_dump_xml_ret val_remote_storage_vol_dump_xml_ret;
-    remote_storage_vol_get_path_ret val_remote_storage_vol_get_path_ret;
-    remote_node_get_cells_free_memory_ret val_remote_node_get_cells_free_memory_ret;
-    remote_node_get_free_memory_ret val_remote_node_get_free_memory_ret;
-    remote_domain_block_peek_ret val_remote_domain_block_peek_ret;
-    remote_domain_memory_peek_ret val_remote_domain_memory_peek_ret;
-    remote_domain_events_register_ret val_remote_domain_events_register_ret;
-    remote_domain_events_deregister_ret val_remote_domain_events_deregister_ret;
-    remote_domain_migrate_prepare2_ret val_remote_domain_migrate_prepare2_ret;
-    remote_domain_migrate_finish2_ret val_remote_domain_migrate_finish2_ret;
-    remote_get_uri_ret val_remote_get_uri_ret;
-    remote_node_num_of_devices_ret val_remote_node_num_of_devices_ret;
-    remote_node_list_devices_ret val_remote_node_list_devices_ret;
-    remote_node_device_lookup_by_name_ret val_remote_node_device_lookup_by_name_ret;
-    remote_node_device_dump_xml_ret val_remote_node_device_dump_xml_ret;
-    remote_node_device_get_parent_ret val_remote_node_device_get_parent_ret;
-    remote_node_device_num_of_caps_ret val_remote_node_device_num_of_caps_ret;
-    remote_node_device_list_caps_ret val_remote_node_device_list_caps_ret;
-    remote_domain_get_security_label_ret val_remote_domain_get_security_label_ret;
-    remote_node_get_security_model_ret val_remote_node_get_security_model_ret;
-    remote_node_device_create_xml_ret val_remote_node_device_create_xml_ret;
-    remote_storage_vol_create_xml_from_ret val_remote_storage_vol_create_xml_from_ret;
-    remote_num_of_interfaces_ret val_remote_num_of_interfaces_ret;
-    remote_list_interfaces_ret val_remote_list_interfaces_ret;
-    remote_interface_lookup_by_name_ret val_remote_interface_lookup_by_name_ret;
-    remote_interface_lookup_by_mac_string_ret val_remote_interface_lookup_by_mac_string_ret;
-    remote_interface_get_xml_desc_ret val_remote_interface_get_xml_desc_ret;
-    remote_interface_define_xml_ret val_remote_interface_define_xml_ret;
-    remote_domain_xml_from_native_ret val_remote_domain_xml_from_native_ret;
-    remote_domain_xml_to_native_ret val_remote_domain_xml_to_native_ret;
-    remote_num_of_defined_interfaces_ret val_remote_num_of_defined_interfaces_ret;
-    remote_list_defined_interfaces_ret val_remote_list_defined_interfaces_ret;
-    remote_num_of_secrets_ret val_remote_num_of_secrets_ret;
-    remote_list_secrets_ret val_remote_list_secrets_ret;
-    remote_secret_lookup_by_uuid_ret val_remote_secret_lookup_by_uuid_ret;
-    remote_secret_define_xml_ret val_remote_secret_define_xml_ret;
-    remote_secret_get_xml_desc_ret val_remote_secret_get_xml_desc_ret;
-    remote_secret_get_value_ret val_remote_secret_get_value_ret;
-    remote_secret_lookup_by_usage_ret val_remote_secret_lookup_by_usage_ret;
-    remote_is_secure_ret val_remote_is_secure_ret;
-    remote_domain_is_active_ret val_remote_domain_is_active_ret;
-    remote_domain_is_persistent_ret val_remote_domain_is_persistent_ret;
-    remote_network_is_active_ret val_remote_network_is_active_ret;
-    remote_network_is_persistent_ret val_remote_network_is_persistent_ret;
-    remote_storage_pool_is_active_ret val_remote_storage_pool_is_active_ret;
-    remote_storage_pool_is_persistent_ret val_remote_storage_pool_is_persistent_ret;
-    remote_interface_is_active_ret val_remote_interface_is_active_ret;
-    remote_get_lib_version_ret val_remote_get_lib_version_ret;
-    remote_cpu_compare_ret val_remote_cpu_compare_ret;
-    remote_domain_memory_stats_ret val_remote_domain_memory_stats_ret;
-    remote_cpu_baseline_ret val_remote_cpu_baseline_ret;
-    remote_domain_get_job_info_ret val_remote_domain_get_job_info_ret;
-    remote_nwfilter_lookup_by_name_ret val_remote_nwfilter_lookup_by_name_ret;
-    remote_nwfilter_lookup_by_uuid_ret val_remote_nwfilter_lookup_by_uuid_ret;
-    remote_nwfilter_get_xml_desc_ret val_remote_nwfilter_get_xml_desc_ret;
-    remote_num_of_nwfilters_ret val_remote_num_of_nwfilters_ret;
-    remote_list_nwfilters_ret val_remote_list_nwfilters_ret;
-    remote_nwfilter_define_xml_ret val_remote_nwfilter_define_xml_ret;
-    remote_domain_has_managed_save_image_ret val_remote_domain_has_managed_save_image_ret;
-    remote_domain_snapshot_create_xml_ret val_remote_domain_snapshot_create_xml_ret;
-    remote_domain_snapshot_dump_xml_ret val_remote_domain_snapshot_dump_xml_ret;
-    remote_domain_snapshot_num_ret val_remote_domain_snapshot_num_ret;
-    remote_domain_snapshot_list_names_ret val_remote_domain_snapshot_list_names_ret;
-    remote_domain_snapshot_lookup_by_name_ret val_remote_domain_snapshot_lookup_by_name_ret;
-    remote_domain_has_current_snapshot_ret val_remote_domain_has_current_snapshot_ret;
-    remote_domain_snapshot_current_ret val_remote_domain_snapshot_current_ret;
-    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;
-    remote_domain_is_updated_ret val_remote_domain_is_updated_ret;
-    remote_get_sysinfo_ret val_remote_get_sysinfo_ret;

daemon/remote_generate_stubs.pl

@@ -1,195 +0,0 @@
-#!/usr/bin/perl -w
-#
-# This script parses remote_protocol.x or qemu_protocol.x and produces lots of
-# boilerplate code for both ends of the remote connection.
-#
-# The first non-option argument specifies the prefix to be searched for, and
-# output to, the boilerplate code.  The second non-option argument is the
-# file you want to operate on.  For instance, to generate the dispatch table
-# for both remote_protocol.x and qemu_protocol.x, you would run the
-# following:
-#
-# remote_generate_stubs.pl -c -t remote ../src/remote/remote_protocol.x
-# remote_generate_stubs.pl -t qemu ../src/remote/qemu_protocol.x
-#
-# By Richard Jones <rjones@redhat.com>
-
-use strict;
-
-use Getopt::Std;
-
-# Command line options.
-our ($opt_p, $opt_t, $opt_a, $opt_r, $opt_d, $opt_c);
-getopts ('ptardc');
-
-my $structprefix = $ARGV[0];
-my $procprefix = uc $structprefix;
-shift;
-
-# Convert name_of_call to NameOfCall.
-sub name_to_ProcName {
-    my $name = shift;
-    my @elems = split /_/, $name;
-    @elems = map ucfirst, @elems;
-    join "", @elems
-}
-
-# Read the input file (usually remote_protocol.x) and form an
-# opinion about the name, args and return type of each RPC.
-my ($name, $ProcName, $id, %calls, @calls);
-
-# only generate a close method if -c was passed
-if ($opt_c) {
-    # REMOTE_PROC_CLOSE has no args or ret.
-    $calls{close} = {
-	name => "close",
-	ProcName => "Close",
-	UC_NAME => "CLOSE",
-	args => "void",
-	ret => "void",
-    };
-}
-
-while (<>) {
-    if (/^struct ${structprefix}_(.*)_args/) {
-	$name = $1;
-	$ProcName = name_to_ProcName ($name);
-
-	die "duplicate definition of ${structprefix}_${name}_args"
-	    if exists $calls{$name};
-
-	$calls{$name} = {
-	    name => $name,
-	    ProcName => $ProcName,
-	    UC_NAME => uc $name,
-	    args => "${structprefix}_${name}_args",
-	    ret => "void",
-	};
-
-    } elsif (/^struct ${structprefix}_(.*)_ret/) {
-	$name = $1;
-	$ProcName = name_to_ProcName ($name);
-
-	if (exists $calls{$name}) {
-	    $calls{$name}->{ret} = "${structprefix}_${name}_ret";
-	} else {
-	    $calls{$name} = {
-		name => $name,
-		ProcName => $ProcName,
-		UC_NAME => uc $name,
-		args => "void",
-		ret => "${structprefix}_${name}_ret"
-	    }
-	}
-    } elsif (/^struct ${structprefix}_(.*)_msg/) {
-	$name = $1;
-	$ProcName = name_to_ProcName ($name);
-
-	$calls{$name} = {
-	    name => $name,
-	    ProcName => $ProcName,
-	    UC_NAME => uc $name,
-	    msg => "${structprefix}_${name}_msg"
-	}
-    } elsif (/^\s*${procprefix}_PROC_(.*?)\s+=\s+(\d+),?$/) {
-	$name = lc $1;
-	$id = $2;
-	$ProcName = name_to_ProcName ($name);
-
-	$calls[$id] = $calls{$name};
-    }
-}
-
-#----------------------------------------------------------------------
-# Output
-
-print <<__EOF__;
-/* Automatically generated by remote_generate_stubs.pl.
- * Do not edit this file.  Any changes you make will be lost.
- */
-
-__EOF__
-
-# Debugging.
-if ($opt_d) {
-    my @keys = sort (keys %calls);
-    foreach (@keys) {
-	print "$_:\n";
-	print "        name $calls{$_}->{name} ($calls{$_}->{ProcName})\n";
-	print "        $calls{$_}->{args} -> $calls{$_}->{ret}\n";
-    }
-}
-
-# Prototypes for dispatch functions ("remote_dispatch_prototypes.h").
-elsif ($opt_p) {
-    my @keys = sort (keys %calls);
-    foreach (@keys) {
-	# Skip things which are REMOTE_MESSAGE
-	next if $calls{$_}->{msg};
-
-	print "static int ${structprefix}Dispatch$calls{$_}->{ProcName}(\n";
-	print "    struct qemud_server *server,\n";
-	print "    struct qemud_client *client,\n";
-	print "    virConnectPtr conn,\n";
-	print "    remote_message_header *hdr,\n";
-	print "    remote_error *err,\n";
-	print "    $calls{$_}->{args} *args,\n";
-	print "    $calls{$_}->{ret} *ret);\n";
-    }
-}
-
-# Union of all arg types
-# ("remote_dispatch_args.h").
-elsif ($opt_a) {
-    for ($id = 0 ; $id <= $#calls ; $id++) {
-	if (defined $calls[$id] &&
-	    !$calls[$id]->{msg} &&
-	    $calls[$id]->{args} ne "void") {
-	    print "    $calls[$id]->{args} val_$calls[$id]->{args};\n";
-	}
-    }
-}
-
-# Union of all arg types
-# ("remote_dispatch_ret.h").
-elsif ($opt_r) {
-    for ($id = 0 ; $id <= $#calls ; $id++) {
-	if (defined $calls[$id] &&
-	    !$calls[$id]->{msg} &&
-	    $calls[$id]->{ret} ne "void") {
-	    print "    $calls[$id]->{ret} val_$calls[$id]->{ret};\n";
-	}
-    }
-}
-
-# Inside the switch statement, prepare the 'fn', 'args_filter', etc
-# ("remote_dispatch_table.h").
-elsif ($opt_t) {
-    for ($id = 0 ; $id <= $#calls ; $id++) {
-	if (defined $calls[$id] && !$calls[$id]->{msg}) {
-	    print "{   /* $calls[$id]->{ProcName} => $id */\n";
-	    print "    .fn = (dispatch_fn) ${structprefix}Dispatch$calls[$id]->{ProcName},\n";
-	    if ($calls[$id]->{args} ne "void") {
-		print "    .args_filter = (xdrproc_t) xdr_$calls[$id]->{args},\n";
-	    } else {
-		print "    .args_filter = (xdrproc_t) xdr_void,\n";
-	    }
-	    if ($calls[$id]->{ret} ne "void") {
-		print "    .ret_filter = (xdrproc_t) xdr_$calls[$id]->{ret},\n";
-	    } else {
-		print "    .ret_filter = (xdrproc_t) xdr_void,\n";
-	    }
-	    print "},\n";
-	} else {
-	    if ($calls[$id]->{msg}) {
-		print "{   /* Async event $calls[$id]->{ProcName} => $id */\n";
-	    } else {
-		print "{   /* (unused) => $id */\n";
-	    }
-	    print "    .fn = NULL,\n";
-	    print "    .args_filter = (xdrproc_t) xdr_void,\n";
-	    print "    .ret_filter = (xdrproc_t) xdr_void,\n";
-	    print "},\n";
-	}
-    }
-}

daemon/stream.c

@@ -1,612 +0,0 @@
-/*
- * stream.c: APIs for managing client streams
- *
- * Copyright (C) 2009 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
- */
-
-
-#include <config.h>
-
-#include "stream.h"
-#include "memory.h"
-#include "dispatch.h"
-#include "logging.h"
-
-static int
-remoteStreamHandleWrite(struct qemud_client *client,
-                        struct qemud_client_stream *stream);
-static int
-remoteStreamHandleRead(struct qemud_client *client,
-                       struct qemud_client_stream *stream);
-static int
-remoteStreamHandleFinish(struct qemud_client *client,
-                         struct qemud_client_stream *stream,
-                         struct qemud_client_message *msg);
-static int
-remoteStreamHandleAbort(struct qemud_client *client,
-                        struct qemud_client_stream *stream,
-                        struct qemud_client_message *msg);
-
-
-
-static void
-remoteStreamUpdateEvents(struct qemud_client_stream *stream)
-{
-    int newEvents = 0;
-    if (stream->rx)
-        newEvents |= VIR_STREAM_EVENT_WRITABLE;
-    if (stream->tx && !stream->recvEOF)
-        newEvents |= VIR_STREAM_EVENT_READABLE;
-
-    virStreamEventUpdateCallback(stream->st, newEvents);
-}
-
-
-/*
- * Callback that gets invoked when a stream becomes writable/readable
- */
-static void
-remoteStreamEvent(virStreamPtr st, int events, void *opaque)
-{
-    struct qemud_client *client = opaque;
-    struct qemud_client_stream *stream;
-
-    /* XXX sub-optimal - we really should be taking the server lock
-     * first, but we have no handle to the server object
-     * We're lucky to get away with it for now, due to this callback
-     * executing in the main thread, but this should really be fixed
-     */
-    virMutexLock(&client->lock);
-
-    stream = remoteFindClientStream(client, st);
-
-    if (!stream) {
-        VIR_WARN("event for client=%p stream st=%p, but missing stream state", client, st);
-        virStreamEventRemoveCallback(st);
-        goto cleanup;
-    }
-
-    DEBUG("st=%p events=%d", st, events);
-
-    if (events & VIR_STREAM_EVENT_WRITABLE) {
-        if (remoteStreamHandleWrite(client, stream) < 0) {
-            remoteRemoveClientStream(client, stream);
-            qemudDispatchClientFailure(client);
-            goto cleanup;
-        }
-    }
-
-    if (!stream->recvEOF &&
-        (events & (VIR_STREAM_EVENT_READABLE | VIR_STREAM_EVENT_HANGUP))) {
-        events = events & ~(VIR_STREAM_EVENT_READABLE | VIR_STREAM_EVENT_HANGUP);
-        if (remoteStreamHandleRead(client, stream) < 0) {
-            remoteRemoveClientStream(client, stream);
-            qemudDispatchClientFailure(client);
-            goto cleanup;
-        }
-    }
-
-    if (!stream->closed &&
-        (events & (VIR_STREAM_EVENT_ERROR | VIR_STREAM_EVENT_HANGUP))) {
-        int ret;
-        remote_error rerr;
-        memset(&rerr, 0, sizeof rerr);
-        stream->closed = 1;
-        virStreamEventRemoveCallback(stream->st);
-        virStreamAbort(stream->st);
-        if (events & VIR_STREAM_EVENT_HANGUP)
-            remoteDispatchFormatError(&rerr, "%s", _("stream had unexpected termination"));
-        else
-            remoteDispatchFormatError(&rerr, "%s", _("stream had I/O failure"));
-        ret = remoteSerializeStreamError(client, &rerr, stream->procedure, stream->serial);
-        remoteRemoveClientStream(client, stream);
-        if (ret < 0)
-            qemudDispatchClientFailure(client);
-        goto cleanup;
-    }
-
-    if (stream->closed) {
-        remoteRemoveClientStream(client, stream);
-    } else {
-        remoteStreamUpdateEvents(stream);
-    }
-
-cleanup:
-    virMutexUnlock(&client->lock);
-}
-
-
-/*
- * @client: a locked client object
- *
- * Invoked by the main loop when filtering incoming messages.
- *
- * Returns 1 if the message was processed, 0 if skipped,
- * -1 on fatal client error
- */
-static int
-remoteStreamFilter(struct qemud_client *client,
-                   struct qemud_client_message *msg, void *opaque)
-{
-    struct qemud_client_stream *stream = opaque;
-
-    if (msg->hdr.serial == stream->serial &&
-        msg->hdr.proc == stream->procedure &&
-        msg->hdr.type == REMOTE_STREAM) {
-        DEBUG("Incoming rx=%p serial=%d proc=%d status=%d",
-              stream->rx, msg->hdr.proc, msg->hdr.serial, msg->hdr.status);
-
-        /* If there are queued packets, we need to queue all further
-         * messages, since they must be processed strictly in order.
-         * If there are no queued packets, then OK/ERROR messages
-         * should be processed immediately. Data packets are still
-         * queued to only be processed when the stream is marked as
-         * writable.
-         */
-        if (stream->rx) {
-            qemudClientMessageQueuePush(&stream->rx, msg);
-            remoteStreamUpdateEvents(stream);
-        } else {
-            int ret = 0;
-            switch (msg->hdr.status) {
-            case REMOTE_OK:
-                ret = remoteStreamHandleFinish(client, stream, msg);
-                if (ret == 0)
-                    qemudClientMessageRelease(client, msg);
-                break;
-
-            case REMOTE_CONTINUE:
-                qemudClientMessageQueuePush(&stream->rx, msg);
-                remoteStreamUpdateEvents(stream);
-                break;
-
-            case REMOTE_ERROR:
-            default:
-                ret = remoteStreamHandleAbort(client, stream, msg);
-                if (ret == 0)
-                    qemudClientMessageRelease(client, msg);
-                break;
-            }
-
-            if (ret < 0)
-                return -1;
-        }
-        return 1;
-    }
-    return 0;
-}
-
-
-/*
- * @conn: a connection object to associate the stream with
- * @hdr: the method call to associate with the stram
- *
- * Creates a new stream for this conn
- *
- * Returns a new stream object, or NULL upon OOM
- */
-struct qemud_client_stream *
-remoteCreateClientStream(virConnectPtr conn,
-                         remote_message_header *hdr)
-{
-    struct qemud_client_stream *stream;
-
-    DEBUG("proc=%d serial=%d", hdr->proc, hdr->serial);
-
-    if (VIR_ALLOC(stream) < 0)
-        return NULL;
-
-    stream->procedure = hdr->proc;
-    stream->serial = hdr->serial;
-
-    stream->st = virStreamNew(conn, VIR_STREAM_NONBLOCK);
-    if (!stream->st) {
-        VIR_FREE(stream);
-        return NULL;
-    }
-
-    stream->filter.query = remoteStreamFilter;
-    stream->filter.opaque = stream;
-
-    return stream;
-}
-
-/*
- * @stream: an unused client stream
- *
- * Frees the memory associated with this inactive client
- * stream
- */
-void remoteFreeClientStream(struct qemud_client *client,
-                            struct qemud_client_stream *stream)
-{
-    struct qemud_client_message *msg;
-
-    if (!stream)
-        return;
-
-    DEBUG("proc=%d serial=%d", stream->procedure, stream->serial);
-
-    msg = stream->rx;
-    while (msg) {
-        struct qemud_client_message *tmp = msg->next;
-        qemudClientMessageRelease(client, msg);
-        msg = tmp;
-    }
-
-    virStreamFree(stream->st);
-    VIR_FREE(stream);
-}
-
-
-/*
- * @client: a locked client to add the stream to
- * @stream: a stream to add
- */
-int remoteAddClientStream(struct qemud_client *client,
-                          struct qemud_client_stream *stream,
-                          int transmit)
-{
-    struct qemud_client_stream *tmp = client->streams;
-
-    DEBUG("client=%p proc=%d serial=%d", client, stream->procedure, stream->serial);
-
-    if (virStreamEventAddCallback(stream->st, 0,
-                                  remoteStreamEvent, client, NULL) < 0)
-        return -1;
-
-    if (tmp) {
-        while (tmp->next)
-            tmp = tmp->next;
-        tmp->next = stream;
-    } else {
-        client->streams = stream;
-    }
-
-    stream->filter.next = client->filters;
-    client->filters = &stream->filter;
-
-    if (transmit)
-        stream->tx = 1;
-
-    remoteStreamUpdateEvents(stream);
-
-    return 0;
-}
-
-
-/*
- * @client: a locked client object
- * @procedure: procedure associated with the stream
- * @serial: serial number associated with the stream
- *
- * Finds a existing active stream
- *
- * Returns a stream object matching the procedure+serial number, or NULL
- */
-struct qemud_client_stream *
-remoteFindClientStream(struct qemud_client *client,
-                       virStreamPtr st)
-{
-    struct qemud_client_stream *stream = client->streams;
-
-    while (stream) {
-        if (stream->st == st)
-            return stream;
-        stream = stream->next;
-    }
-
-    return NULL;
-}
-
-
-/*
- * @client: a locked client object
- * @stream: an inactive, closed stream object
- *
- * Removes a stream from the list of active streams for the client
- *
- * Returns 0 if the stream was removd, -1 if it doesn't exist
- */
-int
-remoteRemoveClientStream(struct qemud_client *client,
-                         struct qemud_client_stream *stream)
-{
-    DEBUG("client=%p proc=%d serial=%d", client, stream->procedure, stream->serial);
-
-    struct qemud_client_stream *curr = client->streams;
-    struct qemud_client_stream *prev = NULL;
-    struct qemud_client_filter *filter = NULL;
-
-    if (client->filters == &stream->filter) {
-        client->filters = client->filters->next;
-    } else {
-        filter = client->filters;
-        while (filter) {
-            if (filter->next == &stream->filter) {
-                filter->next = filter->next->next;
-                break;
-            }
-        }
-    }
-
-    if (!stream->closed) {
-        virStreamEventRemoveCallback(stream->st);
-        virStreamAbort(stream->st);
-    }
-
-    while (curr) {
-        if (curr == stream) {
-            if (prev)
-                prev->next = curr->next;
-            else
-                client->streams = curr->next;
-            remoteFreeClientStream(client, stream);
-            return 0;
-        }
-        prev = curr;
-        curr = curr->next;
-    }
-    return -1;
-}
-
-
-/*
- * Returns:
- *   -1  if fatal error occurred
- *    0  if message was fully processed
- *    1  if message is still being processed
- */
-static int
-remoteStreamHandleWriteData(struct qemud_client *client,
-                            struct qemud_client_stream *stream,
-                            struct qemud_client_message *msg)
-{
-    remote_error rerr;
-    int ret;
-
-    DEBUG("stream=%p proc=%d serial=%d len=%d offset=%d",
-          stream, msg->hdr.proc, msg->hdr.serial, msg->bufferLength, msg->bufferOffset);
-
-    memset(&rerr, 0, sizeof rerr);
-
-    ret = virStreamSend(stream->st,
-                        msg->buffer + msg->bufferOffset,
-                        msg->bufferLength - msg->bufferOffset);
-
-    if (ret > 0) {
-        msg->bufferOffset += ret;
-
-        /* Partial write, so indicate we have more todo later */
-        if (msg->bufferOffset < msg->bufferLength)
-            return 1;
-    } else if (ret == -2) {
-        /* Blocking, so indicate we have more todo later */
-        return 1;
-    } else {
-        VIR_INFO0("Stream send failed");
-        stream->closed = 1;
-        remoteDispatchConnError(&rerr, client->conn);
-        return remoteSerializeReplyError(client, &rerr, &msg->hdr);
-    }
-
-    return 0;
-}
-
-
-/*
- * Process an finish handshake from the client.
- *
- * Returns a REMOTE_OK confirmation if successful, or a REMOTE_ERROR
- * if there was a stream error
- *
- * Returns 0 if successfully sent RPC reply, -1 upon fatal error
- */
-static int
-remoteStreamHandleFinish(struct qemud_client *client,
-                         struct qemud_client_stream *stream,
-                         struct qemud_client_message *msg)
-{
-    remote_error rerr;
-    int ret;
-
-    DEBUG("stream=%p proc=%d serial=%d",
-          stream, msg->hdr.proc, msg->hdr.serial);
-
-    memset(&rerr, 0, sizeof rerr);
-
-    stream->closed = 1;
-    virStreamEventRemoveCallback(stream->st);
-    ret = virStreamFinish(stream->st);
-
-    if (ret < 0) {
-        remoteDispatchConnError(&rerr, client->conn);
-        return remoteSerializeReplyError(client, &rerr, &msg->hdr);
-    } else {
-        /* Send zero-length confirm */
-        if (remoteSendStreamData(client, stream, NULL, 0) < 0)
-            return -1;
-    }
-
-    return 0;
-}
-
-
-/*
- * Process an abort request from the client.
- *
- * Returns 0 if successfully aborted, -1 upon error
- */
-static int
-remoteStreamHandleAbort(struct qemud_client *client,
-                        struct qemud_client_stream *stream,
-                        struct qemud_client_message *msg)
-{
-    remote_error rerr;
-
-    DEBUG("stream=%p proc=%d serial=%d",
-          stream, msg->hdr.proc, msg->hdr.serial);
-
-    memset(&rerr, 0, sizeof rerr);
-
-    stream->closed = 1;
-    virStreamEventRemoveCallback(stream->st);
-    virStreamAbort(stream->st);
-
-    if (msg->hdr.status == REMOTE_ERROR)
-        remoteDispatchFormatError(&rerr, "%s", _("stream aborted at client request"));
-    else {
-        VIR_WARN("unexpected stream status %d", msg->hdr.status);
-        remoteDispatchFormatError(&rerr, _("stream aborted with unexpected status %d"),
-                                  msg->hdr.status);
-    }
-
-    return remoteSerializeReplyError(client, &rerr, &msg->hdr);
-}
-
-
-
-/*
- * Called when the stream is signalled has being able to accept
- * data writes. Will process all pending incoming messages
- * until they're all gone, or I/O blocks
- *
- * Returns 0 on success, or -1 upon fatal error
- */
-static int
-remoteStreamHandleWrite(struct qemud_client *client,
-                        struct qemud_client_stream *stream)
-{
-    struct qemud_client_message *msg, *tmp;
-
-    DEBUG("stream=%p", stream);
-
-    msg = stream->rx;
-    while (msg && !stream->closed) {
-        int ret;
-        switch (msg->hdr.status) {
-        case REMOTE_OK:
-            ret = remoteStreamHandleFinish(client, stream, msg);
-            break;
-
-        case REMOTE_CONTINUE:
-            ret = remoteStreamHandleWriteData(client, stream, msg);
-            break;
-
-        case REMOTE_ERROR:
-        default:
-            ret = remoteStreamHandleAbort(client, stream, msg);
-            break;
-        }
-
-        if (ret == 0)
-            qemudClientMessageQueueServe(&stream->rx);
-        else if (ret < 0)
-            return -1;
-        else
-            break; /* still processing data */
-
-        tmp = msg->next;
-        qemudClientMessageRelease(client, msg);
-        msg = tmp;
-    }
-
-    return 0;
-}
-
-
-
-/*
- * Invoked when a stream is signalled as having data
- * available to read. This reads upto one message
- * worth of data, and then queues that for transmission
- * to the client.
- *
- * Returns 0 if data was queued for TX, or a error RPC
- * was sent, or -1 on fatal error, indicating client should
- * be killed
- */
-static int
-remoteStreamHandleRead(struct qemud_client *client,
-                       struct qemud_client_stream *stream)
-{
-    char *buffer;
-    size_t bufferLen = REMOTE_MESSAGE_PAYLOAD_MAX;
-    int ret;
-
-    DEBUG("stream=%p", stream);
-
-    /* Shouldn't ever be called unless we're marked able to
-     * transmit, but doesn't hurt to check */
-    if (!stream->tx)
-        return 0;
-
-    if (VIR_ALLOC_N(buffer, bufferLen) < 0)
-        return -1;
-
-    ret = virStreamRecv(stream->st, buffer, bufferLen);
-    if (ret == -2) {
-        /* Should never get this, since we're only called when we know
-         * we're readable, but hey things change... */
-        ret = 0;
-    } else if (ret < 0) {
-        remote_error rerr;
-        memset(&rerr, 0, sizeof rerr);
-        remoteDispatchConnError(&rerr, NULL);
-
-        ret = remoteSerializeStreamError(client, &rerr, stream->procedure, stream->serial);
-    } else {
-        stream->tx = 0;
-        if (ret == 0)
-            stream->recvEOF = 1;
-        ret = remoteSendStreamData(client, stream, buffer, ret);
-    }
-
-    VIR_FREE(buffer);
-    return ret;
-}
-
-
-/*
- * Invoked when an outgoing data packet message has been fully sent.
- * This simply re-enables TX of further data.
- *
- * The idea is to stop the daemon growing without bound due to
- * fast stream, but slow client
- */
-void
-remoteStreamMessageFinished(struct qemud_client *client,
-                            struct qemud_client_message *msg)
-{
-    struct qemud_client_stream *stream = client->streams;
-
-    while (stream) {
-        if (msg->hdr.proc == stream->procedure &&
-            msg->hdr.serial == stream->serial)
-            break;
-        stream = stream->next;
-    }
-
-    DEBUG("Message client=%p stream=%p proc=%d serial=%d", client, stream, msg->hdr.proc, msg->hdr.serial);
-
-    if (stream) {
-        stream->tx = 1;
-        remoteStreamUpdateEvents(stream);
-    }
-}

daemon/stream.h

@@ -1,54 +0,0 @@
-/*
- * stream.h: APIs for managing client streams
- *
- * Copyright (C) 2009 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
- */
-
-
-#ifndef __LIBVIRTD_STREAM_H__
-# define __LIBVIRTD_STREAM_H__
-
-# include "libvirtd.h"
-
-
-
-struct qemud_client_stream *
-remoteCreateClientStream(virConnectPtr conn,
-                         remote_message_header *hdr);
-
-void remoteFreeClientStream(struct qemud_client *client,
-                            struct qemud_client_stream *stream);
-
-int remoteAddClientStream(struct qemud_client *client,
-                          struct qemud_client_stream *stream,
-                          int transmit);
-
-struct qemud_client_stream *
-remoteFindClientStream(struct qemud_client *client,
-                       virStreamPtr stream);
-
-int
-remoteRemoveClientStream(struct qemud_client *client,
-                         struct qemud_client_stream *stream);
-
-void
-remoteStreamMessageFinished(struct qemud_client *client,
-                            struct qemud_client_message *msg);
-
-#endif /* __LIBVIRTD_STREAM_H__ */

daemon/test_libvirtd.aug

@@ -1,551 +0,0 @@
-module Test_libvirtd =
-   let conf = "# Master libvirt daemon configuration file
-#
-# For further information consult http://libvirt.org/format.html
-
-
-#################################################################
-#
-# Network connectivity controls
-#
-
-# Flag listening for secure TLS connections on the public TCP/IP port.
-# NB, must pass the --listen flag to the libvirtd process for this to
-# have any effect.
-#
-# It is necessary to setup a CA and issue server certificates before
-# using this capability.
-#
-# This is enabled by default, uncomment this to disable it
-listen_tls = 0
-
-# Listen for unencrypted TCP connections on the public TCP/IP port.
-# NB, must pass the --listen flag to the libvirtd process for this to
-# have any effect.
-#
-# Using the TCP socket requires SASL authentication by default. Only
-# SASL mechanisms which support data encryption are allowed. This is
-# DIGEST_MD5 and GSSAPI (Kerberos5)
-#
-# This is disabled by default, uncomment this to enable it.
-listen_tcp = 1
-
-
-
-# Override the port for accepting secure TLS connections
-# This can be a port number, or service name
-#
-tls_port = \"16514\"
-
-# Override the port for accepting insecure TCP connections
-# This can be a port number, or service name
-#
-tcp_port = \"16509\"
-
-
-# Override the default configuration which binds to all network
-# interfaces. This can be a numeric IPv4/6 address, or hostname
-#
-listen_addr = \"192.168.0.1\"
-
-
-# Flag toggling mDNS advertizement of the libvirt service.
-#
-# Alternatively can disable for all services on a host by
-# stopping the Avahi daemon
-#
-# This is enabled by default, uncomment this to disable it
-mdns_adv = 0
-
-# Override the default mDNS advertizement name. This must be
-# unique on the immediate broadcast network.
-#
-# The default is \"Virtualization Host HOSTNAME\", where HOSTNAME
-# is subsituted for the short hostname of the machine (without domain)
-#
-mdns_name = \"Virtualization Host Joe Demo\"
-
-
-#################################################################
-#
-# UNIX socket access controls
-#
-
-# Set the UNIX domain socket group ownership. This can be used to
-# allow a 'trusted' set of users access to management capabilities
-# without becoming root.
-#
-# This is restricted to 'root' by default.
-unix_sock_group = \"libvirt\"
-
-# Set the UNIX socket permissions for the R/O socket. This is used
-# for monitoring VM status only
-#
-# Default allows any user. If setting group ownership may want to
-# restrict this to:
-unix_sock_ro_perms = \"0777\"
-
-# Set the UNIX socket permissions for the R/W socket. This is used
-# for full management of VMs
-#
-# Default allows only root. If PolicyKit is enabled on the socket,
-# the default will change to allow everyone (eg, 0777)
-#
-# If not using PolicyKit and setting group ownership for access
-# control then you may want to relax this to:
-unix_sock_rw_perms = \"0770\"
-
-
-
-#################################################################
-#
-# Authentication.
-#
-#  - none: do not perform auth checks. If you can connect to the
-#          socket you are allowed. This is suitable if there are
-#          restrictions on connecting to the socket (eg, UNIX
-#          socket permissions), or if there is a lower layer in
-#          the network providing auth (eg, TLS/x509 certificates)
-#
-#  - sasl: use SASL infrastructure. The actual auth scheme is then
-#          controlled from /etc/sasl2/libvirt.conf. For the TCP
-#          socket only GSSAPI & DIGEST-MD5 mechanisms will be used.
-#          For non-TCP or TLS sockets,  any scheme is allowed.
-#
-#  - polkit: use PolicyKit to authenticate. This is only suitable
-#            for use on the UNIX sockets. The default policy will
-#            require a user to supply their own password to gain
-#            full read/write access (aka sudo like), while anyone
-#            is allowed read/only access.
-#
-# Set an authentication scheme for UNIX read-only sockets
-# By default socket permissions allow anyone to connect
-#
-# To restrict monitoring of domains you may wish to enable
-# an authentication mechanism here
-auth_unix_ro = \"none\"
-
-# Set an authentication scheme for UNIX read-write sockets
-# By default socket permissions only allow root. If PolicyKit
-# support was compiled into libvirt, the default will be to
-# use 'polkit' auth.
-#
-# If the unix_sock_rw_perms are changed you may wish to enable
-# an authentication mechanism here
-auth_unix_rw = \"none\"
-
-# Change the authentication scheme for TCP sockets.
-#
-# If you don't enable SASL, then all TCP traffic is cleartext.
-# Don't do this outside of a dev/test scenario. For real world
-# use, always enable SASL and use the GSSAPI or DIGEST-MD5
-# mechanism in /etc/sasl2/libvirt.conf
-auth_tcp = \"sasl\"
-
-# Change the authentication scheme for TLS sockets.
-#
-# TLS sockets already have encryption provided by the TLS
-# layer, and limited authentication is done by certificates
-#
-# It is possible to make use of any SASL authentication
-# mechanism as well, by using 'sasl' for this option
-auth_tls = \"none\"
-
-
-
-#################################################################
-#
-# TLS x509 certificate configuration
-#
-
-
-# Override the default server key file path
-#
-key_file = \"/etc/pki/libvirt/private/serverkey.pem\"
-
-# Override the default server certificate file path
-#
-cert_file = \"/etc/pki/libvirt/servercert.pem\"
-
-# Override the default CA certificate path
-#
-ca_file = \"/etc/pki/CA/cacert.pem\"
-
-# Specify a certificate revocation list.
-#
-# Defaults to not using a CRL, uncomment to enable it
-crl_file = \"/etc/pki/CA/crl.pem\"
-
-
-
-#################################################################
-#
-# Authorization controls
-#
-
-
-# Flag to disable verification of client certificates
-#
-# Client certificate verification is the primary authentication mechanism.
-# Any client which does not present a certificate signed by the CA
-# will be rejected.
-#
-# Default is to always verify. Uncommenting this will disable
-# verification - make sure an IP whitelist is set
-tls_no_verify_certificate = 1
-
-
-# A whitelist of allowed x509  Distinguished Names
-# This list may contain wildcards such as
-#
-#    \"C=GB,ST=London,L=London,O=Red Hat,CN=*\"
-#
-# See the POSIX fnmatch function for the format of the wildcards.
-#
-# NB If this is an empty list, no client can connect, so comment out
-# entirely rather than using empty list to disable these checks
-#
-# By default, no DN's are checked
-   tls_allowed_dn_list = [\"DN1\", \"DN2\"]
-
-
-# A whitelist of allowed SASL usernames. The format for usernames
-# depends on the SASL authentication mechanism. Kerberos usernames
-# look like username@REALM
-#
-# This list may contain wildcards such as
-#
-#    \"*@EXAMPLE.COM\"
-#
-# See the POSIX fnmatch function for the format of the wildcards.
-#
-# NB If this is an empty list, no client can connect, so comment out
-# entirely rather than using empty list to disable these checks
-#
-# By default, no Username's are checked
-sasl_allowed_username_list = [
-  \"joe@EXAMPLE.COM\",
-  \"fred@EXAMPLE.COM\"
-]
-
-
-#################################################################
-#
-# Processing controls
-#
-
-# The maximum number of concurrent client connections to allow
-# over all sockets combined.
-max_clients = 20
-
-
-# The minimum limit sets the number of workers to start up
-# initially. If the number of active clients exceeds this,
-# then more threads are spawned, upto max_workers limit.
-# Typically you'd want max_workers to equal maximum number
-# of clients allowed
-min_workers = 5
-max_workers = 20
-
-# Total global limit on concurrent RPC calls. Should be
-# at least as large as max_workers. Beyond this, RPC requests
-# will be read into memory and queued. This directly impact
-# memory usage, currently each request requires 256 KB of
-# memory. So by default upto 5 MB of memory is used
-max_requests = 20
-
-# Limit on concurrent requests from a single client
-# connection. To avoid one client monopolizing the server
-# this should be a small fraction of the global max_requests
-# and max_workers parameter
-max_client_requests = 5
-
-# Logging level:
-log_level = 4
-
-# Logging outputs:
-log_outputs=\"4:stderr\"
-
-# Logging filters:
-log_filters=\"a\"
-
-# Auditing:
-audit_level = 2
-"
-
-   test Libvirtd.lns get conf =
-        { "#comment" = "Master libvirt daemon configuration file" }
-        { "#comment" = "" }
-        { "#comment" = "For further information consult http://libvirt.org/format.html" }
-        { "#empty" }
-        { "#empty" }
-        { "#comment" = "################################################################" }
-        { "#comment" = "" }
-        { "#comment" = "Network connectivity controls" }
-        { "#comment" = "" }
-        { "#empty" }
-        { "#comment" = "Flag listening for secure TLS connections on the public TCP/IP port." }
-        { "#comment" = "NB, must pass the --listen flag to the libvirtd process for this to" }
-        { "#comment" = "have any effect." }
-        { "#comment" = "" }
-        { "#comment" = "It is necessary to setup a CA and issue server certificates before" }
-        { "#comment" = "using this capability." }
-        { "#comment" = "" }
-        { "#comment" = "This is enabled by default, uncomment this to disable it" }
-        { "listen_tls" = "0" }
-        { "#empty" }
-        { "#comment" = "Listen for unencrypted TCP connections on the public TCP/IP port." }
-        { "#comment" = "NB, must pass the --listen flag to the libvirtd process for this to" }
-        { "#comment" = "have any effect." }
-        { "#comment" = "" }
-        { "#comment" = "Using the TCP socket requires SASL authentication by default. Only" }
-        { "#comment" = "SASL mechanisms which support data encryption are allowed. This is" }
-        { "#comment" = "DIGEST_MD5 and GSSAPI (Kerberos5)" }
-        { "#comment" = "" }
-        { "#comment" = "This is disabled by default, uncomment this to enable it." }
-        { "listen_tcp" = "1" }
-        { "#empty" }
-        { "#empty" }
-        { "#empty" }
-        { "#comment" = "Override the port for accepting secure TLS connections" }
-        { "#comment" = "This can be a port number, or service name" }
-        { "#comment" = "" }
-        { "tls_port" = "16514" }
-        { "#empty" }
-        { "#comment" = "Override the port for accepting insecure TCP connections" }
-        { "#comment" = "This can be a port number, or service name" }
-        { "#comment" = "" }
-        { "tcp_port" = "16509" }
-        { "#empty" }
-        { "#empty" }
-        { "#comment" = "Override the default configuration which binds to all network" }
-        { "#comment" = "interfaces. This can be a numeric IPv4/6 address, or hostname" }
-        { "#comment" = "" }
-        { "listen_addr" = "192.168.0.1" }
-        { "#empty" }
-        { "#empty" }
-        { "#comment" = "Flag toggling mDNS advertizement of the libvirt service." }
-        { "#comment" = "" }
-        { "#comment" = "Alternatively can disable for all services on a host by" }
-        { "#comment" = "stopping the Avahi daemon" }
-        { "#comment" = "" }
-        { "#comment" = "This is enabled by default, uncomment this to disable it" }
-        { "mdns_adv" = "0" }
-        { "#empty" }
-        { "#comment" = "Override the default mDNS advertizement name. This must be" }
-        { "#comment" = "unique on the immediate broadcast network." }
-        { "#comment" = "" }
-        { "#comment" = "The default is \"Virtualization Host HOSTNAME\", where HOSTNAME" }
-        { "#comment" = "is subsituted for the short hostname of the machine (without domain)" }
-        { "#comment" = "" }
-        { "mdns_name" = "Virtualization Host Joe Demo" }
-        { "#empty" }
-        { "#empty" }
-        { "#comment" = "################################################################" }
-        { "#comment" = "" }
-        { "#comment" = "UNIX socket access controls" }
-        { "#comment" = "" }
-        { "#empty" }
-        { "#comment" = "Set the UNIX domain socket group ownership. This can be used to" }
-        { "#comment" = "allow a 'trusted' set of users access to management capabilities" }
-        { "#comment" = "without becoming root." }
-        { "#comment" = "" }
-        { "#comment" = "This is restricted to 'root' by default." }
-        { "unix_sock_group" = "libvirt" }
-        { "#empty" }
-        { "#comment" = "Set the UNIX socket permissions for the R/O socket. This is used" }
-        { "#comment" = "for monitoring VM status only" }
-        { "#comment" = "" }
-        { "#comment" = "Default allows any user. If setting group ownership may want to" }
-        { "#comment" = "restrict this to:" }
-        { "unix_sock_ro_perms" = "0777" }
-        { "#empty" }
-        { "#comment" = "Set the UNIX socket permissions for the R/W socket. This is used" }
-        { "#comment" = "for full management of VMs" }
-        { "#comment" = "" }
-        { "#comment" = "Default allows only root. If PolicyKit is enabled on the socket," }
-        { "#comment" = "the default will change to allow everyone (eg, 0777)" }
-        { "#comment" = "" }
-        { "#comment" = "If not using PolicyKit and setting group ownership for access" }
-        { "#comment" = "control then you may want to relax this to:" }
-        { "unix_sock_rw_perms" = "0770" }
-        { "#empty" }
-        { "#empty" }
-        { "#empty" }
-        { "#comment" = "################################################################" }
-        { "#comment" = "" }
-        { "#comment" = "Authentication." }
-        { "#comment" = "" }
-        { "#comment" = "- none: do not perform auth checks. If you can connect to the" }
-        { "#comment" = "socket you are allowed. This is suitable if there are" }
-        { "#comment" = "restrictions on connecting to the socket (eg, UNIX" }
-        { "#comment" = "socket permissions), or if there is a lower layer in" }
-        { "#comment" = "the network providing auth (eg, TLS/x509 certificates)" }
-        { "#comment" = "" }
-        { "#comment" = "- sasl: use SASL infrastructure. The actual auth scheme is then" }
-        { "#comment" = "controlled from /etc/sasl2/libvirt.conf. For the TCP" }
-        { "#comment" = "socket only GSSAPI & DIGEST-MD5 mechanisms will be used." }
-        { "#comment" = "For non-TCP or TLS sockets,  any scheme is allowed." }
-        { "#comment" = "" }
-        { "#comment" = "- polkit: use PolicyKit to authenticate. This is only suitable" }
-        { "#comment" = "for use on the UNIX sockets. The default policy will" }
-        { "#comment" = "require a user to supply their own password to gain" }
-        { "#comment" = "full read/write access (aka sudo like), while anyone" }
-        { "#comment" = "is allowed read/only access." }
-        { "#comment" = "" }
-        { "#comment" = "Set an authentication scheme for UNIX read-only sockets" }
-        { "#comment" = "By default socket permissions allow anyone to connect" }
-        { "#comment" = "" }
-        { "#comment" = "To restrict monitoring of domains you may wish to enable" }
-        { "#comment" = "an authentication mechanism here" }
-        { "auth_unix_ro" = "none" }
-        { "#empty" }
-        { "#comment" = "Set an authentication scheme for UNIX read-write sockets" }
-        { "#comment" = "By default socket permissions only allow root. If PolicyKit" }
-        { "#comment" = "support was compiled into libvirt, the default will be to" }
-        { "#comment" = "use 'polkit' auth." }
-        { "#comment" = "" }
-        { "#comment" = "If the unix_sock_rw_perms are changed you may wish to enable" }
-        { "#comment" = "an authentication mechanism here" }
-        { "auth_unix_rw" = "none" }
-        { "#empty" }
-        { "#comment" = "Change the authentication scheme for TCP sockets." }
-        { "#comment" = "" }
-        { "#comment" = "If you don't enable SASL, then all TCP traffic is cleartext." }
-        { "#comment" = "Don't do this outside of a dev/test scenario. For real world" }
-        { "#comment" = "use, always enable SASL and use the GSSAPI or DIGEST-MD5" }
-        { "#comment" = "mechanism in /etc/sasl2/libvirt.conf" }
-        { "auth_tcp" = "sasl" }
-        { "#empty" }
-        { "#comment" = "Change the authentication scheme for TLS sockets." }
-        { "#comment" = "" }
-        { "#comment" = "TLS sockets already have encryption provided by the TLS" }
-        { "#comment" = "layer, and limited authentication is done by certificates" }
-        { "#comment" = "" }
-        { "#comment" = "It is possible to make use of any SASL authentication" }
-        { "#comment" = "mechanism as well, by using 'sasl' for this option" }
-        { "auth_tls" = "none" }
-        { "#empty" }
-        { "#empty" }
-        { "#empty" }
-        { "#comment" = "################################################################" }
-        { "#comment" = "" }
-        { "#comment" = "TLS x509 certificate configuration" }
-        { "#comment" = "" }
-        { "#empty" }
-        { "#empty" }
-        { "#comment" = "Override the default server key file path" }
-        { "#comment" = "" }
-        { "key_file" = "/etc/pki/libvirt/private/serverkey.pem" }
-        { "#empty" }
-        { "#comment" = "Override the default server certificate file path" }
-        { "#comment" = "" }
-        { "cert_file" = "/etc/pki/libvirt/servercert.pem" }
-        { "#empty" }
-        { "#comment" = "Override the default CA certificate path" }
-        { "#comment" = "" }
-        { "ca_file" = "/etc/pki/CA/cacert.pem" }
-        { "#empty" }
-        { "#comment" = "Specify a certificate revocation list." }
-        { "#comment" = "" }
-        { "#comment" = "Defaults to not using a CRL, uncomment to enable it" }
-        { "crl_file" = "/etc/pki/CA/crl.pem" }
-        { "#empty" }
-        { "#empty" }
-        { "#empty" }
-        { "#comment" = "################################################################" }
-        { "#comment" = "" }
-        { "#comment" = "Authorization controls" }
-        { "#comment" = "" }
-        { "#empty" }
-        { "#empty" }
-        { "#comment" = "Flag to disable verification of client certificates" }
-        { "#comment" = "" }
-        { "#comment" = "Client certificate verification is the primary authentication mechanism." }
-        { "#comment" = "Any client which does not present a certificate signed by the CA" }
-        { "#comment" = "will be rejected." }
-        { "#comment" = "" }
-        { "#comment" = "Default is to always verify. Uncommenting this will disable" }
-        { "#comment" = "verification - make sure an IP whitelist is set" }
-        { "tls_no_verify_certificate" = "1" }
-        { "#empty" }
-        { "#empty" }
-        { "#comment" = "A whitelist of allowed x509  Distinguished Names" }
-        { "#comment" = "This list may contain wildcards such as" }
-        { "#comment" = "" }
-        { "#comment" = "\"C=GB,ST=London,L=London,O=Red Hat,CN=*\"" }
-        { "#comment" = "" }
-        { "#comment" = "See the POSIX fnmatch function for the format of the wildcards." }
-        { "#comment" = "" }
-        { "#comment" = "NB If this is an empty list, no client can connect, so comment out" }
-        { "#comment" = "entirely rather than using empty list to disable these checks" }
-        { "#comment" = "" }
-        { "#comment" = "By default, no DN's are checked" }
-        { "tls_allowed_dn_list"
-             { "1" = "DN1"}
-             { "2" = "DN2"}
-        }
-        { "#empty" }
-        { "#empty" }
-        { "#comment" = "A whitelist of allowed SASL usernames. The format for usernames" }
-        { "#comment" = "depends on the SASL authentication mechanism. Kerberos usernames" }
-        { "#comment" = "look like username@REALM" }
-        { "#comment" = "" }
-        { "#comment" = "This list may contain wildcards such as" }
-        { "#comment" = "" }
-        { "#comment" = "\"*@EXAMPLE.COM\"" }
-        { "#comment" = "" }
-        { "#comment" = "See the POSIX fnmatch function for the format of the wildcards." }
-        { "#comment" = "" }
-        { "#comment" = "NB If this is an empty list, no client can connect, so comment out" }
-        { "#comment" = "entirely rather than using empty list to disable these checks" }
-        { "#comment" = "" }
-        { "#comment" = "By default, no Username's are checked" }
-        { "sasl_allowed_username_list"
-             { "1" = "joe@EXAMPLE.COM" }
-             { "2" = "fred@EXAMPLE.COM" }
-        }
-        { "#empty" }
-        { "#empty" }
-        { "#comment" = "################################################################"}
-        { "#comment" = ""}
-        { "#comment" = "Processing controls"}
-        { "#comment" = ""}
-        { "#empty" }
-        { "#comment" = "The maximum number of concurrent client connections to allow"}
-        { "#comment" = "over all sockets combined."}
-        { "max_clients" = "20" }
-        { "#empty" }
-        { "#empty" }
-        { "#comment" = "The minimum limit sets the number of workers to start up"}
-        { "#comment" = "initially. If the number of active clients exceeds this,"}
-        { "#comment" = "then more threads are spawned, upto max_workers limit."}
-        { "#comment" = "Typically you'd want max_workers to equal maximum number"}
-        { "#comment" = "of clients allowed"}
-        { "min_workers" = "5" }
-        { "max_workers" = "20" }
-	{ "#empty" }
-        { "#comment" = "Total global limit on concurrent RPC calls. Should be" }
-        { "#comment" = "at least as large as max_workers. Beyond this, RPC requests" }
-        { "#comment" = "will be read into memory and queued. This directly impact" }
-        { "#comment" = "memory usage, currently each request requires 256 KB of" }
-        { "#comment" = "memory. So by default upto 5 MB of memory is used" }
-        { "max_requests" = "20" }
-	{ "#empty" }
-        { "#comment" = "Limit on concurrent requests from a single client" }
-        { "#comment" = "connection. To avoid one client monopolizing the server" }
-        { "#comment" = "this should be a small fraction of the global max_requests" }
-        { "#comment" = "and max_workers parameter" }
-        { "max_client_requests" = "5" }
-	{ "#empty" }
-        { "#comment" = "Logging level:" }
-        { "log_level" = "4" }
-	{ "#empty" }
-        { "#comment" = "Logging outputs:" }
-        { "log_outputs" = "4:stderr" }
-	{ "#empty" }
-        { "#comment" = "Logging filters:" }
-        { "log_filters" = "a" }
-	{ "#empty" }
-        { "#comment" = "Auditing:" }
-        { "audit_level" = "2" }

docs/.gitignore

@@ -1,8 +0,0 @@
-Makefile
-Makefile.in
-.memdump
-apibuild.pyc
-*.html
-libvirt-api.xml
-libvirt-refs.xml
-todo.html.in

docs/Makefile.am

@@ -1,205 +0,0 @@
-## Process this file with automake to produce Makefile.in
-SUBDIRS= schemas
-
-PERL = perl
-
-# The directory containing the source code (if it contains documentation).
-DOC_SOURCE_DIR=../src
-
-DEVHELP_DIR=$(datadir)/gtk-doc/html/libvirt
-
-apihtml =			\
-  html/index.html		\
-  html/libvirt-libvirt.html	\
-  html/libvirt-virterror.html
-
-apipng =	\
-  html/left.png	\
-  html/up.png	\
-  html/home.png	\
-  html/right.png
-
-devhelphtml =			\
-  devhelp/libvirt.devhelp	\
-  devhelp/index.html		\
-  devhelp/general.html		\
-  devhelp/libvirt-libvirt.html	\
-  devhelp/libvirt-virterror.html
-
-css =         \
-  generic.css \
-  libvirt.css \
-  main.css
-
-devhelppng =		\
-  devhelp/home.png	\
-  devhelp/left.png	\
-  devhelp/right.png	\
-  devhelp/up.png
-
-devhelpcss = devhelp/style.css
-
-devhelpxsl = devhelp/devhelp.xsl devhelp/html.xsl
-
-png = \
-  32favicon.png \
-  footer_corner.png \
-  footer_pattern.png \
-  libvirt-header-bg.png \
-  libvirt-header-logo.png \
-  libvirtLogo.png \
-  libvirt-net-logical.png \
-  libvirt-net-physical.png \
-  libvirt-daemon-arch.png \
-  libvirt-driver-arch.png \
-  libvirt-object-model.png \
-  madeWith.png \
-  et.png
-
-gif = \
-  architecture.gif \
-  node.gif
-
-dot_html_in = $(notdir $(wildcard $(srcdir)/*.html.in)) todo.html.in \
-      $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/internals/*.html.in))
-dot_html = $(dot_html_in:%.html.in=%.html)
-
-patches = $(wildcard api_extension/*.patch)
-
-xml = \
-  libvirt-api.xml \
-  libvirt-refs.xml
-
-fig = \
-  libvirt-net-logical.fig \
-  libvirt-net-physical.fig \
-  libvirt-daemon-arch.fig \
-  libvirt-driver-arch.fig \
-  libvirt-object-model.fig
-
-EXTRA_DIST=					\
-  apibuild.py \
-  site.xsl newapi.xsl news.xsl page.xsl \
-  hacking1.xsl hacking2.xsl wrapstring.xsl \
-  $(dot_html) $(dot_html_in) $(gif) $(apihtml) $(apipng) \
-  $(devhelphtml) $(devhelppng) $(devhelpcss) $(devhelpxsl) \
-  $(xml) $(fig) $(png) $(css) \
-  $(patches) \
-  sitemap.html.in \
-  todo.pl todo.cfg-example
-
-MAINTAINERCLEANFILES = $(dot_html) $(apihtml) $(devhelphtml)
-
-all: web
-
-api: libvirt-api.xml libvirt-refs.xml
-
-web: $(dot_html) html/index.html devhelp/index.html
-
-todo.html.in: todo.pl
-	if [ -f  todo.cfg ]; then \
-		echo "Generating $@"; \
-		$(PERL) $(srcdir)/$< > $@ \
-		|| { rm $@ && exit 1; }; \
-	else \
-		echo "Stubbing $@"; \
-		echo "<html><body><h1>Todo list</h1></body></html>" > $@ ; \
-	fi
-
-todo:
-	rm -f todo.html.in
-	$(MAKE) todo.html
-
-.PHONY: todo
-
-%.png: %.fig
-	convert -rotate 90 $< $@
-
-internals/%.html.tmp: internals/%.html.in subsite.xsl page.xsl sitemap.html.in
-	@if [ -x $(XSLTPROC) ] ; then \
-	  echo "Generating $@"; \
-	  $(MKDIR_P) "$(builddir)/internals"; \
-	  name=`echo $@ | sed -e 's/.tmp//'`; \
-	  $(XSLTPROC) --stringparam pagename $$name --nonet --html \
-	    $(top_srcdir)/docs/subsite.xsl $< > $@ \
-	    || { rm $@ && exit 1; }; fi
-
-%.html.tmp: %.html.in site.xsl page.xsl sitemap.html.in
-	@if [ -x $(XSLTPROC) ] ; then \
-	  echo "Generating $@"; \
-	  name=`echo $@ | sed -e 's/.tmp//'`; \
-	  $(XSLTPROC) --stringparam pagename $$name --nonet --html \
-	    $(top_srcdir)/docs/site.xsl $< > $@ \
-	    || { rm $@ && exit 1; }; fi
-
-%.html: %.html.tmp
-	@if test -x $(XMLLINT) && test -x $(XMLCATALOG) ; then \
-	  if $(XMLCATALOG) '$(XML_CATALOG_FILE)' \
-	    "-//W3C//DTD XHTML 1.0 Strict//EN" > /dev/null ; then \
-	  echo "Validating $@" ; \
-	  SGML_CATALOG_FILES='$(XML_CATALOG_FILE)' \
-	  $(XMLLINT) --catalogs --nonet --format --valid $< > $@ \
-	  || { rm $@ && exit 1; }; \
-	  else echo "missing XHTML1 DTD" ; fi ; fi
-
-
-html/index.html: libvirt-api.xml newapi.xsl page.xsl sitemap.html.in
-	-@if [ -x $(XSLTPROC) ] ; then \
-	  echo "Rebuilding the HTML pages from the XML API" ; \
-	  $(XSLTPROC) --nonet $(srcdir)/newapi.xsl libvirt-api.xml ; fi
-	-@if test -x $(XMLLINT) && test -x $(XMLCATALOG) ; then \
-	  if $(XMLCATALOG) '$(XML_CATALOG_FILE)' "-//W3C//DTD XHTML 1.0 Strict//EN" \
-	    > /dev/null ; then \
-	  echo "Validating the resulting XHTML pages" ; \
-	  SGML_CATALOG_FILES='$(XML_CATALOG_FILE)' \
-	  $(XMLLINT) --catalogs --nonet --valid --noout html/*.html ; \
-	  else echo "missing XHTML1 DTD" ; fi ; fi
-
-$(addprefix $(srcdir)/,$(devhelphtml)): $(srcdir)/libvirt-api.xml $(devhelpxsl)
-	-@echo Rebuilding devhelp files
-	-@if [ -x $(XSLTPROC) ] ; then \
-	  $(XSLTPROC) --nonet -o devhelp/libvirt.devhelp \
-	  $(top_srcdir)/docs/devhelp/devhelp.xsl libvirt-api.xml ; fi
-
-python_generated_files = \
-		$(srcdir)/html/libvirt-libvirt.html \
-		$(srcdir)/html/libvirt-virterror.html \
-		$(srcdir)/libvirt-api.xml \
-		$(srcdir)/libvirt-refs.xml
-
-$(python_generated_files): $(srcdir)/apibuild.py \
-		$(srcdir)/../include/libvirt/*.h \
-		$(srcdir)/../src/libvirt.c \
-		$(srcdir)/../src/util/virterror.c
-	-srcdir=$(srcdir) $(srcdir)/apibuild.py
-
-check-local: all
-
-clean-local:
-	rm -f *~ *.bak *.hierarchy *.signals *-unused.txt *.html
-
-maintainer-clean-local: clean-local
-	rm -rf libvirt-api.xml libvirt-refs.xml todo.html.in
-
-rebuild: api all
-
-install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(HTML_DIR)
-	for f in $(css) $(dot_html) $(gif) $(png); do \
-	  $(INSTALL) -m 0644 $(srcdir)/$$f $(DESTDIR)$(HTML_DIR); done
-	$(mkinstalldirs) $(DESTDIR)$(HTML_DIR)/html
-	for h in $(apihtml); do \
-	  $(INSTALL) -m 0644 $(srcdir)/$$h $(DESTDIR)$(HTML_DIR)/html; done
-	for p in $(apipng); do \
-	  $(INSTALL) -m 0644 $(srcdir)/$$p $(DESTDIR)$(HTML_DIR)/html; done
-	$(mkinstalldirs) $(DESTDIR)$(DEVHELP_DIR)
-	for file in $(devhelphtml) $(devhelppng) $(devhelpcss); do \
-	    $(INSTALL) -m 0644 $(srcdir)/$${file} $(DESTDIR)$(DEVHELP_DIR) ; \
-	done
-
-uninstall-local:
-	for h in $(apihtml); do rm $(DESTDIR)$(HTML_DIR)/$$h; done
-	for p in $(apipng); do rm $(DESTDIR)$(HTML_DIR)/$$p; done
-	for f in $(devhelphtml) $(devhelppng) $(devhelpcss); do \
-	  rm $(DESTDIR)$(DEVHELP_DIR)/$$(basename $$f); \
-	done

docs/api.html.in

@@ -1,125 +0,0 @@
-<?xml version="1.0"?>
-<html>
-  <body>
-    <h1>The libvirt API concepts</h1>
-
-    <p> This page describes the main principles and architecture choices
-    behind the definition of the libvirt API:
-
-    <ul id="toc"></ul>
-
-    <h2><a name="Objects">Objects exposed</a></h2>
-    <p> As defined in the <a href="goals.html">goals section</a>, libvirt
-    API need to expose all the resources needed to manage the virtualization
-    support of recent operating systems. The first object manipulated though
-    the API is <code>virConnectPtr</code> which represent a connection to
-    an hypervisor. Any application using libvirt is likely to start using the
-    API by calling one of <a href="html/libvirt-libvirt.html#virConnectOpen"
-    >the virConnectOpen functions</a>. You will note that those functions take
-    a name argument which is actually an URI to select the right hypervisor to
-    open, this is needed to allow remote connections and also select between
-    different possible hypervisors (for example on a Linux system it may be
-    possible to use both KVM and LinuxContainers on the same node). A NULL
-    name will default to a preselected hypervisor but it's probably not a
-    wise thing to do in most cases. See the <a href="uri.html">connection
-    URI</a> page for a full descriptions of the values allowed.<p>
-    <p> Once the application obtained a <code class='docref'>virConnectPtr</code>
-    connection to the
-    hypervisor it can then use it to manage domains and related resources
-    available for virtualization like storage and networking. All those are
-    exposed as first class objects, and connected to the hypervisor connection
-    (and the node or cluster where it is available).</p>
-    <p class="image">
-      <img alt="first class objects exposed by the API"
-           src="libvirt-object-model.png"/>
-    </p>
-    <p> The figure above shows the five main objects exported by the API:</p>
-    <ul>
-      <li>virConnectPtr: represent a connection to an hypervisor.</li>
-      <li>virDomainPtr: represent one domain either active or defined (i.e.
-      existing as permanent config file and storage but not currently running
-      on that node). The function <code class='docref'>virConnectListDomains</code>
-      allows to list all the IDs for the domains active on this hypervisor.</li>
-      <li>virNetworkPtr: represent one network either active or defined (i.e.
-      existing as permanent config file and storage but not currently activated.
-      The function <code class='docref'>virConnectListNetworks</code>
-      allows to list all the virtualization networks actived on this node.</li>
-      <li>virStorageVolPtr: represent one storage volume, usually this is used
-      as a block device available to one of the domains. The function
-      <code class="docref">virStorageVolLookupByPath</code> allows to find
-      the object based on its path on the node.</li>
-      <li>virStoragePoolPtr: represent a storage pool, i.e. a logical area
-      which can be used to allocate and store storage volumes. The function
-      <code class="docref">virStoragePoolLookupByVolume</code> allows to find
-      the storage pool containing a given storage volume.</li>
-    </ul>
-    <p> Most object manipulated by the library can also be represented using
-      XML descriptions. This is used primarily to create those object, but is
-      also helpful to modify or save their description back.</p>
-    <p> Domains, network and storage pools can be either <code>active</code>
-      i.e. either running or available for immediate use, or
-      <code>defined</code> in which case they are inactive but there is
-      a permanent definition available in the system for them. Based on this
-      thay can be activated dynamically in order to be used.</p>
-    <p> Most kind of object can also be named in various ways:<p>
-    <ul>
-      <li>by their <code>name</code>, an user friendly identifier but
-      whose unicity cannot be garanteed between two nodes.</li>
-      <li>by their <code>ID</code>, which is a runtime unique identifier
-      provided by the hypervisor for one given activation of the object,
-      but it becomes invalid once the resource is deactivated.</li >
-      <li>by their <code>UUID</code>, a 16 bytes unique identifier
-      as defined in <a href="http://www.ietf.org/rfc/rfc4122.txt">RFC 4122</a>,
-      which is garanteed to be unique for long term usage and across a
-      set of nodes.</li>
-    </ul>
-
-    <h2><a name="Functions">Functions and naming
-      conventions</a></h2>
-    <p> The naming of the functions present in the library is usually
-      made of a prefix describing the object associated to the function
-      and a verb describing the action on that object.</p>
-    <p> For each first class object you will find apis
-      for the following actions:</p>
-    <ul>
-      <li><b>Lookup</b>:...LookupByName,
-      <li><b>Enumeration</b>:virConnectList... and virConnectNumOf...:
-        those are used to enumerate a set of object available to an given
-        hypervisor connection like:
-        <code class='docref'>virConnectListDomains</code>,
-        <code class='docref'>virConnectNumOfDomains</code>,
-        <code class='docref'>virConnectListNetworks</code>,
-        <code class='docref'>virConnectListStoragePools</code>, etc.</li>
-      <li><b>Description</b>: ...GetInfo: those are generic accessor providing
-        a set of informations about an object, they are
-        <code class='docref'>virNodeGetInfo</code>,
-        <code class='docref'>virDomainGetInfo</code>,
-        <code class='docref'>virStoragePoolGetInfo</code>,
-        <code class='docref'>virStorageVolGetInfo</code>.</li>
-      <li><b>Accessors</b>: ...Get... and ...Set...: those are more specific
-        accessors to query or modify the given object, like
-        <code class='docref'>virConnectGetType</code>,
-        <code class='docref'>virDomainGetMaxMemory</code>,
-        <code class='docref'>virDomainSetMemory</code>,
-        <code class='docref'>virDomainGetVcpus</code>,
-        <code class='docref'>virStoragePoolSetAutostart</code>,
-        <code class='docref'>virNetworkGetBridgeName</code>, etc.</li>
-      <li><b>Creation</b>: </li>
-      <li><b>Destruction</b>: ... </li>
-    </ul>
-    <p> For more in-depth details of the storage related APIs see
-      <a href="storage.html">the storage management page</a>,
-    <h2><a name="Driver">The libvirt drivers</a></h2>
-    <p></p>
-    <p class="image">
-      <img alt="The libvirt driver architecture"
-           src="libvirt-driver-arch.png"/>
-    </p>
-    <h2><a name="Remote">Daemon and remote access</a></h2>
-    <p></p>
-    <p class="image">
-      <img alt="The libvirt daemon and remote architecture"
-           src="libvirt-daemon-arch.png"/>
-    </p>
-  </body>
-</html>

docs/api_extension.html.in

@@ -1,433 +0,0 @@
-<html>
-  <head>
-    <title>Implementing a new API in Libvirt</title>
-  </head>
-
-  <body>
-    <h1>Implementing a new API in Libvirt</h1>
-
-    <ul id="toc"></ul>
-
-    <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.
-    </p>
-
-    <p>
-      Before you begin coding, it is critical that you propose your
-      changes on the libvirt mailing list and get feedback on your ideas to
-      make sure what you're proposing fits with the general direction of the
-      project.  Even before doing a proof of concept implementation, send an
-      email giving an overview of the functionality you think should be
-      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.
-    </p>
-
-    <p>
-      Adding a new API to libvirt is not difficult, but there are quite a
-      few steps.  This document assumes that you are familiar with C
-      programming and have checked out the libvirt code from the source code
-      repository and successfully built the existing tree.  Instructions on
-      how to check out and build the code can be found at:
-    </p>
-
-    <p>
-      <a href="http://libvirt.org/downloads.html">http://libvirt.org/downloads.html</a>
-    </p>
-
-    <p>
-      Once you have a working development environment, the steps to create a
-      new API are:
-    </p>
-    <ol>
-      <li>define the public API</li>
-      <li>define the internal driver API</li>
-      <li>implement the public API</li>
-      <li>implement the remote protocol:
-        <ol>
-          <li>define the wire protocol format</li>
-          <li>implement the RPC client</li>
-          <li>implement the server side dispatcher</li>
-        </ol>
-      </li>
-      <li>use new API where appropriate in drivers</li>
-      <li>add virsh support</li>
-      <li>add common handling for new API</li>
-      <li>for each driver that can support the new API:
-        <ol>
-          <li>add prerequisite support</li>
-          <li>fully implement new API</li>
-        </ol>
-      </li>
-    </ol>
-
-    <p>
-      It is, of course, possible to implement the pieces in any order, but
-      if the development tasks are completed in the order listed, the code
-      will compile after each step.  Given the number of changes required,
-      verification after each step is highly recommended.
-    </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
-      that were accepted upstream during your development.
-    </p>
-
-    <p>
-      Don't mix anything else into the patches you submit.  The patches
-      should be the minimal changes required to implement the functionality
-      you're adding.  If you notice a bug in unrelated code (i.e., code you
-      don't have to touch to implement your API change) during development,
-      create a patch that just addresses that bug and submit it
-      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
-      involves an XML extension, you have to enhance the RelaxNG
-      schema and document the new elements or attributes:</p>
-
-    <p><code>
-        docs/schemas/domain.rng<br/>
-        docs/formatdomain.html.in
-    </code></p>
-
-    <p>If the API extension involves a new function, you have to add a
-      declaration in the public header, and arrange to export the
-      function name (symbol) so other programs can link against the
-      libvirt library and call the new function:</p>
-
-    <p><code>
-        include/libvirt/libvirt.h.in
-        src/libvirt_public.syms
-    </code></p>
-
-    <p>
-      This task is in many ways the most important to get right, since once
-      the API has been committed to the repository, it's libvirt's policy
-      never to change it.  Mistakes in the implementation are bugs that you
-      can fix.  Make a mistake in the API definition and you're stuck with
-      it, so think carefully about the interface and don't be afraid to
-      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>
-      Each public API call is associated with a driver, such as a host
-      virtualization driver, a network virtualization driver, a storage
-      virtualization driver, a state driver, or a device monitor.  Adding
-      the internal API is ordinarily a matter of adding a new member to the
-      struct representing one of these drivers.
-    </p>
-
-    <p>
-      Of course, it's possible that the new API will involve the creation of
-      an entirely new driver type, in which case the changes will include the
-      creation of a new struct type to represent the new driver type.
-    </p>
-
-    <p>The driver structs are defined in:</p>
-
-    <p><code>src/driver.h</code></p>
-
-    <p>
-      To define the internal API, first typedef the driver function
-      prototype and then add a new field for it to the relevant driver
-      struct.  Then, update all existing instances of the driver to
-      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>
-      Implementing the public API is largely a formality in which we wire up
-      public API to the internal driver API.  The public API implementation
-      takes care of some basic validity checks before passing control to the
-      driver implementation.  In RFC 2119 vocabulary, this function:
-    </p>
-
-    <ol class="ordinarylist">
-      <li>SHOULD log a message with VIR_DEBUG() indicating that it is
-        being called and its parameters;</li>
-      <li>MUST call virResetLastError();</li>
-      <li>SHOULD confirm that the connection is valid with
-        VIR_IS_CONNECT(conn);</li>
-      <li><strong>SECURITY: If the API requires a connection with write
-          privileges, MUST confirm that the connection flags do not
-          indicate that the connection is read-only;</strong></li>
-      <li>SHOULD do basic validation of the parameters that are being
-        passed in;</li>
-      <li>MUST confirm that the driver for this connection exists and that
-        it implements this function;</li>
-      <li>MUST call the internal API;</li>
-      <li>SHOULD log a message with VIR_DEBUG() indicating that it is
-        returning, its return value, and status.</li>
-      <li>MUST return status to the caller.</li>
-    </ol>
-
-    <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>
-
-    <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.
-    </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>
-      Defining the wire protocol involves making additions to:
-    </p>
-
-    <p><code>src/remote/remote_protocol.x</code></p>
-
-    <p>
-      First, create two new structs for each new function that you're adding
-      to the API.  One struct describes the parameters to be passed to the
-      remote function, and a second struct describes the value returned by
-      the remote function.  The one exception to this rule is that functions
-      that return only 0 or -1 for status do not require a struct for returned
-      data.
-    </p>
-
-    <p>
-      Second, add values to the remote_procedure enum for each new function
-      added to the API.
-    </p>
-
-    <p>
-      Once these changes are in place, it's necessary to run 'make rpcgen'
-      in the src directory to create the .c and .h files required by the
-      remote protocol code. This must be done on a Linux host using the
-      GLibC rpcgen program. Other rpcgen versions may generate code which
-      results in bogus compile time warnings.  This regenerates the
-      following files:
-    </p>
-
-    <p><code>
-        daemon/remote_dispatch_args.h
-        daemon/remote_dispatch_prototypes.h
-        daemon/remote_dispatch_table.h
-        src/remote/remote_protocol.c
-        src/remote/remote_protocol.h
-    </code></p>
-
-    <h3><a name='rpcclient'>Implement the RPC client</a></h3>
-
-    <p>
-      Implementing the uses the rpcgen generated .h files.  The remote
-      method calls go in:
-    </p>
-
-    <p><code>src/remote/remote_internal.c</code></p>
-
-    <p>Each remote method invocation does the following:</p>
-
-    <ol class="ordinarylist">
-      <li>locks the remote driver;</li>
-      <li>sets up the method arguments;</li>
-      <li>invokes the remote function;</li>
-      <li>checks the return value, if necessary;</li>
-      <li>extracts any returned data;</li>
-      <li>frees any returned data;</li>
-      <li>unlocks the remote driver.</li>
-    </ol>
-
-    <h3><a name="serverdispatch">Implement the server side dispatcher</a></h3>
-
-    <p>
-      Implementing the server side of the remote function call is simply a
-      matter of deserializing the parameters passed in from the remote
-      caller and passing them to the corresponding internal API function.
-      The server side dispatchers are implemented in:
-    </p>
-
-    <p><code>daemon/remote.c</code></p>
-
-    <p>Again, this step uses the .h files generated by make rpcgen.</p>
-
-    <p>
-      After all three pieces of the remote protocol are complete, and
-      the generated files have been updated, it will be necessary to
-      update the file:</p>
-
-    <p><code>src/remote_protocol-structs</code></p>
-
-    <p>
-      This file should only have new lines added; modifications to
-      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 name="internaluseapi">Use the new API internally</a></h2>
-
-    <p>
-      Sometimes, a new API serves as a superset of existing API, by
-      adding more granularity in what can be managed.  When this is
-      the case, it makes sense to share a common implementation by
-      making the older API become a trivial wrapper around the new
-      API, rather than duplicating the common code.  This step should
-      not introduce any semantic differences for the old API, and is
-      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 name="virshuseapi">Expose the new API in virsh</a></h2>
-
-    <p>
-      All new API should be manageable from the virsh command line
-      shell.  This proves that the API is sufficient for the intended
-      purpose, and helps to identify whether the proposed API needs
-      slight changes for easier usage.  However, remember that virsh
-      is used to connect to hosts running older versions of libvirtd,
-      so new commands should have fallbacks to an older API if
-      possible; implementing the virsh hooks at this point makes it
-      very easy to test these fallbacks.  Also remember to document
-      virsh additions.
-    </p>
-
-    <p>
-      A virsh command is composed of a few pieces of code.  You need to
-      define an array of vshCmdInfo structs for each new command that
-      contain the help text and the command description text.  You also need
-      an array of vshCmdOptDef structs to describe the command options.
-      Once you have those pieces in place you can write the function
-      implementing the virsh command.  Finally, you need to add the new
-      command to the commands[] array.  The following files need changes:
-    </p>
-
-    <p><code>
-        tools/virsh.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 name="driverimpl">Implement the driver methods</a></h2>
-
-    <p>
-      So, after all that, we get to the fun part.  All functionality in
-      libvirt is implemented inside a driver.  Thus, here is where you
-      implement whatever functionality you're adding to libvirt.  You'll
-      either need to add additional files to the src directory or extend
-      files that are already there, depending on what functionality you're
-      adding.
-    </p>
-
-    <h3><a name="commonimpl">Implement common handling</a></h3>
-
-    <p>
-      If the new API is applicable to more than one driver, it may
-      make sense to provide some utility routines, or to factor some
-      of the work into the dispatcher, to avoid reimplementing the
-      same code in every driver.  In the example code, this involved
-      adding a member to the virDomainDefPtr struct for mapping
-      between the XML API addition and the in-memory representation of
-      a domain, along with updating all clients to use the new member.
-      Up to this point, there have been no changes to existing
-      semantics, and the new APIs will fail unless they are used in
-      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 name="drivercode">Implement driver handling</a></h3>
-
-    <p>
-      The remaining patches should only touch one driver at a time.
-      It is possible to implement all changes for a driver in one
-      patch, but for review purposes it may still make sense to break
-      things into simpler steps.  Here is where the new APIs finally
-      start working.
-    </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:
-    </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.
-    </p>
-
-    <p>
-      Once you have working functionality, run make check and make
-      syntax-check on each patch of the series before submitting
-      patches.  It may also be worth writing tests for the libvirt-TCK
-      testsuite to exercise your new API, although those patches are
-      not kept in the libvirt repository.
-    </p>
-  </body>
-</html>

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;
-+    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;
-+    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) {
--        virBufferVSprintf(&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;
--        virBufferVSprintf(&buf, "  <vcpu cpuset='%s'>%lu</vcpu>\n",
--                          cpumask, def->vcpus);
-+        virBufferVSprintf(&buf, " cpuset='%s'", cpumask);
-         VIR_FREE(cpumask);
-     }
-+    if (def->vcpus != def->maxvcpus)
-+        virBufferVSprintf(&buf, " current='%u'", def->vcpus);
-+    virBufferVSprintf(&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;
-     }
-
--    virBufferVSprintf(&buffer, "numvcpus = \"%d\"\n", (int)def->vcpus);
-+    virBufferVSprintf(&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;
--    virBufferVSprintf(&buf,"#OpenNebula Template automatically generated by libvirt\nNAME = %s\nCPU = %ld\nMEMORY = %ld\n",
-+    virBufferVSprintf(&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;
-
--    virBufferVSprintf(&buf, "%lu", def->vcpus);
-+    virBufferVSprintf(&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,
-             virBufferVSprintf(&buf, ",threads=%u", def->cpu->threads);
-         }
-         else {
--            virBufferVSprintf(&buf, ",sockets=%lu", def->vcpus);
-+            virBufferVSprintf(&buf, ",sockets=%u", def->maxvcpus);
-             virBufferVSprintf(&buf, ",cores=%u", 1);
-             virBufferVSprintf(&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,
-     virBufferVSprintf(&buf, "(name '%s')", def->name);
-     virBufferVSprintf(&buf, "(memory %lu)(maxmem %lu)",
-                       def->mem.cur_balloon/1024, def->mem.max_balloon/1024);
--    virBufferVSprintf(&buf, "(vcpus %lu)", def->vcpus);
-+    virBufferVSprintf(&buf, "(vcpus %u)", def->maxvcpus);
-
-     if (def->cpumask) {
-         char *ranges = virDomainCpuSetFormat(def->cpumask, def->cpumasklen);
-@@ -5761,7 +5762,7 @@ xenDaemonFormatSxpr(virConnectPtr conn,
-             else
-                 virBufferVSprintf(&buf, "(kernel '%s')", def->os.loader);
-
--            virBufferVSprintf(&buf, "(vcpus %lu)", def->vcpus);
-+            virBufferVSprintf(&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,
-     virBufferVSprintf(&buf, "%u", def->vcpus);
-
-     if ((qemuCmdFlags & QEMUD_CMD_FLAG_SMP_TOPOLOGY)) {
-+        if (def->vcpus != def->maxvcpus)
-+            virBufferVSprintf(&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,
-             virBufferVSprintf(&buf, ",cores=%u", 1);
-             virBufferVSprintf(&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
-