qemu: Let empty default VNC password work as documented

CVE-2016-5008

Setting an empty graphics password is documented as a way to disable
VNC/SPICE access, but QEMU does not always behaves like that. VNC would
happily accept the empty password. Let's enforce the behavior by setting
password expiration to "now".

https://bugzilla.redhat.com/show_bug.cgi?id=1180092

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
(cherry picked from commit bb848feec0)
(cherry picked from commit d933f68ee6)
(cherry picked from commit 139a426577)

.gitignore

@@ -17,7 +17,6 @@
 *.rej
 *.s
 *~
-.#*
 .deps
 .gdb_history
 .git
@@ -28,6 +27,7 @@
 .sc-start-sc_*
 /ABOUT-NLS
 /AUTHORS
+/COPYING
 /ChangeLog
 /GNUmakefile
 /INSTALL
@@ -55,14 +55,12 @@
 /daemon/libvirtd.8.in
 /daemon/libvirtd.init
 /daemon/libvirtd.pod
-/daemon/libvirtd.policy
 /daemon/libvirtd.service
 /daemon/test_libvirtd.aug
 /docs/apibuild.py.stamp
 /docs/devhelp/libvirt.devhelp
 /docs/hvsupport.html.in
 /docs/libvirt-api.xml
-/docs/libvirt-lxc-*.xml
 /docs/libvirt-qemu-*.xml
 /docs/libvirt-refs.xml
 /docs/search.php
@@ -92,13 +90,10 @@
 /python/generated.stamp
 /python/generator.py.stamp
 /python/libvirt-export.c
-/python/libvirt-lxc-export.c
-/python/libvirt-lxc.[ch]
 /python/libvirt-qemu-export.c
 /python/libvirt-qemu.[ch]
 /python/libvirt.[ch]
 /python/libvirt.py
-/python/libvirt_lxc.py
 /python/libvirt_qemu.py
 /run
 /sc_*
@@ -111,16 +106,12 @@
 /src/libvirt_*helper
 /src/libvirt_*probes.h
 /src/libvirt_lxc
-/src/locking/lock_daemon_dispatch_stubs.h
-/src/locking/lock_protocol.[ch]
-/src/locking/qemu-lockd.conf
 /src/locking/qemu-sanlock.conf
 /src/locking/test_libvirt_sanlock.aug
 /src/lxc/lxc_controller_dispatch.h
 /src/lxc/lxc_monitor_dispatch.h
-/src/lxc/lxc_monitor_protocol.c
-/src/lxc/lxc_monitor_protocol.h
-/src/lxc/lxc_protocol.[ch]
+/src/lxc/lxc_protocol.c
+/src/lxc/lxc_protocol.h
 /src/lxc/test_libvirtd_lxc.aug
 /src/qemu/test_libvirtd_qemu.aug
 /src/remote/*_client_bodies.h
@@ -130,11 +121,8 @@
 /src/test_libvirt*.aug
 /src/util/virkeymaps.h
 /src/virt-aa-helper
-/src/virtlockd
-/src/virtlockd.init
 /tests/*.log
 /tests/*.pid
-/tests/*.trs
 /tests/*xml2*test
 /tests/commandhelper
 /tests/commandtest
@@ -143,8 +131,6 @@
 /tests/domainsnapshotxml2xmltest
 /tests/esxutilstest
 /tests/eventtest
-/tests/fchosttest
-/tests/fdstreamtest
 /tests/hashtest
 /tests/jsontest
 /tests/libvirtdconftest
@@ -164,7 +150,6 @@
 /tests/reconnect
 /tests/secaatest
 /tests/seclabeltest
-/tests/securityselinuxlabeltest
 /tests/securityselinuxtest
 /tests/sexpr2xmltest
 /tests/shunloadtest
@@ -172,25 +157,16 @@
 /tests/ssh
 /tests/statstest
 /tests/storagebackendsheepdogtest
-/tests/sysinfotest
-/tests/test_conf
 /tests/utiltest
 /tests/viratomictest
 /tests/virauthconfigtest
 /tests/virbitmaptest
 /tests/virbuftest
-/tests/vircgrouptest
 /tests/virdrivermoduletest
-/tests/virendiantest
 /tests/virhashtest
-/tests/viridentitytest
-/tests/virkeycodetest
 /tests/virkeyfiletest
-/tests/virlockspacetest
 /tests/virnet*test
-/tests/virportallocatortest
 /tests/virshtest
-/tests/virstoragetest
 /tests/virstringtest
 /tests/virtimetest
 /tests/viruritest
@@ -211,14 +187,11 @@ Makefile.in
 TAGS
 coverage
 cscope.files
-cscope.in.out
 cscope.out
-cscope.po.out
 results.log
 stamp-h
 stamp-h.in
 stamp-h1
-tags
 !/gnulib/lib/Makefile.am
 !/gnulib/tests/Makefile.am
 !/m4/virt-*.m4

AUTHORS.in

@@ -11,20 +11,16 @@ Alex Jia <ajia@redhat.com>
 Anthony Liguori <aliguori@us.ibm.com>
 Chris Lalancette <clalance@redhat.com>
 Christophe Fergeau <cfergeau@redhat.com>
-Claudio Bley <cbley@av-test.de>
 Cole Robinson <crobinso@redhat.com>
 Daniel Berrange <berrange@redhat.com>
 Daniel Veillard <veillard@redhat.com>
 Dave Allan <dallan@redhat.com>
 Doug Goldstein <cardoe@gentoo.org>
 Eric Blake <eblake@redhat.com>
-Guannan Ren <gren@redhat.com>
 Guido Günther <agx@sigxcpu.org>
-Ján Tomko <jtomko@redhat.com>
 Jim Fehlig <jfehlig@suse.com>
 Jim Meyering <meyering@redhat.com>
 Jiří Denemark <jdenemar@redhat.com>
-John Ferlan <jferlan@redhat.com>
 John Levon <john.levon@sun.com>
 Justin Clift <jclift@redhat.com>
 Laine Stump <laine@redhat.com>

COPYING

@@ -1,339 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, 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 or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-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 give any other recipients of the Program a copy of this License
-along with the Program.
-
-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 Program or any portion
-of it, thus forming a work based on the Program, 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) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-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 Program, 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 Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) 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; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, 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 executable.  However, as a
-special exception, the source code 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.
-
-If distribution of executable or 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 counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program 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.
-
-  5. 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 Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program 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 to
-this License.
-
-  7. 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 Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program 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 Program.
-
-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.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program 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.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the 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 Program
-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 Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, 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
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "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 PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. 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 PROGRAM 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 PROGRAM (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 PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  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 program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    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 2 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, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.

COPYING.LIB

@@ -1,8 +1,9 @@
+
                   GNU LESSER GENERAL PUBLIC LICENSE
                        Version 2.1, February 1999
 
  Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+     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.
 
@@ -22,7 +23,8 @@ 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.
+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
@@ -55,7 +57,7 @@ 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
@@ -87,9 +89,9 @@ 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
+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.
@@ -111,7 +113,7 @@ 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
 
@@ -136,8 +138,8 @@ 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.
+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
@@ -216,7 +218,7 @@ 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.
@@ -267,7 +269,7 @@ Library will still fall under Section 6.)
 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
@@ -303,10 +305,10 @@ of these things:
     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.
+    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
@@ -329,7 +331,7 @@ 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
@@ -370,7 +372,7 @@ 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
@@ -384,9 +386,10 @@ 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.
+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
@@ -404,11 +407,11 @@ 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.
+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.
@@ -422,7 +425,7 @@ 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
@@ -456,19 +459,21 @@ 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).
+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.
 
-  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>
@@ -485,16 +490,17 @@ convey the exclusion of warranty; and each file should have at least the
 
     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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+    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:
+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.
+  library `Frob' (a library for tweaking knobs) written by James
+  Random Hacker.
 
   <signature of Ty Coon>, 1 April 1990
   Ty Coon, President of Vice

HACKING

@@ -14,12 +14,7 @@ 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, with git rename detection enabled. You
-need a one-time setup of:
-
-  git config diff.renames true
-
-After that, a command similar to this should work:
+(2) Post patches in unified diff format. A command similar to this should work:
 
   diff -urp libvirt.orig/ libvirt.modified/ > libvirt-myfeature.patch
 
@@ -27,9 +22,7 @@ or:
 
   git diff > libvirt-myfeature.patch
 
-Also, for code motion patches, you may find that "git diff --patience"
-provides an easier-to-read patch. However, the usual workflow of libvirt
-developer is:
+However, the usual workflow of libvirt developer is:
 
   git checkout master
   git pull
@@ -65,19 +58,7 @@ though).
 
 
 
-(3) In your commit message, make the summary line reasonably short (60 characters
-is typical), followed by a blank line, followed by any longer description of
-why your patch makes sense. If the patch fixes a regression, and you know what
-commit introduced the problem, mentioning that is useful. If the patch
-resolves a bugzilla report, mentioning the URL of the bug number is useful;
-but also summarize the issue rather than making all readers follow the link.
-You can use 'git shortlog -30' to get an idea of typical summary lines.
-Libvirt does not currently attach any meaning to Signed-off-by: lines, so it
-is up to you if you want to include or omit them in the commit message.
-
-
-
-(4) Split large changes into a series of smaller patches, self-contained if
+(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. Moreover, please keep in mind that it's
 required to be able to compile cleanly (*including* "make check" and "make
@@ -88,10 +69,10 @@ things).
 
 
 
-(5) Make sure your patches apply against libvirt GIT. Developers only follow GIT
+(4) Make sure your patches apply against libvirt GIT. Developers only follow GIT
 and don't care much about released versions.
 
-(6) Run the automated tests on your code before submitting any changes. In
+(5) Run the automated tests on your code before submitting any changes. In
 particular, configure with compile warnings set to -Werror. This is done
 automatically for a git checkout; from a tarball, use:
 
@@ -103,11 +84,7 @@ and run the tests:
   make syntax-check
   make -C tests valgrind
 
-
-
-  Valgrind
-  http://valgrind.org/is a test that checks for memory management issues, such as leaks or use of
-uninitialized variables.
+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
@@ -120,92 +97,7 @@ Also, individual tests can be run from inside the "tests/" directory, like:
 
   ./qemuxml2xmltest
 
-There is also a "./run" script at the top level, to make it easier to run
-programs that have not yet been installed, as well as to wrap invocations of
-various tests under gdb or Valgrind.
-
-
-
-(7) The Valgrind test should produce similar output to "make check". If the output
-has traces within libvirt API's, then investigation is required in order to
-determine the cause of the issue. Output such as the following indicates some
-sort of leak:
-
-==5414== 4 bytes in 1 blocks are definitely lost in loss record 3 of 89
-==5414==    at 0x4A0881C: malloc (vg_replace_malloc.c:270)
-==5414==    by 0x34DE0AAB85: xmlStrndup (in /usr/lib64/libxml2.so.2.7.8)
-==5414==    by 0x4CC97A6: virDomainVideoDefParseXML (domain_conf.c:7410)
-==5414==    by 0x4CD581D: virDomainDefParseXML (domain_conf.c:10188)
-==5414==    by 0x4CD8C73: virDomainDefParseNode (domain_conf.c:10640)
-==5414==    by 0x4CD8DDB: virDomainDefParse (domain_conf.c:10590)
-==5414==    by 0x41CB1D: testCompareXMLToArgvHelper (qemuxml2argvtest.c:100)
-==5414==    by 0x41E20F: virtTestRun (testutils.c:161)
-==5414==    by 0x41C7CB: mymain (qemuxml2argvtest.c:866)
-==5414==    by 0x41E84A: virtTestMain (testutils.c:723)
-==5414==    by 0x34D9021734: (below main) (in /usr/lib64/libc-2.15.so)
-
-In this example, the "virDomainDefParseXML()" had an error path where the
-"virDomainVideoDefPtr video" pointer was not properly disposed. By simply
-adding a "virDomainVideoDefFree(video);" in the error path, the issue was
-resolved.
-
-Another common mistake is calling a printing function, such as "VIR_DEBUG()"
-without initializing a variable to be printed. The following example involved
-a call which could return an error, but not set variables passed by reference
-to the call. The solution was to initialize the variables prior to the call.
-
-==4749== Use of uninitialised value of size 8
-==4749==    at 0x34D904650B: _itoa_word (in /usr/lib64/libc-2.15.so)
-==4749==    by 0x34D9049118: vfprintf (in /usr/lib64/libc-2.15.so)
-==4749==    by 0x34D9108F60: __vasprintf_chk (in /usr/lib64/libc-2.15.so)
-==4749==    by 0x4CAEEF7: virVasprintf (stdio2.h:199)
-==4749==    by 0x4C8A55E: virLogVMessage (virlog.c:814)
-==4749==    by 0x4C8AA96: virLogMessage (virlog.c:751)
-==4749==    by 0x4DA0056: virNetTLSContextCheckCertKeyUsage (virnettlscontext.c:225)
-==4749==    by 0x4DA06DB: virNetTLSContextCheckCert (virnettlscontext.c:439)
-==4749==    by 0x4DA1620: virNetTLSContextNew (virnettlscontext.c:562)
-==4749==    by 0x4DA26FC: virNetTLSContextNewServer (virnettlscontext.c:927)
-==4749==    by 0x409C39: testTLSContextInit (virnettlscontexttest.c:467)
-==4749==    by 0x40AB8F: virtTestRun (testutils.c:161)
-
-Valgrind will also find some false positives or code paths which cannot be
-resolved by making changes to the libvirt code. For these paths, it is
-possible to add a filter to avoid the errors. For example:
-
-==4643== 7 bytes in 1 blocks are possibly lost in loss record 4 of 20
-==4643==    at 0x4A0881C: malloc (vg_replace_malloc.c:270)
-==4643==    by 0x34D90853F1: strdup (in /usr/lib64/libc-2.15.so)
-==4643==    by 0x34EEC2C08A: ??? (in /usr/lib64/libnl.so.1.1)
-==4643==    by 0x34EEC15B81: ??? (in /usr/lib64/libnl.so.1.1)
-==4643==    by 0x34D8C0EE15: call_init.part.0 (in /usr/lib64/ld-2.15.so)
-==4643==    by 0x34D8C0EECF: _dl_init (in /usr/lib64/ld-2.15.so)
-==4643==    by 0x34D8C01569: ??? (in /usr/lib64/ld-2.15.so)
-
-
-In this instance, it is acceptible to modify the "tests/.valgrind.supp" file
-in order to add a suppression filter. The filter should be unique enough to
-not suppress real leaks, but it should be generic enough to cover multiple
-code paths. The format of the entry can be found in the documentation found at
-the
-
-  Valgrind home page.
-  http://valgrind.org/The following trace was added to "tests/.valgrind.supp" in order to suppress
-the warning:
-
-{
-    dlInitMemoryLeak1
-    Memcheck:Leak
-    fun:?alloc
-    ...
-    fun:call_init.part.0
-    fun:_dl_init
-    ...
-    obj:*/lib*/ld-2.*so*
-}
-
-
-
-(8) Update tests and/or documentation, particularly if you are adding a new
+(6) Update tests and/or documentation, particularly if you are adding a new
 feature or changing the output of a program.
 
 
@@ -287,60 +179,6 @@ otherwise. For example, it is preferable to use "/* */" comments rather than
 declare them at the beginning of a scope, rather than immediately before use.
 
 
-Bracket spacing
-===============
-The keywords "if", "for", "while", and "switch" must have a single space
-following them before the opening bracket. E.g.
-
-      if(foo)   // Bad
-      if (foo)  // Good
-
-Function implementations mustnothave any whitespace between the function name and the opening bracket. E.g.
-
-      int foo (int wizz)  // Bad
-      int foo(int wizz)   // Good
-
-Function calls mustnothave any whitespace between the function name and the opening bracket. E.g.
-
-      bar = foo (wizz);  // Bad
-      bar = foo(wizz);   // Good
-
-Function typedefs mustnothave any whitespace between the closing bracket of the function name and
-opening bracket of the arg list. E.g.
-
-      typedef int (*foo) (int wizz);  // Bad
-      typedef int (*foo)(int wizz);   // Good
-
-There must not be any whitespace immediately following any opening bracket, or
-immediately prior to any closing bracket. E.g.
-
-      int foo( int wizz );  // Bad
-      int foo(int wizz);    // Good
-
-
-Semicolons
-==========
-Semicolons should never have a space beforehand. Inside the condition of a
-"for" loop, there should always be a space or line break after each semicolon,
-except for the special case of an infinite loop (although more infinite loops
-use "while"). While not enforced, loop counters generally use post-increment.
-
-      for (i = 0 ;i < limit ; ++i) { // Bad
-      for (i = 0; i < limit; i++) { // Good
-      for (;;) { // ok
-      while (1) { // Better
-
-Empty loop bodies are better represented with curly braces and a comment,
-although use of a semicolon is not currently rejected.
-
-      while ((rc = waitpid(pid, &st, 0) == -1) &&
-             errno == EINTR); // ok
-      while ((rc = waitpid(pid, &st, 0) == -1) &&
-             errno == EINTR) { // Better
-          /* nothing */
-      }
-
-
 Curly braces
 ============
 Omit the curly braces around an "if", "while", "for" etc. body only when that
@@ -353,7 +191,7 @@ 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 on to a second line, for
+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:
@@ -441,11 +279,6 @@ But if negating a complex condition is too ugly, then at least add braces:
 
 Preprocessor
 ============
-Macros defined with an ALL_CAPS name should generally be assumed to be unsafe
-with regards to arguments with side-effects (that is, MAX(a++, b--) might
-increment a or decrement b too many or too few times). Exceptions to this rule
-are explicitly documented for macros in viralloc.h and virstring.h.
-
 For variadic macros, stick with C99 syntax:
 
   #define vshPrint(_ctl, ...) fprintf(stdout, __VA_ARGS__)
@@ -529,7 +362,7 @@ 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 viralloc.h.
+routines, use the macros from memory.h.
 
 - To allocate a single object:
 
@@ -628,7 +461,7 @@ 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 particularly dangerous in a multi-threaded application. Instead of these
+is particulary dangerous in a multi-threaded applications. Instead of these
 APIs, use the macros from virfile.h
 
 - Open a file from a file descriptor:
@@ -747,17 +580,6 @@ 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)).
 
-  VIR_STRDUP(char *dst, const char *src);
-  VIR_STRNDUP(char *dst, const char *src, size_t n);
-
-You should avoid using strdup or strndup directly as they do not report
-out-of-memory error, and do not allow a NULL source. Use VIR_STRDUP or
-VIR_STRNDUP macros instead, which return 0 for NULL source, 1 for successful
-copy, and -1 for allocation failure with the error already reported. In very
-specific cases, when you don't want to report the out-of-memory error, you can
-use VIR_STRDUP_QUIET or VIR_STRNDUP_QUIET, but such usage is very rare and
-usually considered a flaw.
-
 
 Variable length string buffer
 =============================
@@ -811,7 +633,7 @@ stick to the following general plan for all *.c source files:
   #include <string.h>
   #include <limits.h>
 
-  #if WITH_NUMACTL                Some system includes aren't supported
+  #if HAVE_NUMACTL                Some system includes aren't supported
   # include <numa.h>              everywhere so need these #if guards.
   #endif
 
@@ -825,12 +647,9 @@ stick to the following general plan for all *.c source files:
   {
       ...
 
-Of particular note: *Do not* include libvirt/libvirt.h, libvirt/virterror.h,
-libvirt/libvirt-qemu.h, or libvirt/libvirt-lxc.h. They are included by
-"internal.h" already and there are some special reasons why you cannot include
-these files explicitly. One of the special cases, "libvirt/libvirt.h" is
-included prior to "internal.h" in "remote_protocol.x", to avoid exposing
-*_LAST enum elements.
+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

Makefile.am

@@ -1,20 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
-## Copyright (C) 2005-2013 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, see
-## <http://www.gnu.org/licenses/>.
+## Copyright (C) 2005-2011 Red Hat, Inc.
+## See COPYING.LIB for the License of this software
 
 LCOV = lcov
 GENHTML = genhtml
@@ -48,20 +35,20 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libvirt.pc
 
 NEWS: $(top_srcdir)/docs/news.xsl $(top_srcdir)/docs/news.html.in
-	$(AM_V_GEN)if [ -x $(XSLTPROC) ] ; then			\
+	-@(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
+	   > $@-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
-	$(AM_V_GEN)if [ -x $(XSLTPROC) ] ; then \
+	-@(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;
+	   > $@-t && mv $@-t $@ ; fi );
 
 rpm: clean
 	@(unset CDPATH ; $(MAKE) dist && rpmbuild -ta $(distdir).tar.gz)
@@ -99,7 +86,7 @@ dist-hook: gen-ChangeLog gen-AUTHORS
 gen_start_date = 2009-07-04
 .PHONY: gen-ChangeLog
 gen-ChangeLog:
-	$(AM_V_GEN)if test -d .git; then			\
+	if test -d .git; then					\
 	  $(top_srcdir)/build-aux/gitlog-to-changelog		\
 	    --since=$(gen_start_date) > $(distdir)/cl-t;	\
 	  rm -f $(distdir)/ChangeLog;				\
@@ -108,9 +95,9 @@ gen-ChangeLog:
 
 .PHONY: gen-AUTHORS
 gen-AUTHORS:
-	$(AM_V_GEN)if test -d $(srcdir)/.git; then \
-	    out="`cd $(srcdir) && git log --pretty=format:'%aN <%aE>' | sort -u`" && \
-	    perl -p -e "s/#authorslist#// and print '$$out'" \
-	      < $(srcdir)/AUTHORS.in > $(distdir)/AUTHORS-tmp && \
+	if test -d .git; then \
+	    out="`git log --pretty=format:'%aN <%aE>' | sort -u`" && \
+	    cat $(srcdir)/AUTHORS.in | perl -p -e "s/#authorslist#/$$out/" > \
+	      $(distdir)/AUTHORS-tmp && \
 	    mv -f $(distdir)/AUTHORS-tmp $(distdir)/AUTHORS ; \
 	fi

Makefile.nonreentrant

@@ -1,18 +1,3 @@
-## Copyright (C) 2009-2010, 2013 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, see
-## <http://www.gnu.org/licenses/>.
 
 #
 # Generated by running the following on Fedora 9:

autobuild.sh

@@ -20,8 +20,7 @@ cd build
 ../autogen.sh --prefix="$AUTOBUILD_INSTALL_ROOT" \
   --enable-test-coverage \
   --disable-nls \
-  --enable-werror \
-  --enable-static
+  --enable-werror
 
 # If the MAKEFLAGS envvar does not yet include a -j option,
 # add -jN where N depends on the number of processors.
@@ -69,7 +68,6 @@ fi
 if test -x /usr/bin/i686-w64-mingw32-gcc ; then
   make distclean
 
-  PKG_CONFIG_LIBDIR="/usr/i686-w64-mingw32/sys-root/mingw/lib/pkgconfig:/usr/i686-w64-mingw32/sys-root/mingw/share/pkgconfig" \
   PKG_CONFIG_PATH="$AUTOBUILD_INSTALL_ROOT/i686-w64-mingw32/sys-root/mingw/lib/pkgconfig" \
   CC="i686-w64-mingw32-gcc" \
   ../configure \
@@ -89,7 +87,6 @@ fi
 if test -x /usr/bin/x86_64-w64-mingw32-gcc ; then
   make distclean
 
-  PKG_CONFIG_LIBDIR="/usr/x86_64-w64-mingw32/sys-root/mingw/lib/pkgconfig:/usr/x86_64-w64-mingw32/sys-root/mingw/share/pkgconfig" \
   PKG_CONFIG_PATH="$AUTOBUILD_INSTALL_ROOT/x86_64-w64-mingw32/sys-root/mingw/lib/pkgconfig" \
   CC="x86_64-w64-mingw32-gcc" \
   ../configure \

autogen.sh

@@ -61,10 +61,8 @@ bootstrap_hash()
 # 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=
-    if test -d .gnulib; then
-        t=$(bootstrap_hash; git diff .gnulib)
-    fi
+    curr_status=.git-module-status
+    t=$(bootstrap_hash; git diff .gnulib)
     case $t:${CLEAN_SUBMODULE+set} in
         *:set) ;;
         *-dirty*)

bootstrap

@@ -1,10 +1,10 @@
 #! /bin/sh
 # Print a version string.
-scriptversion=2013-05-08.20; # UTC
+scriptversion=2012-07-19.14; # UTC
 
 # Bootstrap this package from checked-out sources.
 
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 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
@@ -140,21 +140,20 @@ po_download_command_format2=\
 "wget --mirror -nd -q -np -A.po -P '%s' \
  http://translationproject.org/latest/%s/"
 
-# Prefer a non-empty tarname (4th argument of AC_INIT if given), else
-# fall back to the package name (1st argument with munging)
 extract_package_name='
-  /^AC_INIT(\[*/{
-     s///
-     /^[^,]*,[^,]*,[^,]*,[ []*\([^][ ,)]\)/{
-       s//\1/
-       s/[],)].*//
+  /^AC_INIT(/{
+     /.*,.*,.*, */{
+       s///
+       s/[][]//g
+       s/)$//
        p
        q
      }
-     s/[],)].*//
+     s/AC_INIT(\[*//
+     s/]*,.*//
      s/^GNU //
      y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
-     s/[^abcdefghijklmnopqrstuvwxyz0123456789_]/-/g
+     s/[^A-Za-z0-9_]/-/g
      p
   }
 '
@@ -307,34 +306,34 @@ if test -n "$checkout_only_file" && test ! -r "$checkout_only_file"; then
   die "Bootstrapping from a non-checked-out distribution is risky."
 fi
 
-# Strip blank and comment lines to leave significant entries.
-gitignore_entries() {
-  sed '/^#/d; /^$/d' "$@"
+# Ensure that lines starting with ! sort last, per gitignore conventions
+# for whitelisting exceptions after a more generic blacklist pattern.
+sort_patterns() {
+  sort -u "$@" | sed '/^!/ {
+    H
+    d
+  }
+  $ {
+    P
+    x
+    s/^\n//
+  }' | sed '/^$/d'
 }
 
-# If $STR is not already on a line by itself in $FILE, insert it at the start.
-# Entries are inserted at the start of the ignore list to ensure existing
-# entries starting with ! are not overridden.  Such entries support
-# whitelisting exceptions after a more generic blacklist pattern.
-insert_if_absent() {
+# 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
-  test -r $file || die "Error: failed to read ignore file: $file"
-  duplicate_entries=$(gitignore_entries $file | sort | uniq -d)
-  if [ "$duplicate_entries" ] ; then
-    die "Error: Duplicate entries in $file: " $duplicate_entries
-  fi
-  linesold=$(gitignore_entries $file | wc -l)
-  linesnew=$(echo "$str" | gitignore_entries - $file | sort -u | wc -l)
-  if [ $linesold != $linesnew ] ; then
-    { echo "$str" | cat - $file > $file.bak && mv $file.bak $file; } \
-      || die "insert_if_absent $file $str: failed"
-  fi
+  echo "$str" | sort_patterns - $file | cmp -s - $file > /dev/null \
+    || { echo "$str" | sort_patterns - $file > $file.bak \
+      && mv $file.bak $file; } \
+    || die "insert_sorted_if_absent $file $str: failed"
 }
 
 # Adjust $PATTERN for $VC_IGNORE_FILE and insert it with
-# insert_if_absent.
+# insert_sorted_if_absent.
 insert_vc_ignore() {
   vc_ignore_file="$1"
   pattern="$2"
@@ -345,7 +344,7 @@ insert_vc_ignore() {
     # .gitignore entry.
     pattern=$(echo "$pattern" | sed s,^,/,);;
   esac
-  insert_if_absent "$vc_ignore_file" "$pattern"
+  insert_sorted_if_absent "$vc_ignore_file" "$pattern"
 }
 
 # Die if there is no AC_CONFIG_AUX_DIR($build_aux) line in configure.ac.
@@ -631,13 +630,9 @@ esac
 if $bootstrap_sync; then
   cmp -s "$0" "$GNULIB_SRCDIR/build-aux/bootstrap" || {
     echo "$0: updating bootstrap and restarting..."
-    case $(sh -c 'echo "$1"' -- a) in
-      a) ignored=--;;
-      *) ignored=ignored;;
-    esac
     exec sh -c \
       'cp "$1" "$2" && shift && exec "${CONFIG_SHELL-/bin/sh}" "$@"' \
-      $ignored "$GNULIB_SRCDIR/build-aux/bootstrap" \
+      -- "$GNULIB_SRCDIR/build-aux/bootstrap" \
       "$0" "$@" --no-bootstrap-sync
   }
 fi
@@ -894,21 +889,20 @@ find "$m4_base" "$source_base" \
   -depth \( -name '*.m4' -o -name '*.[ch]' \) \
   -type l -xtype l -delete > /dev/null 2>&1
 
-# Invoke autoreconf with --force --install to ensure upgrades of tools
-# such as ylwrap.
-AUTORECONFFLAGS="--verbose --install --force -I $m4_base $ACLOCAL_FLAGS"
-
 # Some systems (RHEL 5) are using ancient autotools, for which the
 # --no-recursive option had not been invented.  Detect that lack and
 # omit the option when it's not supported.  FIXME in 2017: remove this
 # hack when RHEL 5 autotools are updated, or when they become irrelevant.
+no_recursive=
 case $($AUTORECONF --help) in
-  *--no-recursive*) AUTORECONFFLAGS="$AUTORECONFFLAGS --no-recursive";;
+  *--no-recursive*) no_recursive=--no-recursive;;
 esac
 
 # Tell autoreconf not to invoke autopoint or libtoolize; they were run above.
-echo "running: AUTOPOINT=true LIBTOOLIZE=true $AUTORECONF $AUTORECONFFLAGS"
-AUTOPOINT=true LIBTOOLIZE=true $AUTORECONF $AUTORECONFFLAGS \
+echo "running: AUTOPOINT=true LIBTOOLIZE=true " \
+    "$AUTORECONF --verbose --install $no_recursive -I $m4_base $ACLOCAL_FLAGS"
+AUTOPOINT=true LIBTOOLIZE=true \
+    $AUTORECONF --verbose --install $no_recursive -I $m4_base $ACLOCAL_FLAGS \
   || die "autoreconf failed"
 
 # Get some extra files from gnulib, overriding existing files.

bootstrap.conf

@@ -1,6 +1,6 @@
 # Bootstrap configuration.
 
-# Copyright (C) 2010-2013 Red Hat, Inc.
+# Copyright (C) 2010-2012 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
@@ -20,7 +20,6 @@
 gnulib_modules='
 accept
 areadlink
-autobuild
 base64
 bind
 bitrotate
@@ -37,7 +36,6 @@ connect
 configmake
 count-one-bits
 crypto/md5
-crypto/sha256
 dirname-lgpl
 environ
 execinfo
@@ -71,9 +69,8 @@ listen
 localeconv
 maintainer-makefile
 manywarnings
-mkdtemp
-mkostemp
-mkostemps
+mkstemp
+mkstemps
 mktempd
 net_if
 netdb
@@ -93,7 +90,6 @@ regex
 random_r
 sched
 send
-setenv
 setsockopt
 sigaction
 sigpipe

build-aux/bracket-spacing.pl

@@ -1,144 +0,0 @@
-#!/usr/bin/perl
-#
-# bracket-spacing.pl: Report any usage of 'function (..args..)'
-# Also check for other syntax issues, such as correct use of ';'
-#
-# 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, see
-# <http://www.gnu.org/licenses/>.
-#
-# Authors:
-#     Daniel P. Berrange <berrange@redhat.com>
-
-use strict;
-use warnings;
-
-my $ret = 0;
-my $incomment = 0;
-
-foreach my $file (@ARGV) {
-    open FILE, $file;
-
-    while (defined (my $line = <FILE>)) {
-        my $data = $line;
-
-        # Kill any quoted ; or "
-        $data =~ s,'[";]','X',g;
-
-        # Kill any quoted strings
-        $data =~ s,"([^\\\"]|\\.)*","XXX",g;
-
-        # Kill any C++ style comments
-        $data =~ s,//.*$,//,;
-
-        next if $data =~ /^#/;
-
-        # Kill contents of multi-line comments
-        # and detect end of multi-line comments
-        if ($incomment) {
-            if ($data =~ m,\*/,) {
-                $incomment = 0;
-                $data =~ s,^.*\*/,*/,;
-            } else {
-                $data = "";
-            }
-        }
-
-        # Kill single line comments, and detect
-        # start of multi-line comments
-        if ($data =~ m,/\*.*\*/,) {
-            $data =~ s,/\*.*\*/,/* */,;
-        } elsif ($data =~ m,/\*,) {
-            $incomment = 1;
-            $data =~ s,/\*.*,/*,;
-        }
-
-        # We need to match things like
-        #
-        #  int foo (int bar, bool wizz);
-        #  foo (bar, wizz);
-        #
-        # but not match things like:
-        #
-        #  typedef int (*foo)(bar wizz)
-        #
-        # we can't do this (efficiently) without
-        # missing things like
-        #
-        #  foo (*bar, wizz);
-        #
-        while ($data =~ /(\w+)\s\((?!\*)/) {
-            my $kw = $1;
-
-            # Allow space after keywords only
-            if ($kw =~ /^(if|for|while|switch|return)$/) {
-                $data =~ s/($kw\s\()/XXX(/;
-            } else {
-                print "$file:$.: $line";
-                $ret = 1;
-                last;
-            }
-        }
-
-        # Require whitespace immediately after keywords,
-        # but none after the opening bracket
-        while ($data =~ /(if|for|while|switch|return)\(/ ||
-               $data =~ /(if|for|while|switch|return)\s+\(\s/) {
-            print "$file:$.: $line";
-            $ret = 1;
-            last;
-        }
-
-        # Forbid whitespace between )( of a function typedef
-        while ($data =~ /\(\*\w+\)\s+\(/) {
-            print "$file:$.: $line";
-            $ret = 1;
-            last;
-        }
-
-        # Forbid whitespace following ( or prior to )
-        while ($data =~ /\S\s+\)/ ||
-               $data =~ /\(\s+\S/) {
-            print "$file:$.: $line";
-            $ret = 1;
-            last;
-        }
-
-        # Forbid whitespace before ";". Things like below are allowed:
-        #
-        # 1) The expression is empty for "for" loop. E.g.
-        #   for (i = 0; ; i++)
-        #
-        # 2) An empty statement. E.g.
-        #   while (write(statuswrite, &status, 1) == -1 &&
-        #          errno == EINTR)
-        #       ;
-        #
-        while ($data =~ /[^;\s]\s+;/) {
-            print "$file:$.: $line";
-            $ret = 1;
-            last;
-        }
-
-        # Require EOL, macro line continuation, or whitespace after ";".
-        # Allow "for (;;)" as an exception.
-        while ($data =~ /;[^	 \\\n;)]/) {
-            print "$file:$.: $line";
-            $ret = 1;
-            last;
-        }
-    }
-    close FILE;
-}
-
-exit $ret;

cfg.mk

@@ -1,5 +1,5 @@
 # Customize Makefile.maint.                           -*- makefile -*-
-# Copyright (C) 2008-2013 Red Hat, Inc.
+# Copyright (C) 2008-2012 Red Hat, Inc.
 # Copyright (C) 2003-2008 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
@@ -93,15 +93,11 @@ VC_LIST_ALWAYS_EXCLUDE_REGEX = \
 
 # Functions like free() that are no-ops on NULL arguments.
 useless_free_options =				\
-  --name=VBOX_UTF16_FREE			\
-  --name=VBOX_UTF8_FREE				\
-  --name=VBOX_COM_UNALLOC_MEM			\
   --name=VIR_FREE				\
   --name=qemuCapsFree				\
   --name=qemuMigrationCookieFree                \
   --name=qemuMigrationCookieGraphicsFree        \
   --name=sexpr_free				\
-  --name=usbFreeDevice                          \
   --name=virBandwidthDefFree			\
   --name=virBitmapFree                          \
   --name=virCPUDefFree				\
@@ -306,7 +302,6 @@ sc_flags_usage:
 	@test "$$(cat $(srcdir)/include/libvirt/libvirt.h.in		\
 	    $(srcdir)/include/libvirt/virterror.h			\
 	    $(srcdir)/include/libvirt/libvirt-qemu.h			\
-	    $(srcdir)/include/libvirt/libvirt-lxc.h			\
 	  | grep -c '\(long\|unsigned\) flags')" != 4 &&		\
 	  { echo '$(ME): new API should use "unsigned int flags"' 1>&2;	\
 	    exit 1; } || :
@@ -319,14 +314,14 @@ sc_flags_usage:
 
 # Avoid functions that should only be called via macro counterparts.
 sc_prohibit_internal_functions:
-	@prohibit='vir(Free|AllocN?|ReallocN|(Insert|Delete)ElementsN|File(Close|Fclose|Fdopen)) *\(' \
+	@prohibit='vir(Free|AllocN?|ReallocN|File(Close|Fclose|Fdopen)) *\(' \
 	halt='use VIR_ macros instead of internal functions'		\
 	  $(_sc_search_regexp)
 
 # Avoid raw malloc and free, except in documentation comments.
 sc_prohibit_raw_allocation:
 	@prohibit='^.[^*].*\<((m|c|re)alloc|free) *\([^)]'		\
-	halt='use VIR_ macros from viralloc.h instead of malloc/free'	\
+	halt='use VIR_ macros from memory.h instead of malloc/free'	\
 	  $(_sc_search_regexp)
 
 # Avoid functions that can lead to double-close bugs.
@@ -344,12 +339,6 @@ sc_prohibit_fork_wrappers:
 	halt='use virCommand for child processes'			\
 	  $(_sc_search_regexp)
 
-# Prefer mkostemp with O_CLOEXEC.
-sc_prohibit_mkstemp:
-	@prohibit='[^"]\<mkstemps? *\('					\
-	halt='use mkostemp with O_CLOEXEC instead of mkstemp'		\
-	  $(_sc_search_regexp)
-
 # access with X_OK accepts directories, but we can't exec() those.
 # access with F_OK or R_OK is okay, though.
 sc_prohibit_access_xok:
@@ -378,19 +367,10 @@ sc_prohibit_strtol:
 	  $(_sc_search_regexp)
 
 # Use virAsprintf rather than as'printf since *strp is undefined on error.
-# But for plain %s, virAsprintf is overkill compared to strdup.
 sc_prohibit_asprintf:
 	@prohibit='\<v?a[s]printf\>'					\
 	halt='use virAsprintf, not as'printf				\
 	  $(_sc_search_regexp)
-	@prohibit='virAsprintf.*, *"%s",'				\
-	halt='use VIR_STRDUP instead of virAsprintf with "%s"'		\
-	  $(_sc_search_regexp)
-
-sc_prohibit_strdup:
-	@prohibit='\<strn?dup\> *\('					\
-	halt='use VIR_STRDUP, not strdup'				\
-	  $(_sc_search_regexp)
 
 # Prefer virSetUIDGID.
 sc_prohibit_setuid:
@@ -398,12 +378,6 @@ sc_prohibit_setuid:
 	halt='use virSetUIDGID, not raw set*id'				\
 	  $(_sc_search_regexp)
 
-# Don't compare *id_t against raw -1.
-sc_prohibit_risky_id_promotion:
-	@prohibit='\b(user|group|[ug]id) *[=!]= *-'			\
-	halt='cast -1 to ([ug]id_t) before comparing against id'	\
-	  $(_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:
@@ -449,11 +423,6 @@ sc_prohibit_nonreentrant:
 	done ; \
 	exit $$fail
 
-sc_prohibit_select:
-	@prohibit="\\<select *\\("					\
-	halt="use poll(), not se""lect()"				\
-	  $(_sc_search_regexp)
-
 # Prohibit the inclusion of <ctype.h>.
 sc_prohibit_ctype_h:
 	@prohibit='^# *include  *<ctype\.h>'				\
@@ -500,11 +469,6 @@ sc_prohibit_virBufferAdd_with_string_literal:
 	halt='use virBufferAddLit, not virBufferAdd, with a string literal' \
 	  $(_sc_search_regexp)
 
-sc_prohibit_virBufferAsprintf_with_string_literal:
-	@prohibit='\<virBufferAsprintf *\([^,]+, *"([^%"\]|\\.|%%)*"\)'		\
-	halt='use virBufferAddLit, not virBufferAsprintf, 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:
@@ -512,12 +476,6 @@ sc_prohibit_gethostby:
 	halt='use getaddrinfo, not gethostby*'				\
 	  $(_sc_search_regexp)
 
-# dirname and basename from <libgen.h> are not required to be thread-safe
-sc_prohibit_libgen:
-	@prohibit='( (base|dir)name *\(|include .libgen\.h)'		\
-	halt='use functions from gnulib "dirname.h", not <libgen.h>'	\
-	  $(_sc_search_regexp)
-
 # raw xmlGetProp requires some nasty casts
 sc_prohibit_xmlGetProp:
 	@prohibit='\<xmlGetProp *\('					\
@@ -657,23 +615,6 @@ sc_preprocessor_indentation:
 	  echo '$(ME): skipping test $@: cppi not installed' 1>&2;	\
 	fi
 
-# Enforce similar spec file indentation style, by running cppi on a
-# (comment-only) C file that mirrors the same layout as the spec file.
-sc_spec_indentation:
-	@if cppi --version >/dev/null 2>&1; then			\
-	  for f in $$($(VC_LIST_EXCEPT) | grep '\.spec\.in$$'); do	\
-	    sed -e 's|#|// #|; s|%ifn*\(arch\)* |#if a // |'		\
-		-e 's/%\(else\|endif\|define\)/#\1/'			\
-		-e 's/^\( *\)\1\1\1#/#\1/'				\
-		-e 's|^\( *[^#/ ]\)|// \1|; s|^\( */[^/]\)|// \1|' $$f	\
-	    | cppi -a -c 2>&1 | sed "s|standard input|$$f|";		\
-	  done | { if grep . >&2; then false; else :; fi; }		\
-	    || { 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				\
@@ -687,22 +628,11 @@ sc_copyright_format:
 	  $(_sc_search_regexp)
 
 # Prefer the new URL listing over the old street address listing when
-# calling out where to get a copy of the [L]GPL.  Also, while we have
-# to ship COPYING (GPL) alongside COPYING.LESSER (LGPL), we want any
-# source file that calls out a top-level file to call out the LGPL
-# version.  Note that our typical copyright boilerplate refers to the
-# license by name, not by reference to a top-level file.
-sc_copyright_usage:
+# calling out where to get a copy of the [L]GPL.
+sc_copyright_address:
 	@prohibit=Boston,' MA'						\
 	halt='Point to <http://www.gnu.org/licenses/>, not an address'	\
 	  $(_sc_search_regexp)
-	@require='COPYING\.LESSER'					\
-	containing='COPYING'						\
-	halt='Refer to COPYING.LESSER for LGPL'				\
-	  $(_sc_search_regexp)
-	@prohibit='COPYING\.LIB'					\
-	halt='Refer to COPYING.LESSER for LGPL'				\
-	  $(_sc_search_regexp)
 
 # Some functions/macros produce messages intended solely for developers
 # and maintainers.  Do not mark them for translation.
@@ -719,8 +649,6 @@ sc_prohibit_cross_inclusion:
 	@for dir in $(cross_dirs); do					\
 	  case $$dir in							\
 	    util/) safe="util";;					\
-	    locking/)							\
-	      safe="($$dir|util|conf|rpc)";;				\
 	    cpu/ | locking/ | network/ | rpc/ | security/)		\
 	      safe="($$dir|util|conf)";;				\
 	    xenapi/ | xenxs/ ) safe="($$dir|util|conf|xen)";;		\
@@ -744,59 +672,6 @@ sc_require_enum_last_marker:
 	  { echo '$(ME): enum impl needs to use _LAST marker' 1>&2;	\
 	    exit 1; } || :
 
-# In Python files we don't want to end lines with a semicolon like in C
-sc_prohibit_semicolon_at_eol_in_python:
-	@prohibit='^[^#].*\;$$'			                        \
-	in_vc_files='\.py$$'						\
-	halt="Don't use semicolon at eol in python files"		\
-	  $(_sc_search_regexp)
-
-# mymain() in test files should use return, not exit, for nicer output
-sc_prohibit_exit_in_tests:
-	@prohibit='\<exit *\('						\
-	in_vc_files='^tests/'						\
-	halt='use return, not exit(), in tests'				\
-	  $(_sc_search_regexp)
-
-# Don't include duplicate header in the source (either *.c or *.h)
-sc_prohibit_duplicate_header:
-	@fail=0; for i in $$($(VC_LIST_EXCEPT) | grep '\.[chx]$$'); do	\
-	  awk '/# *include.*\.h/ {					\
-	    match($$0, /[<"][^>"]*[">]/);				\
-	    arr[substr($$0, RSTART + 1, RLENGTH - 2)]++;		\
-	  }								\
-	  END {								\
-	    for (key in arr) {						\
-	      if (arr[key] > 1)	{					\
-		fail=1;							\
-		printf("%d %s are included\n", arr[key], key);		\
-	      }								\
-	    }								\
-	    if (fail == 1) {						\
-	      printf("duplicate header(s) in " FILENAME "\n");		\
-	      exit 1;							\
-	    }								\
-	  }' $$i || fail=1;						\
-	done;								\
-	if test $$fail -eq 1; then					\
-	  { echo '$(ME): avoid duplicate headers' 1>&2; exit 1; }	\
-	fi;
-
-# Don't include "libvirt/*.h" in "" form.
-sc_prohibit_include_public_headers_quote:
-	@prohibit='# *include *"libvirt/.*\.h"'				\
-	in_vc_files='\.[ch]$$'						\
-	halt='Do not include libvirt/*.h in internal source'		\
-	  $(_sc_search_regexp)
-
-# Don't include "libvirt/*.h" in <> form. Except for external tools,
-# e.g. Python binding, examples and tools subdirectories.
-sc_prohibit_include_public_headers_brackets:
-	@prohibit='# *include *<libvirt/.*\.h>'				\
-	in_vc_files='\.[ch]$$'						\
-	halt='Do not include libvirt/*.h in internal source'		\
-	  $(_sc_search_regexp)
-
 # We don't use this feature of maint.mk.
 prev_version_file = /dev/null
 
@@ -840,13 +715,7 @@ _autogen:
 	./config.status
 
 # regenerate HACKING as part of the syntax-check
-syntax-check: $(top_srcdir)/HACKING bracket-spacing-check
-
-bracket-spacing-check:
-	$(AM_V_GEN)files=`$(VC_LIST) | grep '\.c$$'`; \
-	$(PERL) $(top_srcdir)/build-aux/bracket-spacing.pl $$files || \
-	  { echo '$(ME): incorrect whitespace, see HACKING for rules' 1>&2; \
-	    exit 1; }
+syntax-check: $(top_srcdir)/HACKING
 
 # sc_po_check can fail if generated files are not built first
 sc_po_check: \
@@ -863,17 +732,16 @@ $(srcdir)/src/remote/remote_client_bodies.h: $(srcdir)/src/remote/remote_protoco
 # List all syntax-check exemptions:
 exclude_file_name_regexp--sc_avoid_strcase = ^tools/virsh\.h$$
 
-_src1=libvirt|fdstream|qemu/qemu_monitor|util/(vircommand|virfile)|xen/xend_internal|rpc/virnetsocket|lxc/lxc_controller|locking/lock_daemon
-_test1=shunloadtest|virnettlscontexttest|vircgroupmock
+_src1=libvirt|fdstream|qemu/qemu_monitor|util/(command|util)|xen/xend_internal|rpc/virnetsocket|lxc/lxc_controller
 exclude_file_name_regexp--sc_avoid_write = \
-  ^(src/($(_src1))|daemon/libvirtd|tools/console|tests/($(_test1)))\.c$$
+  ^(src/($(_src1))|daemon/libvirtd|tools/console|tests/(shunload|virnettlscontext)test)\.c$$
 
 exclude_file_name_regexp--sc_bindtextdomain = ^(tests|examples)/
 
-exclude_file_name_regexp--sc_copyright_usage = \
-  ^COPYING(|\.LESSER)$$
+exclude_file_name_regexp--sc_copyright_address = \
+  ^COPYING\.LIB$$
 
-exclude_file_name_regexp--sc_flags_usage = ^(docs/|src/util/virnetdevtap\.c$$|tests/vircgroupmock\.c$$)
+exclude_file_name_regexp--sc_flags_usage = ^(docs/|src/util/virnetdevtap\.c$$)
 
 exclude_file_name_regexp--sc_libvirt_unmarked_diagnostics = \
   ^(src/rpc/gendispatch\.pl$$|tests/)
@@ -881,57 +749,54 @@ exclude_file_name_regexp--sc_libvirt_unmarked_diagnostics = \
 exclude_file_name_regexp--sc_po_check = ^(docs/|src/rpc/gendispatch\.pl$$)
 
 exclude_file_name_regexp--sc_prohibit_VIR_ERR_NO_MEMORY = \
-  ^(include/libvirt/virterror\.h|daemon/dispatch\.c|src/util/virerror\.c)$$
+  ^(include/libvirt/virterror\.h|daemon/dispatch\.c|src/util/virterror\.c)$$
 
-exclude_file_name_regexp--sc_prohibit_access_xok = ^src/util/virutil\.c$$
+exclude_file_name_regexp--sc_prohibit_access_xok = ^src/util/util\.c$$
 
 exclude_file_name_regexp--sc_prohibit_always_true_header_tests = \
-  ^python/(libvirt-(lxc-|qemu-)?override|typewrappers)\.c$$
+  ^python/(libvirt-(qemu-)?override|typewrappers)\.c$$
 
 exclude_file_name_regexp--sc_prohibit_asprintf = \
-  ^(bootstrap.conf$$|src/util/virstring\.c$$|examples/domain-events/events-c/event-test\.c$$|tests/vircgroupmock\.c$$)
-
-exclude_file_name_regexp--sc_prohibit_strdup = \
-  ^(docs/|examples/|python/|src/util/virstring\.c$$)
+  ^(bootstrap.conf$$|src/util/util\.c$$|examples/domain-events/events-c/event-test\.c$$)
 
 exclude_file_name_regexp--sc_prohibit_close = \
-  (\.p[yl]$$|^docs/|^(src/util/virfile\.c|src/libvirt\.c|tests/vircgroupmock\.c)$$)
+  (\.p[yl]$$|^docs/|^(src/util/virfile\.c|src/libvirt\.c)$$)
 
 exclude_file_name_regexp--sc_prohibit_empty_lines_at_EOF = \
   (^tests/(qemuhelp|nodeinfo)data/|\.(gif|ico|png|diff)$$)
 
-_src2=src/(util/vircommand|libvirt|lxc/lxc_controller|locking/lock_daemon)
+_src2=src/(util/command|libvirt|lxc/lxc_controller)
 exclude_file_name_regexp--sc_prohibit_fork_wrappers = \
   (^($(_src2)|tests/testutils|daemon/libvirtd)\.c$$)
 
-exclude_file_name_regexp--sc_prohibit_gethostname = ^src/util/virutil\.c$$
+exclude_file_name_regexp--sc_prohibit_gethostname = ^src/util/util\.c$$
 
 exclude_file_name_regexp--sc_prohibit_internal_functions = \
-  ^src/(util/(viralloc|virutil|virfile)\.[hc]|esx/esx_vi\.c)$$
+  ^src/(util/(memory|util|virfile)\.[hc]|esx/esx_vi\.c)$$
 
 exclude_file_name_regexp--sc_prohibit_newline_at_end_of_diagnostic = \
   ^src/rpc/gendispatch\.pl$$
 
 exclude_file_name_regexp--sc_prohibit_nonreentrant = \
-  ^((po|tests)/|docs/.*(py|html\.in)|run.in$$)
+  ^((po|tests)/|docs/.*py|run.in$$)
 
 exclude_file_name_regexp--sc_prohibit_raw_allocation = \
-  ^(docs/hacking\.html\.in)|(src/util/viralloc\.[ch]|examples/.*|tests/securityselinuxhelper\.c|tests/vircgroupmock\.c)$$
+  ^(src/util/memory\.[ch]|examples/.*)$$
 
 exclude_file_name_regexp--sc_prohibit_readlink = \
-  ^src/(util/virutil|lxc/lxc_container)\.c$$
+  ^src/(util/util|lxc/lxc_container)\.c$$
 
-exclude_file_name_regexp--sc_prohibit_setuid = ^src/util/virutil\.c$$
+exclude_file_name_regexp--sc_prohibit_setuid = ^src/util/util\.c$$
 
 exclude_file_name_regexp--sc_prohibit_sprintf = \
   ^(docs/hacking\.html\.in)|(examples/systemtap/.*stp)|(src/dtrace2systemtap\.pl)|(src/rpc/gensystemtap\.pl)$$
 
-exclude_file_name_regexp--sc_prohibit_strncpy = ^src/util/virstring\.c$$
+exclude_file_name_regexp--sc_prohibit_strncpy = ^src/util/util\.c$$
 
 exclude_file_name_regexp--sc_prohibit_strtol = \
-  ^src/(util/virsexpr|(vbox|xen|xenxs)/.*)\.c$$
+  ^src/(util/sexpr|(vbox|xen|xenxs)/.*)\.c$$
 
-exclude_file_name_regexp--sc_prohibit_xmlGetProp = ^src/util/virxml\.c$$
+exclude_file_name_regexp--sc_prohibit_xmlGetProp = ^src/util/xml\.c$$
 
 exclude_file_name_regexp--sc_prohibit_xmlURI = ^src/util/viruri\.c$$
 
@@ -943,20 +808,9 @@ exclude_file_name_regexp--sc_require_config_h = ^(examples/|tools/virsh-$(_virsh
 exclude_file_name_regexp--sc_require_config_h_first = ^(examples/|tools/virsh-$(_virsh_includes)\.c$$)
 
 exclude_file_name_regexp--sc_trailing_blank = \
-  (/qemuhelpdata/|/sysinfodata/.*\.data|\.(fig|gif|ico|png)$$)
+  (/qemuhelpdata/|\.(fig|gif|ico|png)$$)
 
 exclude_file_name_regexp--sc_unmarked_diagnostics = \
   ^(docs/apibuild.py|tests/virt-aa-helper-test)$$
 
 exclude_file_name_regexp--sc_size_of_brackets = cfg.mk
-
-exclude_file_name_regexp--sc_correct_id_types = \
-  (^src/locking/lock_protocol.x$$)
-
-exclude_file_name_regexp--sc_m4_quote_check = m4/virt-lib.m4
-
-exclude_file_name_regexp--sc_prohibit_include_public_headers_quote = \
-  ^src/internal\.h$$
-
-exclude_file_name_regexp--sc_prohibit_include_public_headers_brackets = \
-  ^(python/|tools/|examples/|include/libvirt/(virterror|libvirt-(qemu|lxc))\.h$$)

daemon/Makefile.am

@@ -1,20 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 ## Copyright (C) 2005-2013 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, see
-## <http://www.gnu.org/licenses/>.
+## See COPYING.LIB for the License of this software
 
 INCLUDES = \
 	-I$(top_builddir)/gnulib/lib -I$(top_srcdir)/gnulib/lib \
@@ -30,9 +17,7 @@ CLEANFILES =
 
 DAEMON_GENERATED =					\
 		$(srcdir)/remote_dispatch.h		\
-		$(srcdir)/lxc_dispatch.h		\
-		$(srcdir)/qemu_dispatch.h		\
-		$(NULL)
+		$(srcdir)/qemu_dispatch.h
 
 DAEMON_SOURCES =					\
 		libvirtd.c libvirtd.h			\
@@ -40,21 +25,19 @@ DAEMON_SOURCES =					\
 		remote.c remote.h			\
 		stream.c stream.h			\
 		../src/remote/remote_protocol.c		\
-		../src/remote/lxc_protocol.c		\
 		../src/remote/qemu_protocol.c		\
 		$(DAEMON_GENERATED)
 
 DISTCLEANFILES =
 EXTRA_DIST =						\
 	remote_dispatch.h				\
-	lxc_dispatch.h					\
 	qemu_dispatch.h					\
 	libvirtd.conf					\
 	libvirtd.init.in				\
 	libvirtd.upstart				\
-	libvirtd.policy.in				\
+	libvirtd.policy-0				\
+	libvirtd.policy-1				\
 	libvirtd.sasl					\
-	libvirtd.service.in				\
 	libvirtd.sysconf				\
 	libvirtd.sysctl					\
 	libvirtd.aug                                    \
@@ -71,23 +54,17 @@ EXTRA_DIST =						\
 BUILT_SOURCES =
 
 REMOTE_PROTOCOL = $(top_srcdir)/src/remote/remote_protocol.x
-LXC_PROTOCOL = $(top_srcdir)/src/remote/lxc_protocol.x
 QEMU_PROTOCOL = $(top_srcdir)/src/remote/qemu_protocol.x
 
 $(srcdir)/remote_dispatch.h: $(srcdir)/../src/rpc/gendispatch.pl \
 		$(REMOTE_PROTOCOL)
-	$(AM_V_GEN)$(PERL) -w $(srcdir)/../src/rpc/gendispatch.pl \
-	  --mode=server remote REMOTE $(REMOTE_PROTOCOL) > $@
-
-$(srcdir)/lxc_dispatch.h: $(srcdir)/../src/rpc/gendispatch.pl \
-		$(LXC_PROTOCOL)
-	$(AM_V_GEN)$(PERL) -w $(srcdir)/../src/rpc/gendispatch.pl \
-	  --mode=server lxc LXC $(LXC_PROTOCOL) > $@
+	$(AM_V_GEN)$(PERL) -w $(srcdir)/../src/rpc/gendispatch.pl -b remote REMOTE \
+	  $(REMOTE_PROTOCOL) > $@
 
 $(srcdir)/qemu_dispatch.h: $(srcdir)/../src/rpc/gendispatch.pl \
 		$(QEMU_PROTOCOL)
-	$(AM_V_GEN)$(PERL) -w $(srcdir)/../src/rpc/gendispatch.pl \
-	  --mode=server qemu QEMU $(QEMU_PROTOCOL) > $@
+	$(AM_V_GEN)$(PERL) -w $(srcdir)/../src/rpc/gendispatch.pl -b qemu QEMU \
+	  $(QEMU_PROTOCOL) > $@
 
 if WITH_LIBVIRTD
 
@@ -119,13 +96,12 @@ libvirtd_SOURCES = $(DAEMON_SOURCES)
 libvirtd_CFLAGS = \
 	$(LIBXML_CFLAGS) $(GNUTLS_CFLAGS) $(SASL_CFLAGS) \
 	$(XDR_CFLAGS) $(POLKIT_CFLAGS) $(DBUS_CFLAGS) $(LIBNL_CFLAGS) \
-	$(WARN_CFLAGS) $(PIE_CFLAGS) \
+	$(WARN_CFLAGS) \
 	$(COVERAGE_CFLAGS) \
 	-DQEMUD_PID_FILE="\"$(QEMUD_PID_FILE)\""
 
 libvirtd_LDFLAGS =					\
-	$(PIE_LDFLAGS)					\
-	$(RELRO_LDFLAGS)				\
+	$(WARN_CFLAGS)					\
 	$(COVERAGE_LDFLAGS)
 
 libvirtd_LDADD =					\
@@ -141,7 +117,6 @@ libvirtd_LDADD += ../src/libvirt_probes.lo
 endif
 
 libvirtd_LDADD += \
-	../src/libvirt-lxc.la \
 	../src/libvirt-qemu.la
 
 if ! WITH_DRIVER_MODULES
@@ -168,10 +143,6 @@ if WITH_UML
     libvirtd_LDADD += ../src/libvirt_driver_uml.la
 endif
 
-if WITH_VBOX
-    libvirtd_LDADD += ../src/libvirt_driver_vbox.la
-endif
-
 if WITH_STORAGE
     libvirtd_LDADD += ../src/libvirt_driver_storage.la
 endif
@@ -199,23 +170,16 @@ endif
 
 libvirtd_LDADD += ../src/libvirt.la
 
-if WITH_POLKIT
-if WITH_POLKIT0
+if HAVE_POLKIT
+if HAVE_POLKIT0
 policydir = $(datadir)/PolicyKit/policy
-policyauth = auth_admin_keep_session
+policyfile = libvirtd.policy-0
 else
 policydir = $(datadir)/polkit-1/actions
-policyauth = auth_admin_keep
+policyfile = libvirtd.policy-1
 endif
 endif
 
-libvirtd.policy: libvirtd.policy.in $(top_builddir)/config.status
-	$(AM_V_GEN) sed \
-	    -e 's|[@]authaction[@]|$(policyauth)|g' \
-	    < $< > $@-t && \
-	mv $@-t $@
-BUILT_SOURCES += libvirtd.policy
-
 install-data-local: install-init-redhat install-init-systemd install-init-upstart \
 		install-data-sasl install-data-polkit \
 		install-logrotate install-sysctl
@@ -230,10 +194,10 @@ uninstall-local:: uninstall-init-redhat uninstall-init-systemd uninstall-init-up
 	rmdir $(DESTDIR)$(localstatedir)/run/libvirt || :
 	rmdir $(DESTDIR)$(localstatedir)/lib/libvirt || :
 
-if WITH_POLKIT
+if HAVE_POLKIT
 install-data-polkit::
 	$(MKDIR_P) $(DESTDIR)$(policydir)
-	$(INSTALL_DATA) libvirtd.policy $(DESTDIR)$(policydir)/org.libvirt.unix.policy
+	$(INSTALL_DATA) $(srcdir)/$(policyfile) $(DESTDIR)$(policydir)/org.libvirt.unix.policy
 uninstall-data-polkit::
 	rm -f $(DESTDIR)$(policydir)/org.libvirt.unix.policy
 	rmdir $(DESTDIR)$(policydir) || :
@@ -352,6 +316,7 @@ uninstall-init-upstart:
 endif # LIBVIRT_INIT_SCRIPT_UPSTART
 
 
+EXTRA_DIST += libvirtd.service.in
 if LIBVIRT_INIT_SCRIPT_SYSTEMD
 
 SYSTEMD_UNIT_DIR = /lib/systemd/system
@@ -413,13 +378,13 @@ endif # WITH_LIBVIRTD
 POD2MAN = pod2man -c "Virtualization Support" \
 			-r "$(PACKAGE)-$(VERSION)" -s 8
 
-$(srcdir)/libvirtd.8.in: libvirtd.pod.in $(top_srcdir)/configure.ac
+$(srcdir)/libvirtd.8.in: libvirtd.pod.in
 	$(AM_V_GEN)$(POD2MAN) --name LIBVIRTD $< $@ \
 	    && if grep 'POD ERROR' $@ ; then rm $@; exit 1; fi
 
 # This is needed for clients too, so can't wrap in
 # the WITH_LIBVIRTD conditional
-if WITH_SASL
+if HAVE_SASL
 install-data-sasl:
 	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/sasl2/
 	$(INSTALL_DATA) $(srcdir)/libvirtd.sasl $(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf

daemon/THREADS.txt

@@ -40,7 +40,7 @@ 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 on the 'dx' job queue for the
+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.
 

daemon/libvirtd-config.c

@@ -24,16 +24,14 @@
 #include <config.h>
 
 #include "libvirtd-config.h"
-#include "virconf.h"
-#include "viralloc.h"
-#include "virerror.h"
-#include "virlog.h"
+#include "conf.h"
+#include "memory.h"
+#include "virterror_internal.h"
+#include "logging.h"
 #include "rpc/virnetserver.h"
 #include "configmake.h"
 #include "remote/remote_protocol.h"
 #include "remote/remote_driver.h"
-#include "virstring.h"
-#include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_CONF
 
@@ -47,7 +45,7 @@ remoteConfigGetStringList(virConfPtr conf, const char *key, char ***list_arg,
                           const char *filename)
 {
     char **list;
-    virConfValuePtr p = virConfGetValue(conf, key);
+    virConfValuePtr p = virConfGetValue (conf, key);
     if (!p)
         return 0;
 
@@ -59,11 +57,15 @@ remoteConfigGetStringList(virConfPtr conf, const char *key, char ***list_arg,
                            key);
             return -1;
         }
-        if (VIR_STRDUP(list[0], p->str) < 0) {
+        list[0] = strdup (p->str);
+        list[1] = NULL;
+        if (list[0] == NULL) {
+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                           _("failed to allocate memory for %s config list value"),
+                           key);
             VIR_FREE(list);
             return -1;
         }
-        list[1] = NULL;
         break;
 
     case VIR_CONF_LIST: {
@@ -86,11 +88,15 @@ remoteConfigGetStringList(virConfPtr conf, const char *key, char ***list_arg,
                 VIR_FREE(list);
                 return -1;
             }
-            if (VIR_STRDUP(list[i], pp->str) < 0) {
+            list[i] = strdup (pp->str);
+            if (list[i] == NULL) {
                 int j;
-                for (j = 0; j < i; j++)
+                for (j = 0 ; j < i ; j++)
                     VIR_FREE(list[j]);
                 VIR_FREE(list);
+                virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                               _("failed to allocate memory for %s config list value"),
+                               key);
                 return -1;
             }
 
@@ -113,42 +119,44 @@ remoteConfigGetStringList(virConfPtr conf, const char *key, char ***list_arg,
 
 /* A helper function used by each of the following macros.  */
 static int
-checkType(virConfValuePtr p, const char *filename,
-          const char *key, virConfType required_type)
+checkType (virConfValuePtr p, const char *filename,
+           const char *key, virConfType required_type)
 {
     if (p->type != required_type) {
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                        _("remoteReadConfigFile: %s: %s: invalid type:"
                          " got %s; expected %s"), filename, key,
-                       virConfTypeName(p->type),
-                       virConfTypeName(required_type));
+                       virConfTypeName (p->type),
+                       virConfTypeName (required_type));
         return -1;
     }
     return 0;
 }
 
 /* If there is no config data for the key, #var_name, then do nothing.
-   If there is valid data of type VIR_CONF_STRING, and VIR_STRDUP succeeds,
-   store the result in var_name.  Otherwise, (i.e. invalid type, or VIR_STRDUP
+   If there is valid data of type VIR_CONF_STRING, and strdup succeeds,
+   store the result in var_name.  Otherwise, (i.e. invalid type, or strdup
    failure), give a diagnostic and "goto" the cleanup-and-fail label.  */
 #define GET_CONF_STR(conf, filename, var_name)                          \
     do {                                                                \
-        virConfValuePtr p = virConfGetValue(conf, #var_name);           \
+        virConfValuePtr p = virConfGetValue (conf, #var_name);          \
         if (p) {                                                        \
-            if (checkType(p, filename, #var_name, VIR_CONF_STRING) < 0) \
+            if (checkType (p, filename, #var_name, VIR_CONF_STRING) < 0) \
                 goto error;                                             \
             VIR_FREE(data->var_name);                                   \
-            if (VIR_STRDUP(data->var_name, p->str) < 0)                 \
+            if (!(data->var_name = strdup (p->str))) {                  \
+                virReportOOMError();                                    \
                 goto error;                                             \
+            }                                                           \
         }                                                               \
     } while (0)
 
 /* Like GET_CONF_STR, but for integral values.  */
 #define GET_CONF_INT(conf, filename, var_name)                          \
     do {                                                                \
-        virConfValuePtr p = virConfGetValue(conf, #var_name);           \
+        virConfValuePtr p = virConfGetValue (conf, #var_name);          \
         if (p) {                                                        \
-            if (checkType(p, filename, #var_name, VIR_CONF_LONG) < 0)   \
+            if (checkType (p, filename, #var_name, VIR_CONF_LONG) < 0)  \
                 goto error;                                             \
             data->var_name = p->l;                                      \
         }                                                               \
@@ -158,11 +166,11 @@ checkType(virConfValuePtr p, const char *filename,
 static int remoteConfigGetAuth(virConfPtr conf, const char *key, int *auth, const char *filename) {
     virConfValuePtr p;
 
-    p = virConfGetValue(conf, key);
+    p = virConfGetValue (conf, key);
     if (!p)
         return 0;
 
-    if (checkType(p, filename, key, VIR_CONF_STRING) < 0)
+    if (checkType (p, filename, key, VIR_CONF_STRING) < 0)
         return -1;
 
     if (!p->str)
@@ -170,7 +178,7 @@ static int remoteConfigGetAuth(virConfPtr conf, const char *key, int *auth, cons
 
     if (STREQ(p->str, "none")) {
         *auth = VIR_NET_SERVER_SERVICE_AUTH_NONE;
-#if WITH_SASL
+#if HAVE_SASL
     } else if (STREQ(p->str, "sasl")) {
         *auth = VIR_NET_SERVER_SERVICE_AUTH_SASL;
 #endif
@@ -190,8 +198,8 @@ int
 daemonConfigFilePath(bool privileged, char **configfile)
 {
     if (privileged) {
-        if (VIR_STRDUP(*configfile, SYSCONFDIR "/libvirt/libvirtd.conf") < 0)
-            goto error;
+        if (!(*configfile = strdup(SYSCONFDIR "/libvirt/libvirtd.conf")))
+            goto no_memory;
     } else {
         char *configdir = NULL;
 
@@ -228,12 +236,13 @@ daemonConfigNew(bool privileged ATTRIBUTE_UNUSED)
     data->listen_tls = 1;
     data->listen_tcp = 0;
 
-    if (VIR_STRDUP(data->tls_port, LIBVIRTD_TLS_PORT) < 0 ||
-        VIR_STRDUP(data->tcp_port, LIBVIRTD_TCP_PORT) < 0)
-        goto error;
+    if (!(data->tls_port = strdup(LIBVIRTD_TLS_PORT)))
+        goto no_memory;
+    if (!(data->tcp_port = strdup(LIBVIRTD_TCP_PORT)))
+        goto no_memory;
 
     /* Only default to PolicyKit if running as root */
-#if WITH_POLKIT
+#if HAVE_POLKIT
     if (privileged) {
         data->auth_unix_rw = REMOTE_AUTH_POLKIT;
         data->auth_unix_ro = REMOTE_AUTH_POLKIT;
@@ -241,16 +250,20 @@ daemonConfigNew(bool privileged ATTRIBUTE_UNUSED)
 #endif
         data->auth_unix_rw = REMOTE_AUTH_NONE;
         data->auth_unix_ro = REMOTE_AUTH_NONE;
-#if WITH_POLKIT
+#if HAVE_POLKIT
     }
 #endif
 
-    if (VIR_STRDUP(data->unix_sock_rw_perms,
-                   data->auth_unix_rw == REMOTE_AUTH_POLKIT ? "0777" : "0700") < 0 ||
-        VIR_STRDUP(data->unix_sock_ro_perms, "0777") < 0)
-        goto error;
+    if (data->auth_unix_rw == REMOTE_AUTH_POLKIT)
+        data->unix_sock_rw_perms = strdup("0777"); /* Allow world */
+    else
+        data->unix_sock_rw_perms = strdup("0700"); /* Allow user only */
+    data->unix_sock_ro_perms = strdup("0777"); /* Always allow world */
+    if (!data->unix_sock_ro_perms ||
+        !data->unix_sock_rw_perms)
+        goto no_memory;
 
-#if WITH_SASL
+#if HAVE_SASL
     data->auth_tcp = REMOTE_AUTH_SASL;
 #else
     data->auth_tcp = REMOTE_AUTH_NONE;
@@ -277,7 +290,7 @@ daemonConfigNew(bool privileged ATTRIBUTE_UNUSED)
     data->keepalive_count = 5;
     data->keepalive_required = 0;
 
-    localhost = virGetHostname();
+    localhost = virGetHostname(NULL);
     if (localhost == NULL) {
         /* we couldn't resolve the hostname; assume that we are
          * running in disconnected operation, and report a less
@@ -300,7 +313,6 @@ daemonConfigNew(bool privileged ATTRIBUTE_UNUSED)
 
 no_memory:
     virReportOOMError();
-error:
     daemonConfigFree(data);
     return NULL;
 }
@@ -354,22 +366,24 @@ daemonConfigLoadOptions(struct daemonConfig *data,
                         const char *filename,
                         virConfPtr conf)
 {
-    GET_CONF_INT(conf, filename, listen_tcp);
-    GET_CONF_INT(conf, filename, listen_tls);
-    GET_CONF_STR(conf, filename, tls_port);
-    GET_CONF_STR(conf, filename, tcp_port);
-    GET_CONF_STR(conf, filename, listen_addr);
+    GET_CONF_INT (conf, filename, listen_tcp);
+    GET_CONF_INT (conf, filename, listen_tls);
+    GET_CONF_STR (conf, filename, tls_port);
+    GET_CONF_STR (conf, filename, tcp_port);
+    GET_CONF_STR (conf, filename, listen_addr);
 
     if (remoteConfigGetAuth(conf, "auth_unix_rw", &data->auth_unix_rw, filename) < 0)
         goto error;
-#if WITH_POLKIT
+#if HAVE_POLKIT
     /* Change default perms to be wide-open if PolicyKit is enabled.
      * Admin can always override in config file
      */
     if (data->auth_unix_rw == REMOTE_AUTH_POLKIT) {
         VIR_FREE(data->unix_sock_rw_perms);
-        if (VIR_STRDUP(data->unix_sock_rw_perms, "0777") < 0)
+        if (!(data->unix_sock_rw_perms = strdup("0777"))) {
+            virReportOOMError();
             goto error;
+        }
     }
 #endif
     if (remoteConfigGetAuth(conf, "auth_unix_ro", &data->auth_unix_ro, filename) < 0)
@@ -379,22 +393,22 @@ daemonConfigLoadOptions(struct daemonConfig *data,
     if (remoteConfigGetAuth(conf, "auth_tls", &data->auth_tls, filename) < 0)
         goto error;
 
-    GET_CONF_STR(conf, filename, unix_sock_group);
-    GET_CONF_STR(conf, filename, unix_sock_ro_perms);
-    GET_CONF_STR(conf, filename, unix_sock_rw_perms);
+    GET_CONF_STR (conf, filename, unix_sock_group);
+    GET_CONF_STR (conf, filename, unix_sock_ro_perms);
+    GET_CONF_STR (conf, filename, unix_sock_rw_perms);
 
-    GET_CONF_STR(conf, filename, unix_sock_dir);
+    GET_CONF_STR (conf, filename, unix_sock_dir);
 
-    GET_CONF_INT(conf, filename, mdns_adv);
-    GET_CONF_STR(conf, filename, mdns_name);
+    GET_CONF_INT (conf, filename, mdns_adv);
+    GET_CONF_STR (conf, filename, mdns_name);
 
-    GET_CONF_INT(conf, filename, tls_no_sanity_certificate);
-    GET_CONF_INT(conf, filename, tls_no_verify_certificate);
+    GET_CONF_INT (conf, filename, tls_no_sanity_certificate);
+    GET_CONF_INT (conf, filename, tls_no_verify_certificate);
 
-    GET_CONF_STR(conf, filename, key_file);
-    GET_CONF_STR(conf, filename, cert_file);
-    GET_CONF_STR(conf, filename, ca_file);
-    GET_CONF_STR(conf, filename, crl_file);
+    GET_CONF_STR (conf, filename, key_file);
+    GET_CONF_STR (conf, filename, cert_file);
+    GET_CONF_STR (conf, filename, ca_file);
+    GET_CONF_STR (conf, filename, crl_file);
 
     if (remoteConfigGetStringList(conf, "tls_allowed_dn_list",
                                   &data->tls_allowed_dn_list, filename) < 0)
@@ -406,28 +420,28 @@ daemonConfigLoadOptions(struct daemonConfig *data,
         goto error;
 
 
-    GET_CONF_INT(conf, filename, min_workers);
-    GET_CONF_INT(conf, filename, max_workers);
-    GET_CONF_INT(conf, filename, max_clients);
+    GET_CONF_INT (conf, filename, min_workers);
+    GET_CONF_INT (conf, filename, max_workers);
+    GET_CONF_INT (conf, filename, max_clients);
 
-    GET_CONF_INT(conf, filename, prio_workers);
+    GET_CONF_INT (conf, filename, prio_workers);
 
-    GET_CONF_INT(conf, filename, max_requests);
-    GET_CONF_INT(conf, filename, max_client_requests);
+    GET_CONF_INT (conf, filename, max_requests);
+    GET_CONF_INT (conf, filename, max_client_requests);
 
-    GET_CONF_INT(conf, filename, audit_level);
-    GET_CONF_INT(conf, filename, audit_logging);
+    GET_CONF_INT (conf, filename, audit_level);
+    GET_CONF_INT (conf, filename, audit_logging);
 
-    GET_CONF_STR(conf, filename, host_uuid);
+    GET_CONF_STR (conf, filename, host_uuid);
 
-    GET_CONF_INT(conf, filename, log_level);
-    GET_CONF_STR(conf, filename, log_filters);
-    GET_CONF_STR(conf, filename, log_outputs);
-    GET_CONF_INT(conf, filename, log_buffer_size);
+    GET_CONF_INT (conf, filename, log_level);
+    GET_CONF_STR (conf, filename, log_filters);
+    GET_CONF_STR (conf, filename, log_outputs);
+    GET_CONF_INT (conf, filename, log_buffer_size);
 
-    GET_CONF_INT(conf, filename, keepalive_interval);
-    GET_CONF_INT(conf, filename, keepalive_count);
-    GET_CONF_INT(conf, filename, keepalive_required);
+    GET_CONF_INT (conf, filename, keepalive_interval);
+    GET_CONF_INT (conf, filename, keepalive_count);
+    GET_CONF_INT (conf, filename, keepalive_required);
 
     return 0;
 

daemon/libvirtd.c

@@ -33,7 +33,7 @@
 #include <locale.h>
 
 #include "libvirt_internal.h"
-#include "virerror.h"
+#include "virterror_internal.h"
 #include "virfile.h"
 #include "virpidfile.h"
 #include "virprocess.h"
@@ -43,17 +43,20 @@
 #include "libvirtd.h"
 #include "libvirtd-config.h"
 
-#include "viruuid.h"
+#include "util.h"
+#include "uuid.h"
 #include "remote_driver.h"
-#include "viralloc.h"
-#include "virconf.h"
+#include "memory.h"
+#include "conf.h"
 #include "virnetlink.h"
 #include "virnetserver.h"
+#include "threads.h"
 #include "remote.h"
-#include "virhook.h"
+#include "remote_driver.h"
+#include "hooks.h"
+#include "uuid.h"
 #include "viraudit.h"
 #include "locking/lock_manager.h"
-#include "virstring.h"
 
 #ifdef WITH_DRIVER_MODULES
 # include "driver.h"
@@ -73,9 +76,6 @@
 # ifdef WITH_UML
 #  include "uml/uml_driver.h"
 # endif
-# ifdef WITH_VBOX
-#  include "vbox/vbox_driver.h"
-# endif
 # ifdef WITH_NETWORK
 #  include "network/bridge_driver.h"
 # endif
@@ -98,14 +98,11 @@
 
 #include "configmake.h"
 
-#include "virdbus.h"
-
-#if WITH_SASL
+#if HAVE_SASL
 virNetSASLContextPtr saslCtxt = NULL;
 #endif
 virNetServerProgramPtr remoteProgram = NULL;
 virNetServerProgramPtr qemuProgram = NULL;
-virNetServerProgramPtr lxcProgram = NULL;
 
 enum {
     VIR_DAEMON_ERR_NONE = 0,
@@ -244,8 +241,8 @@ daemonPidFilePath(bool privileged,
                   char **pidfile)
 {
     if (privileged) {
-        if (VIR_STRDUP(*pidfile, LOCALSTATEDIR "/run/libvirtd.pid") < 0)
-            goto error;
+        if (!(*pidfile = strdup(LOCALSTATEDIR "/run/libvirtd.pid")))
+            goto no_memory;
     } else {
         char *rundir = NULL;
         mode_t old_umask;
@@ -290,9 +287,10 @@ daemonUnixSocketPaths(struct daemonConfig *config,
             goto no_memory;
     } else {
         if (privileged) {
-            if (VIR_STRDUP(*sockfile, LOCALSTATEDIR "/run/libvirt/libvirt-sock") < 0 ||
-                VIR_STRDUP(*rosockfile, LOCALSTATEDIR "/run/libvirt/libvirt-sock-ro") < 0)
-                goto error;
+            if (!(*sockfile = strdup(LOCALSTATEDIR "/run/libvirt/libvirt-sock")))
+                goto no_memory;
+            if (!(*rosockfile = strdup(LOCALSTATEDIR "/run/libvirt/libvirt-sock-ro")))
+                goto no_memory;
         } else {
             char *rundir = NULL;
             mode_t old_umask;
@@ -403,9 +401,6 @@ static void daemonInitialize(void)
 # ifdef WITH_UML
     virDriverLoadModule("uml");
 # endif
-# ifdef WITH_VBOX
-    virDriverLoadModule("vbox");
-# endif
 #else
 # ifdef WITH_NETWORK
     networkRegister();
@@ -440,9 +435,6 @@ static void daemonInitialize(void)
 # ifdef WITH_UML
     umlRegister();
 # endif
-# ifdef WITH_VBOX
-    vboxRegister();
-# endif
 #endif
 }
 
@@ -457,9 +449,7 @@ static int daemonSetupNetworking(virNetServerPtr srv,
     virNetServerServicePtr svc = NULL;
     virNetServerServicePtr svcRO = NULL;
     virNetServerServicePtr svcTCP = NULL;
-#if WITH_GNUTLS
     virNetServerServicePtr svcTLS = NULL;
-#endif
     gid_t unix_sock_gid = 0;
     int unix_sock_ro_mask = 0;
     int unix_sock_rw_mask = 0;
@@ -484,11 +474,9 @@ static int daemonSetupNetworking(virNetServerPtr srv,
                                            unix_sock_rw_mask,
                                            unix_sock_gid,
                                            config->auth_unix_rw,
-#if WITH_GNUTLS
-                                           NULL,
-#endif
                                            false,
-                                           config->max_client_requests)))
+                                           config->max_client_requests,
+                                           NULL)))
         goto error;
     if (sock_path_ro) {
         VIR_DEBUG("Registering unix socket %s", sock_path_ro);
@@ -496,11 +484,9 @@ static int daemonSetupNetworking(virNetServerPtr srv,
                                                  unix_sock_ro_mask,
                                                  unix_sock_gid,
                                                  config->auth_unix_ro,
-#if WITH_GNUTLS
-                                                 NULL,
-#endif
                                                  true,
-                                                 config->max_client_requests)))
+                                                 config->max_client_requests,
+                                                 NULL)))
             goto error;
     }
 
@@ -521,11 +507,9 @@ static int daemonSetupNetworking(virNetServerPtr srv,
             if (!(svcTCP = virNetServerServiceNewTCP(config->listen_addr,
                                                      config->tcp_port,
                                                      config->auth_tcp,
-#if WITH_GNUTLS
-                                                     NULL,
-#endif
                                                      false,
-                                                     config->max_client_requests)))
+                                                     config->max_client_requests,
+                                                     NULL)))
                 goto error;
 
             if (virNetServerAddService(srv, svcTCP,
@@ -533,7 +517,6 @@ static int daemonSetupNetworking(virNetServerPtr srv,
                 goto error;
         }
 
-#if WITH_GNUTLS
         if (config->listen_tls) {
             virNetTLSContextPtr ctxt = NULL;
 
@@ -563,9 +546,9 @@ static int daemonSetupNetworking(virNetServerPtr srv,
                   virNetServerServiceNewTCP(config->listen_addr,
                                             config->tls_port,
                                             config->auth_tls,
-                                            ctxt,
                                             false,
-                                            config->max_client_requests))) {
+                                            config->max_client_requests,
+                                            ctxt))) {
                 virObjectUnref(ctxt);
                 goto error;
             }
@@ -576,23 +559,13 @@ static int daemonSetupNetworking(virNetServerPtr srv,
 
             virObjectUnref(ctxt);
         }
-#else
-        (void)privileged;
-        if (config->listen_tls) {
-            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                           _("This libvirtd build does not support TLS"));
-            goto error;
-        }
-#endif
     }
 
-#if WITH_SASL
+#if HAVE_SASL
     if (config->auth_unix_rw == REMOTE_AUTH_SASL ||
         config->auth_unix_ro == REMOTE_AUTH_SASL ||
-# if WITH_GNUTLS
-        config->auth_tls == REMOTE_AUTH_SASL ||
-# endif
-        config->auth_tcp == REMOTE_AUTH_SASL) {
+        config->auth_tcp == REMOTE_AUTH_SASL ||
+        config->auth_tls == REMOTE_AUTH_SASL) {
         saslCtxt = virNetSASLContextNewServer(
             (const char *const*)config->sasl_allowed_username_list);
         if (!saslCtxt)
@@ -603,9 +576,7 @@ static int daemonSetupNetworking(virNetServerPtr srv,
     return 0;
 
 error:
-#if WITH_GNUTLS
     virObjectUnref(svcTLS);
-#endif
     virObjectUnref(svcTCP);
     virObjectUnref(svc);
     virObjectUnref(svcRO);
@@ -613,6 +584,16 @@ error:
 }
 
 
+static int daemonShutdownCheck(virNetServerPtr srv ATTRIBUTE_UNUSED,
+                               void *opaque ATTRIBUTE_UNUSED)
+{
+    if (virStateActive())
+        return 0;
+
+    return 1;
+}
+
+
 /*
  * Set up the logging environment
  * By default if daemonized all errors go to the logfile libvirtd.log,
@@ -655,24 +636,7 @@ daemonSetupLogging(struct daemonConfig *config,
         virLogParseOutputs(config->log_outputs);
 
     /*
-     * If no defined outputs, and either running
-     * as daemon or not on a tty, then first try
-     * to direct it to the systemd journal
-     * (if it exists)....
-     */
-    if (virLogGetNbOutputs() == 0 &&
-        (godaemon || !isatty(STDIN_FILENO))) {
-        char *tmp;
-        if (access("/run/systemd/journal/socket", W_OK) >= 0) {
-            if (virAsprintf(&tmp, "%d:journald", virLogGetDefaultPriority()) < 0)
-                goto no_memory;
-            virLogParseOutputs(tmp);
-            VIR_FREE(tmp);
-        }
-    }
-
-    /*
-     * otherwise direct to libvirtd.log when running
+     * If no defined outputs, then direct to libvirtd.log when running
      * as daemon. Otherwise the default output is stderr.
      */
     if (virLogGetNbOutputs() == 0) {
@@ -732,23 +696,23 @@ error:
 static void
 daemonVersion(const char *argv0)
 {
-    printf("%s (%s) %s\n", argv0, PACKAGE_NAME, PACKAGE_VERSION);
+    printf ("%s (%s) %s\n", argv0, PACKAGE_NAME, PACKAGE_VERSION);
 }
 
 #ifdef __sun
 static int
 daemonSetupPrivs(void)
 {
-    chown("/var/run/libvirt", SYSTEM_UID, SYSTEM_UID);
+    chown ("/var/run/libvirt", SYSTEM_UID, SYSTEM_UID);
 
-    if (__init_daemon_priv(PU_RESETGROUPS | PU_CLEARLIMITSET,
-                           SYSTEM_UID, SYSTEM_UID, PRIV_XVM_CONTROL, NULL)) {
+    if (__init_daemon_priv (PU_RESETGROUPS | PU_CLEARLIMITSET,
+        SYSTEM_UID, SYSTEM_UID, PRIV_XVM_CONTROL, NULL)) {
         VIR_ERROR(_("additional privileges are required"));
         return -1;
     }
 
-    if (priv_set(PRIV_OFF, PRIV_ALLSETS, PRIV_FILE_LINK_ANY, PRIV_PROC_INFO,
-                 PRIV_PROC_SESSION, PRIV_PROC_EXEC, PRIV_PROC_FORK, NULL)) {
+    if (priv_set (PRIV_OFF, PRIV_ALLSETS, PRIV_FILE_LINK_ANY, PRIV_PROC_INFO,
+        PRIV_PROC_SESSION, PRIV_PROC_EXEC, PRIV_PROC_FORK, NULL)) {
         VIR_ERROR(_("failed to set reduced privileges"));
         return -1;
     }
@@ -791,128 +755,24 @@ static int daemonSetupSignals(virNetServerPtr srv)
     return 0;
 }
 
-
-static void daemonInhibitCallback(bool inhibit, void *opaque)
-{
-    virNetServerPtr srv = opaque;
-
-    if (inhibit)
-        virNetServerAddShutdownInhibition(srv);
-    else
-        virNetServerRemoveShutdownInhibition(srv);
-}
-
-
-#ifdef HAVE_DBUS
-static DBusConnection *sessionBus;
-static DBusConnection *systemBus;
-
-static void daemonStopWorker(void *opaque)
-{
-    virNetServerPtr srv = opaque;
-
-    VIR_DEBUG("Begin stop srv=%p", srv);
-
-    ignore_value(virStateStop());
-
-    VIR_DEBUG("Completed stop srv=%p", srv);
-
-    /* Exit libvirtd cleanly */
-    virNetServerQuit(srv);
-}
-
-
-/* We do this in a thread to not block the main loop */
-static void daemonStop(virNetServerPtr srv)
-{
-    virThread thr;
-    virObjectRef(srv);
-    if (virThreadCreate(&thr, false, daemonStopWorker, srv) < 0)
-        virObjectUnref(srv);
-}
-
-
-static DBusHandlerResult
-handleSessionMessageFunc(DBusConnection *connection ATTRIBUTE_UNUSED,
-                         DBusMessage *message,
-                         void *opaque)
-{
-    virNetServerPtr srv = opaque;
-
-    VIR_DEBUG("srv=%p", srv);
-
-    if (dbus_message_is_signal(message,
-                               DBUS_INTERFACE_LOCAL,
-                               "Disconnected"))
-        daemonStop(srv);
-
-    return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-}
-
-
-static DBusHandlerResult
-handleSystemMessageFunc(DBusConnection *connection ATTRIBUTE_UNUSED,
-                        DBusMessage *message,
-                        void *opaque)
-{
-    virNetServerPtr srv = opaque;
-
-    VIR_DEBUG("srv=%p", srv);
-
-    if (dbus_message_is_signal(message,
-                               "org.freedesktop.login1.Manager",
-                               "PrepareForShutdown"))
-        daemonStop(srv);
-
-    return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-}
-#endif
-
-
 static void daemonRunStateInit(void *opaque)
 {
     virNetServerPtr srv = opaque;
 
-    /* Since driver initialization can take time inhibit daemon shutdown until
-       we're done so clients get a chance to connect */
-    daemonInhibitCallback(true, srv);
-
     /* Start the stateful HV drivers
      * This is deliberately done after telling the parent process
      * we're ready, since it can take a long time and this will
      * seriously delay OS bootup process */
-    if (virStateInitialize(virNetServerIsPrivileged(srv),
-                           daemonInhibitCallback,
-                           srv) < 0) {
+    if (virStateInitialize(virNetServerIsPrivileged(srv)) < 0) {
         VIR_ERROR(_("Driver state initialization failed"));
         /* Ensure the main event loop quits */
         kill(getpid(), SIGTERM);
-        goto cleanup;
+        virObjectUnref(srv);
+        return;
     }
 
-#ifdef HAVE_DBUS
-    /* Tie the non-priviledged libvirtd to the session/shutdown lifecycle */
-    if (!virNetServerIsPrivileged(srv)) {
-
-        sessionBus = virDBusGetSessionBus();
-        if (sessionBus != NULL)
-            dbus_connection_add_filter(sessionBus,
-                                       handleSessionMessageFunc, srv, NULL);
-
-        systemBus = virDBusGetSystemBus();
-        if (systemBus != NULL) {
-            dbus_connection_add_filter(systemBus,
-                                       handleSystemMessageFunc, srv, NULL);
-            dbus_bus_add_match(systemBus,
-                               "type='signal',sender='org.freedesktop.login1', interface='org.freedesktop.login1.Manager'",
-                               NULL);
-        }
-    }
-#endif
     /* Only now accept clients from network */
     virNetServerUpdateServices(srv, true);
-cleanup:
-    daemonInhibitCallback(false, srv);
     virObjectUnref(srv);
 }
 
@@ -969,8 +829,7 @@ static int migrateProfile(void)
 
     config_home = getenv("XDG_CONFIG_HOME");
     if (config_home && config_home[0] != '\0') {
-        if (VIR_STRDUP(xdg_dir, config_home) < 0)
-            goto cleanup;
+        xdg_dir = strdup(config_home);
     } else {
         if (virAsprintf(&xdg_dir, "%s/.config", home) < 0) {
             goto cleanup;
@@ -1008,43 +867,42 @@ static int migrateProfile(void)
 static void
 daemonUsage(const char *argv0, bool privileged)
 {
-    fprintf(stderr,
-            _("\n"
-              "Usage:\n"
-              "  %s [options]\n"
-              "\n"
-              "Options:\n"
-              "  -v | --verbose         Verbose messages.\n"
-              "  -d | --daemon          Run as a daemon & write PID file.\n"
-              "  -l | --listen          Listen for TCP/IP connections.\n"
-              "  -t | --timeout <secs>  Exit after timeout period.\n"
-              "  -f | --config <file>   Configuration file.\n"
-              "     | --version         Display version information.\n"
-              "  -p | --pid-file <file> Change name of PID file.\n"
-              "\n"
-              "libvirt management daemon:\n"),
-            argv0);
+    fprintf (stderr,
+             _("\n\
+Usage:\n\
+  %s [options]\n\
+\n\
+Options:\n\
+  -v | --verbose         Verbose messages.\n\
+  -d | --daemon          Run as a daemon & write PID file.\n\
+  -l | --listen          Listen for TCP/IP connections.\n\
+  -t | --timeout <secs>  Exit after timeout period.\n\
+  -f | --config <file>   Configuration file.\n\
+     | --version         Display version information.\n\
+  -p | --pid-file <file> Change name of PID file.\n\
+\n\
+libvirt management daemon:\n"), argv0);
 
     if (privileged) {
         fprintf(stderr,
-                _("\n"
-                  "  Default paths:\n"
-                  "\n"
-                  "    Configuration file (unless overridden by -f):\n"
-                  "      %s/libvirt/libvirtd.conf\n"
-                  "\n"
-                  "    Sockets:\n"
-                  "      %s/run/libvirt/libvirt-sock\n"
-                  "      %s/run/libvirt/libvirt-sock-ro\n"
-                  "\n"
-                  "    TLS:\n"
-                  "      CA certificate:     %s/pki/CA/caert.pem\n"
-                  "      Server certificate: %s/pki/libvirt/servercert.pem\n"
-                  "      Server private key: %s/pki/libvirt/private/serverkey.pem\n"
-                  "\n"
-                  "    PID file (unless overridden by -p):\n"
-                  "      %s/run/libvirtd.pid\n"
-                  "\n"),
+                _("\n\
+  Default paths:\n\
+\n\
+    Configuration file (unless overridden by -f):\n\
+      %s/libvirt/libvirtd.conf\n\
+\n\
+    Sockets:\n\
+      %s/run/libvirt/libvirt-sock\n\
+      %s/run/libvirt/libvirt-sock-ro\n\
+\n\
+    TLS:\n\
+      CA certificate:     %s/pki/CA/caert.pem\n\
+      Server certificate: %s/pki/libvirt/servercert.pem\n\
+      Server private key: %s/pki/libvirt/private/serverkey.pem\n\
+\n\
+    PID file (unless overridden by -p):\n\
+      %s/run/libvirtd.pid\n\
+\n"),
                 SYSCONFDIR,
                 LOCALSTATEDIR,
                 LOCALSTATEDIR,
@@ -1053,24 +911,24 @@ daemonUsage(const char *argv0, bool privileged)
                 SYSCONFDIR,
                 LOCALSTATEDIR);
     } else {
-        fprintf(stderr, "%s",
-                _("\n"
-                  "  Default paths:\n"
-                  "\n"
-                  "    Configuration file (unless overridden by -f):\n"
-                  "      $XDG_CONFIG_HOME/libvirt/libvirtd.conf\n"
-                  "\n"
-                  "    Sockets:\n"
-                  "      $XDG_RUNTIME_DIR/libvirt/libvirt-sock\n"
-                  "\n"
-                  "    TLS:\n"
-                  "      CA certificate:     $HOME/.pki/libvirt/cacert.pem\n"
-                  "      Server certificate: $HOME/.pki/libvirt/servercert.pem\n"
-                  "      Server private key: $HOME/.pki/libvirt/serverkey.pem\n"
-                  "\n"
-                  "    PID file:\n"
-                  "      $XDG_RUNTIME_DIR/libvirt/libvirtd.pid\n"
-                  "\n"));
+        fprintf(stderr,
+                "%s", _("\n\
+  Default paths:\n\
+\n\
+    Configuration file (unless overridden by -f):\n\
+      $XDG_CONFIG_HOME/libvirt/libvirtd.conf\n\
+\n\
+    Sockets:\n\
+      $XDG_RUNTIME_DIR/libvirt/libvirt-sock (in UNIX abstract namespace)\n\
+\n\
+    TLS:\n\
+      CA certificate:     $HOME/.pki/libvirt/cacert.pem\n\
+      Server certificate: $HOME/.pki/libvirt/servercert.pem\n\
+      Server private key: $HOME/.pki/libvirt/serverkey.pem\n\
+\n\
+    PID file:\n\
+      $XDG_RUNTIME_DIR/libvirt/libvirtd.pid\n\
+\n"));
     }
 }
 
@@ -1110,14 +968,17 @@ int main(int argc, char **argv) {
         {0, 0, 0, 0}
     };
 
-    if (setlocale(LC_ALL, "") == NULL ||
-        bindtextdomain(PACKAGE, LOCALEDIR) == NULL ||
+    if (setlocale (LC_ALL, "") == NULL ||
+        bindtextdomain (PACKAGE, LOCALEDIR) == NULL ||
         textdomain(PACKAGE) == NULL ||
         virInitialize() < 0) {
         fprintf(stderr, _("%s: initialization failed\n"), argv[0]);
         exit(EXIT_FAILURE);
     }
 
+    /* initialize early logging */
+    virLogSetFromEnv();
+
     if (strstr(argv[0], "lt-libvirtd") ||
         strstr(argv[0], "/daemon/.libs/libvirtd")) {
         char *tmp = strrchr(argv[0], '/');
@@ -1181,7 +1042,7 @@ int main(int argc, char **argv) {
 
         case 'p':
             VIR_FREE(pid_file);
-            if (VIR_STRDUP_QUIET(pid_file, optarg) < 0) {
+            if (!(pid_file = strdup(optarg))) {
                 VIR_ERROR(_("Can't allocate memory"));
                 exit(EXIT_FAILURE);
             }
@@ -1189,7 +1050,7 @@ int main(int argc, char **argv) {
 
         case 'f':
             VIR_FREE(remote_config_file);
-            if (VIR_STRDUP_QUIET(remote_config_file, optarg) < 0) {
+            if (!(remote_config_file = strdup(optarg))) {
                 VIR_ERROR(_("Can't allocate memory"));
                 exit(EXIT_FAILURE);
             }
@@ -1206,7 +1067,7 @@ int main(int argc, char **argv) {
         default:
             VIR_ERROR(_("%s: internal error: unknown flag: %c"),
                       argv[0], c);
-            exit(EXIT_FAILURE);
+            exit (EXIT_FAILURE);
         }
     }
 
@@ -1296,10 +1157,7 @@ int main(int argc, char **argv) {
 
     /* Ensure the rundir exists (on tmpfs on some systems) */
     if (privileged) {
-        if (VIR_STRDUP_QUIET(run_dir, LOCALSTATEDIR "/run/libvirt") < 0) {
-            VIR_ERROR(_("Can't allocate memory"));
-            goto cleanup;
-        }
+        run_dir = strdup(LOCALSTATEDIR "/run/libvirt");
     } else {
         run_dir = virGetUserRuntimeDirectory();
 
@@ -1308,6 +1166,11 @@ int main(int argc, char **argv) {
             goto cleanup;
         }
     }
+    if (!run_dir) {
+        virReportOOMError();
+        goto cleanup;
+    }
+
     if (privileged)
         old_umask = umask(022);
     else
@@ -1342,7 +1205,6 @@ int main(int argc, char **argv) {
                                 !!config->keepalive_required,
                                 config->mdns_adv ? config->mdns_name : NULL,
                                 remoteClientInitHook,
-                                NULL,
                                 remoteClientFreeFunc,
                                 NULL))) {
         ret = VIR_DAEMON_ERR_INIT;
@@ -1377,18 +1239,6 @@ int main(int argc, char **argv) {
         goto cleanup;
     }
 
-    if (!(lxcProgram = virNetServerProgramNew(LXC_PROGRAM,
-                                              LXC_PROTOCOL_VERSION,
-                                              lxcProcs,
-                                              lxcNProcs))) {
-        ret = VIR_DAEMON_ERR_INIT;
-        goto cleanup;
-    }
-    if (virNetServerAddProgram(srv, lxcProgram) < 0) {
-        ret = VIR_DAEMON_ERR_INIT;
-        goto cleanup;
-    }
-
     if (!(qemuProgram = virNetServerProgramNew(QEMU_PROGRAM,
                                                QEMU_PROTOCOL_VERSION,
                                                qemuProcs,
@@ -1404,7 +1254,9 @@ int main(int argc, char **argv) {
     if (timeout != -1) {
         VIR_DEBUG("Registering shutdown timeout %d", timeout);
         virNetServerAutoShutdown(srv,
-                                 timeout);
+                                 timeout,
+                                 daemonShutdownCheck,
+                                 NULL);
     }
 
     if ((daemonSetupSignals(srv)) < 0) {
@@ -1494,7 +1346,6 @@ int main(int argc, char **argv) {
 cleanup:
     virNetlinkEventServiceStopAll();
     virObjectUnref(remoteProgram);
-    virObjectUnref(lxcProgram);
     virObjectUnref(qemuProgram);
     virNetServerClose(srv);
     virObjectUnref(srv);

daemon/libvirtd.conf

@@ -251,7 +251,7 @@
 
 # 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, up to max_workers limit.
+# 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
@@ -267,7 +267,7 @@
 # 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 up to 5 MB of memory is used
+# 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

daemon/libvirtd.h

@@ -32,11 +32,10 @@
 # include <rpc/types.h>
 # include <rpc/xdr.h>
 # include "remote_protocol.h"
-# include "lxc_protocol.h"
 # include "qemu_protocol.h"
-# include "virlog.h"
-# include "virthread.h"
-# if WITH_SASL
+# include "logging.h"
+# include "threads.h"
+# if HAVE_SASL
 #  include "virnetsaslcontext.h"
 # endif
 # include "virnetserverprogram.h"
@@ -53,7 +52,7 @@ struct daemonClientPrivate {
 
     int domainEventCallbackID[VIR_DOMAIN_EVENT_ID_LAST];
 
-# if WITH_SASL
+# if HAVE_SASL
     virNetSASLSessionPtr sasl;
 # endif
 
@@ -67,7 +66,7 @@ struct daemonClientPrivate {
     bool keepalive_supported;
 };
 
-# if WITH_SASL
+# if HAVE_SASL
 extern virNetSASLContextPtr saslCtxt;
 # endif
 extern virNetServerProgramPtr remoteProgram;

daemon/libvirtd.policy-0

@@ -0,0 +1,42 @@
+<!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>auth_admin</allow_any>
+        <allow_inactive>auth_admin</allow_inactive>
+        <allow_active>auth_admin_keep_session</allow_active>
+      </defaults>
+    </action>
+</policyconfig>

daemon/libvirtd.policy-1

@@ -0,0 +1,42 @@
+<!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>auth_admin</allow_any>
+        <allow_inactive>auth_admin</allow_inactive>
+        <allow_active>auth_admin_keep</allow_active>
+      </defaults>
+    </action>
+</policyconfig>

daemon/libvirtd.policy.in

@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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) 2012 Red Hat, Inc.
-Copyright (C) 2007 Daniel P. Berrange <berrange redhat com>
-
-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, see
-<http://www.gnu.org/licenses/>.
--->
-
-<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>
-        <!-- Any program can use libvirt in read/write mode if they
-             provide the root password -->
-        <allow_any>@authaction@</allow_any>
-        <allow_inactive>@authaction@</allow_inactive>
-        <allow_active>@authaction@</allow_active>
-      </defaults>
-    </action>
-</policyconfig>

daemon/libvirtd.service.in

@@ -7,8 +7,6 @@
 Description=Virtualization daemon
 Before=libvirt-guests.service
 After=network.target
-After=dbus.service
-After=iscsid.service
 
 [Service]
 EnvironmentFile=-/etc/sysconfig/libvirtd

daemon/remote.h

@@ -32,9 +32,6 @@
 extern virNetServerProgramProc remoteProcs[];
 extern size_t remoteNProcs;
 
-extern virNetServerProgramProc lxcProcs[];
-extern size_t lxcNProcs;
-
 extern virNetServerProgramProc qemuProcs[];
 extern size_t qemuNProcs;
 

daemon/stream.c

@@ -25,10 +25,10 @@
 
 #include "stream.h"
 #include "remote.h"
-#include "viralloc.h"
-#include "virlog.h"
+#include "memory.h"
+#include "logging.h"
 #include "virnetserverclient.h"
-#include "virerror.h"
+#include "virterror_internal.h"
 
 #define VIR_FROM_THIS VIR_FROM_STREAMS
 
@@ -697,7 +697,7 @@ daemonStreamHandleWrite(virNetServerClientPtr client,
 
 /*
  * Invoked when a stream is signalled as having data
- * available to read. This reads up to one message
+ * available to read. This reads upto one message
  * worth of data, and then queues that for transmission
  * to the client.
  *

docs/404.html.in

@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<?xml version="1.0"?>
+<html>
   <body>
     <h1>404 page not found</h1>
 

docs/Makefile.am

@@ -1,20 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
-## Copyright (C) 2005-2013 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, see
-## <http://www.gnu.org/licenses/>.
+## Copyright (C) 2005-2012 Red Hat, Inc.
+## See COPYING.LIB for the License of this software
 
 SUBDIRS= schemas
 
@@ -108,12 +95,8 @@ qemu_xml = \
   libvirt-qemu-api.xml \
   libvirt-qemu-refs.xml
 
-lxc_xml = \
-  libvirt-lxc-api.xml \
-  libvirt-lxc-refs.xml
-
 apidir = $(pkgdatadir)/api
-api_DATA = libvirt-api.xml libvirt-qemu-api.xml libvirt-lxc-api.xml
+api_DATA = libvirt-api.xml libvirt-qemu-api.xml
 
 fig = \
   libvirt-net-logical.fig \
@@ -133,7 +116,7 @@ EXTRA_DIST=					\
   hacking1.xsl hacking2.xsl wrapstring.xsl \
   $(dot_html) $(dot_html_in) $(gif) $(apihtml) $(apipng) \
   $(devhelphtml) $(devhelppng) $(devhelpcss) $(devhelpxsl) \
-  $(xml) $(qemu_xml) $(lxc_xml) $(fig) $(png) $(css) \
+  $(xml) $(qemu_xml) $(fig) $(png) $(css) \
   $(patches) $(dot_php_in) $(dot_php_code_in) $(dot_php)\
   $(internals_html_in) $(internals_html) \
   sitemap.html.in \
@@ -150,7 +133,6 @@ all-am: web
 
 api: $(srcdir)/libvirt-api.xml $(srcdir)/libvirt-refs.xml
 qemu_api: $(srcdir)/libvirt-qemu-api.xml $(srcdir)/libvirt-qemu-refs.xml
-lxc_api: $(srcdir)/libvirt-lxc-api.xml $(srcdir)/libvirt-lxc-refs.xml
 
 web: $(dot_html) $(internals_html) html/index.html devhelp/index.html \
   $(dot_php)
@@ -162,7 +144,7 @@ todo.html.in: todo.pl
 		|| { rm $@ && exit 1; }; \
 	else \
 		echo "Stubbing $@"; \
-		echo "<html xmlns=\"http://www.w3.org/1999/xhtml\"><body><h1>Todo list unavailable: no config file</h1></body></html>" > $@ ; \
+		echo "<html><body><h1>Todo list</h1></body></html>" > $@ ; \
 	fi
 
 todo:
@@ -170,8 +152,7 @@ todo:
 	$(MAKE) todo.html
 
 hvsupport.html.in: $(srcdir)/hvsupport.pl $(srcdir)/../src/libvirt_public.syms \
-	$(srcdir)/../src/libvirt_qemu.syms $(srcdir)/../src/libvirt_lxc.syms \
-	$(srcdir)/../src/driver.h
+	 $(srcdir)/../src/libvirt_qemu.syms $(srcdir)/../src/driver.h
 	$(AM_V_GEN)$(PERL) $(srcdir)/hvsupport.pl $(srcdir)/../src > $@ || { rm $@ && exit 1; }
 
 .PHONY: todo
@@ -184,7 +165,7 @@ internals/%.html.tmp: internals/%.html.in subsite.xsl page.xsl sitemap.html.in
 	  echo "Generating $@"; \
 	  $(MKDIR_P) internals; \
 	  name=`echo $@ | sed -e 's/.tmp//'`; \
-	  $(XSLTPROC) --stringparam pagename $$name --nonet \
+	  $(XSLTPROC) --stringparam pagename $$name --nonet --html \
 	    $(top_srcdir)/docs/subsite.xsl $< > $@ \
 	    || { rm $@ && exit 1; }; fi
 
@@ -192,7 +173,7 @@ internals/%.html.tmp: internals/%.html.in subsite.xsl page.xsl sitemap.html.in
 	@if [ -x $(XSLTPROC) ] ; then \
 	  echo "Generating $@"; \
 	  name=`echo $@ | sed -e 's/.tmp//'`; \
-	  $(XSLTPROC) --stringparam pagename $$name --nonet \
+	  $(XSLTPROC) --stringparam pagename $$name --nonet --html \
 	    $(top_srcdir)/docs/site.xsl $< > $@ \
 	    || { rm $@ && exit 1; }; fi
 
@@ -209,7 +190,7 @@ internals/%.html.tmp: internals/%.html.in subsite.xsl page.xsl sitemap.html.in
 %.php.tmp: %.php.in site.xsl page.xsl sitemap.html.in
 	@if [ -x $(XSLTPROC) ] ; then \
 	  echo "Generating $@"; \
-	  $(XSLTPROC) --stringparam pagename $(@:.tmp=) --nonet \
+	  $(XSLTPROC) --stringparam pagename $(@:.tmp=) --nonet --html \
 	    $(top_srcdir)/docs/site.xsl $< > $@ \
 	    || { rm $@ && exit 1; }; fi
 
@@ -239,16 +220,12 @@ $(addprefix $(srcdir)/,$(devhelphtml)): $(srcdir)/libvirt-api.xml $(devhelpxsl)
 
 python_generated_files = \
 		$(srcdir)/html/libvirt-libvirt.html \
-		$(srcdir)/html/libvirt-libvirt-lxc.html \
 		$(srcdir)/html/libvirt-libvirt-qemu.html \
 		$(srcdir)/html/libvirt-virterror.html \
 		$(srcdir)/libvirt-api.xml \
 		$(srcdir)/libvirt-refs.xml \
-		$(srcdir)/libvirt-lxc-api.xml \
-		$(srcdir)/libvirt-lxc-refs.xml \
 		$(srcdir)/libvirt-qemu-api.xml \
-		$(srcdir)/libvirt-qemu-refs.xml \
-		$(NULL)
+		$(srcdir)/libvirt-qemu-refs.xml
 
 APIBUILD=$(srcdir)/apibuild.py
 APIBUILD_STAMP=$(APIBUILD).stamp
@@ -258,15 +235,11 @@ $(python_generated_files): $(APIBUILD_STAMP)
 
 $(APIBUILD_STAMP): $(srcdir)/apibuild.py \
 		$(srcdir)/../include/libvirt/libvirt.h.in \
-		$(srcdir)/../include/libvirt/libvirt-lxc.h \
 		$(srcdir)/../include/libvirt/libvirt-qemu.h \
 		$(srcdir)/../include/libvirt/virterror.h \
 		$(srcdir)/../src/libvirt.c \
-		$(srcdir)/../src/libvirt-lxc.c \
 		$(srcdir)/../src/libvirt-qemu.c \
-		$(srcdir)/../src/util/virerror.c \
-		$(srcdir)/../src/util/virevent.c \
-		$(srcdir)/../src/util/virtypedparam.c
+		$(srcdir)/../src/util/virterror.c
 	$(AM_V_GEN)srcdir=$(srcdir) $(PYTHON) $(APIBUILD)
 	touch $@
 
@@ -279,10 +252,9 @@ clean-local:
 maintainer-clean-local: clean-local
 	rm -rf $(srcdir)/libvirt-api.xml $(srcdir)/libvirt-refs.xml todo.html.in hvsupport.html.in
 	rm -rf $(srcdir)/libvirt-qemu-api.xml $(srcdir)/libvirt-qemu-refs.xml
-	rm -rf $(srcdir)/libvirt-lxc-api.xml $(srcdir)/libvirt-lxc-refs.xml
 	rm -rf $(APIBUILD_STAMP)
 
-rebuild: api qemu_api lxc_api all
+rebuild: api qemu_api all
 
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(HTML_DIR)
@@ -300,7 +272,6 @@ install-data-local:
 	for file in $(devhelphtml) $(devhelppng) $(devhelpcss); do \
 	    $(INSTALL) -m 0644 $(srcdir)/$${file} $(DESTDIR)$(DEVHELP_DIR) ; \
 	done
-	$(INSTALL_DATA) $(srcdir)/libvirtLogo.png $(DESTDIR)$(pkgdatadir)
 
 uninstall-local:
 	for h in $(apihtml); do rm $(DESTDIR)$(HTML_DIR)/$$h; done

docs/api.html.in

@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<?xml version="1.0"?>
+<html>
   <body>
     <h1>The libvirt API concepts</h1>
 
@@ -9,28 +8,26 @@
 
     <ul id="toc"></ul>
 
-    <h2><a name="Objects">Objects Exposed</a></h2>
-    <p> As defined in the <a href="goals.html">goals section</a>, the libvirt
-    API is designed to expose all the resources needed to manage the
-    virtualization support of recent operating systems. The first object
-    manipulated through the API is the <code>virConnectPtr</code>, which
-    represents the connection to a hypervisor. Any application using libvirt
-    is likely to start using the
+    <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 a <a href="uri.html">connection URI</a>
-    to select the right hypervisor to open.
-    A URI 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
+    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 obtains a <code class='docref'>virConnectPtr</code>
-    connection to the hypervisor it can then use it to manage the hypervisor's
-    available domains and related virtualization
-    resources, such as storage and networking. All those are
-    exposed as first class objects and connected to the hypervisor connection
+    <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"
@@ -38,201 +35,92 @@
     </p>
     <p> The figure above shows the five main objects exported by the API:</p>
     <ul>
-      <li><code class='docref'>virConnectPtr</code>
-      <p>Represents the connection to a hypervisor. Use one of the
-      <a href="html/libvirt-libvirt.html#virConnectOpen">virConnectOpen</a>
-      functions to obtain connection to the hypervisor which is then used
-      as a parameter to other connection API's.</p></li>
-      <li><code class='docref'>virDomainPtr</code>
-      <p>Represents 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'>virConnectListAllDomains</code>
-      lists all the domains for the hypervisor.</p></li>
-      <li><code class='docref'>virNetworkPtr</code>
-      <p>Represents one network either active or defined (i.e. existing
-      as permanent config file and storage but not currently activated).
-      The function <code class='docref'>virConnectListAllNetworks</code>
-      lists all the virtualization networks for the hypervisor.</p></li>
-      <li><code class='docref'>virStorageVolPtr</code>
-      <p>Represents one storage volume generally used
+      <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 activated 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> finds
-      the storage volume object based on its path on the node.</p></li>
-      <li><code class='docref'>virStoragePoolPtr</code>
-      <p>Represents a storage pool, which is a logical area
-      used to allocate and store storage volumes. The function
-      <code class='docref'>virConnectListAllStoragePools</code> lists
-      all of the virtualization storage pools on the hypervisor. The function
-      <code class="docref">virStoragePoolLookupByVolume</code> finds
-      the storage pool containing a given storage volume.</p></li>
+      <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 objects manipulated by the library can also be represented using
+    <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, networks, and storage pools can be either <code>active</code>
+    <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
-      they can be activated dynamically in order to be used.</p>
-    <p> Most objects can also be named in various ways:</p>
+      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><code>name</code>
-      <p>A user friendly identifier but whose uniqueness
-      cannot be guaranteed between two nodes.</p></li>
-      <li><code>ID</code>
-      <p>A runtime unique identifier
-      provided by the hypervisor for one given activation of the object;
-      however, it becomes invalid once the resource is deactivated.</p></li >
-      <li><code>UUID</code>
-      <p> A 16 byte unique identifier
+      <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 guaranteed to be unique for long term usage and across a
-      set of nodes.</p></li>
+      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>
+    <h2><a name="Functions">Functions and naming
+      conventions</a></h2>
     <p> The naming of the functions present in the library is usually
-      composed by a prefix describing the object associated to the function
+      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
+    <p> For each first class object you will find apis
       for the following actions:</p>
     <ul>
-      <li><b>Lookup</b> [...LookupBy...]
-      <p>Used to perform lookups on objects by some type of identifier,
-      such as:</p>
-          <ul>
-            <li><code class='docref'>virDomainLookupByID</code></li>
-            <li><code class='docref'>virDomainLookupByName</code></li>
-            <li><code class='docref'>virDomainLookupByUUID</code></li>
-            <li><code class='docref'>virDomainLookupByUUIDString</code></li>
-          </ul>
-      </li>
-      <li><b>Enumeration</b> [virConnectList..., virConnectNumOf...]
-      <p>Used to enumerate a set of object available to an given
-      hypervisor connection such as:</p>
-          <ul>
-            <li><code class='docref'>virConnectListDomains</code></li>
-            <li><code class='docref'>virConnectNumOfDomains</code></li>
-            <li><code class='docref'>virConnectListNetworks</code></li>
-            <li><code class='docref'>virConnectListStoragePools</code></li>
-          </ul>
-      </li>
-      <li><b>Description</b> [...GetInfo]
-      <p>Generic accessor providing a set of generic information about an
-      object, such as: </p>
-        <ul>
-          <li><code class='docref'>virNodeGetInfo</code></li>
-          <li><code class='docref'>virDomainGetInfo</code></li>
-          <li><code class='docref'>virStoragePoolGetInfo</code></li>
-          <li><code class='docref'>virStorageVolGetInfo</code></li>
-        </ul>
-      </li>
-      <li><b>Accessors</b> [...Get..., ...Set...]
-      <p>Specific accessors used to query or modify data for the given object,
-      such as: </p>
-        <ul>
-          <li><code class='docref'>virConnectGetType</code></li>
-          <li><code class='docref'>virDomainGetMaxMemory</code></li>
-          <li><code class='docref'>virDomainSetMemory</code></li>
-          <li><code class='docref'>virDomainGetVcpus</code></li>
-          <li><code class='docref'>virStoragePoolSetAutostart</code></li>
-          <li><code class='docref'>virNetworkGetBridgeName</code></li>
-        </ul>
-      </li>
-      <li><b>Creation</b> [...Create, ...CreateXML]
-      <p>Used to create and start objects.  The ...CreateXML APIs will create
-      the object based on an XML description, while the ...Create APIs will
-      create the object based on existing object pointer, such as: </p>
-        <ul>
-          <li><code class='docref'>virDomainCreate</code></li>
-          <li><code class='docref'>virDomainCreateXML</code></li>
-          <li><code class='docref'>virNetworkCreate</code></li>
-          <li><code class='docref'>virNetworkCreateXML</code></li>
-        </ul>
-      </li>
-      <li><b>Destruction</b> [...Destroy]
-      <p>Used to shutdown or deactivate and destroy objects, such as: </p>
-        <ul>
-          <li><code class='docref'>virDomainDestroy</code></li>
-          <li><code class='docref'>virNetworkDestroy</code></li>
-          <li><code class='docref'>virStoragePoolDestroy</code></li>
-        </ul>
-      </li>
+      <li><b>Lookup</b>:...LookupByName,</li>
+      <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>.
     </p>
-    <h2><a name="Drivers">The libvirt Drivers</a></h2>
-    <p>Drivers are the basic building block for libvirt functionality
-    to support the capability to handle specific hypervisor driver calls.
-    Drivers are discovered and registered during connection processing as
-    part of the <code class='docref'>virInitialize</code> API. Each driver
-    has a registration API which loads up the driver specific function
-    references for the libvirt APIs to call. The following is a simplistic
-    view of the hypervisor driver mechanism. Consider the stacked list of
-    drivers as a series of modules that can be plugged into the architecture
-    depending on how libvirt is configured to be built.</p>
+    <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>
-    <p>The driver architecture is also used to support other virtualization
-    components such as storage, storage pools, host device, networking,
-    network interfaces, and network filters.</p>
-    <p>See the <a href="drivers.html">libvirt drivers</a> page for more
-    information on hypervisor and storage specific drivers.</p>
-    <p>Not all drivers support every virtualization function possible.
-    The <a href="hvsupport.html">libvirt API support matrix</a> lists
-    the various functions and support found in each driver by the version
-    support was added into libvirt.
-    </p>
-    <h2><a name="Remote">Daemon and Remote Access</a></h2>
-    <p>Access to libvirt drivers is primarily handled by the libvirtd
-    daemon through the <a href="remote.html">remote</a> driver via an
-    <a href="internals/rpc.html">RPC</a>. Some hypervisors do support
-    client-side connections and responses, such as Test, OpenVZ, VMware,
-    Power VM (phyp), VirtualBox (vbox), ESX, Hyper-V, Xen, and Parallels.
-    The libvirtd daemon service is started on the host at system boot
-    time and can also be restarted at any time by a properly privileged
-    user, such as root. The libvirtd daemon uses the same libvirt API
-    <code class='docref'>virInitialize</code> sequence as applications
-    for client-side driver registrations, but then extends the registered
-    driver list to encompass all known drivers supported for all driver
-    types supported on the host. </p>
-    <p>The libvirt client <a href="apps.html">applications</a> use a
-    <a href="uri.html">URI</a> to obtain the <code>virConnectPtr</code>.
-    The <code>virConnectPtr</code> keeps track of the driver connection
-    plus a variety of other connections (network, interface, storage, etc.).
-    The <code>virConnectPtr</code> is then used as a parameter to other
-    virtualization <a href="#Functions">functions</a>. Depending upon the
-    driver being used, calls will be routed through the remote driver to
-    the libvirtd daemon. The daemon will reference the connection specific
-    driver in order to retreive the requested information and then pass
-    back status and/or data through the connection back to the application.
-    The application can then decide what to do with that data, such as
-    display, write log data, etc. <a href="migration.html">Migration</a>
-    is an example of many facets of the architecture in use.</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>
-    <p>
-    The key takeaway from the above diagram is that there is a remote driver
-    which handles transactions for a majority of the drivers. The libvirtd
-    daemon running on the host will receive transaction requests from the
-    remote driver and will then query the hypervisor driver as specified in
-    the <code>virConnectPtr</code> in order to fetch the data. The data will
-    then be returned through the remote driver to the client application
-    for processing.
-    </p>
-    <p>If you are interested in contributing to libvirt, read the
-    <a href="http://wiki.libvirt.org/page/FAQ">FAQ</a> and
-    <a href="hacking.html">hacking</a> guidelines to gain an understanding
-    of basic rules and guidelines.  In order to add new API functionality
-    follow the instructions regarding
-    <a href="api_extension.html">implementing a new API in libvirt</a>.
-    </p>
-
   </body>
 </html>

docs/api_extension.html.in

@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html>
   <body>
     <h1>Implementing a new API in Libvirt</h1>
 

docs/apibuild.py

@@ -10,7 +10,6 @@
 import os, sys
 import string
 import glob
-import re
 
 quiet=True
 warnings=0
@@ -24,9 +23,8 @@ included_files = {
   "libvirt.h": "header with general libvirt API definitions",
   "virterror.h": "header with error specific API definitions",
   "libvirt.c": "Main interfaces for the libvirt library",
-  "virerror.c": "implements error handling and reporting code for libvirt",
-  "virevent.c": "event loop for monitoring file handles",
-  "virtypedparam.c": "virTypedParameters APIs",
+  "virterror.c": "implements error handling and reporting code for libvirt",
+  "event.c": "event loop for monitoring file handles",
 }
 
 qemu_included_files = {
@@ -34,11 +32,6 @@ qemu_included_files = {
   "libvirt-qemu.c": "Implementations for the QEMU specific APIs",
 }
 
-lxc_included_files = {
-  "libvirt-lxc.h": "header with LXC specific API definitions",
-  "libvirt-lxc.c": "Implementations for the LXC specific APIs",
-}
-
 ignored_words = {
   "ATTRIBUTE_UNUSED": (0, "macro keyword"),
   "ATTRIBUTE_SENTINEL": (0, "macro keyword"),
@@ -50,7 +43,6 @@ ignored_words = {
 }
 
 ignored_functions = {
-  "virConnectSupportsFeature": "private function for remote access",
   "virDomainMigrateFinish": "private function for migration",
   "virDomainMigrateFinish2": "private function for migration",
   "virDomainMigratePerform": "private function for migration",
@@ -63,10 +55,14 @@ ignored_functions = {
   "virDomainMigratePrepare3": "private function for migration",
   "virDomainMigrateConfirm3": "private function for migration",
   "virDomainMigratePrepareTunnel3": "private function for tunnelled migration",
+  "virDrvSupportsFeature": "private function for remote access",
   "DllMain": "specific function for Win32",
-  "virTypedParameterArrayValidate": "internal function in virtypedparam.c",
-  "virTypedParameterAssign": "internal function in virtypedparam.c",
-  "virTypedParameterAssignFromStr": "internal function in virtypedparam.c",
+  "virEventAddHandle": "internal function in event.c",
+  "virEventUpdateHandle": "internal function in event.c",
+  "virEventRemoveHandle": "internal function in event.c",
+  "virEventAddTimeout": "internal function in event.c",
+  "virEventUpdateTimeout": "internal function in event.c",
+  "virEventRemoveTimeout": "internal function in event.c",
 }
 
 ignored_macros = {
@@ -244,6 +240,8 @@ class index:
                 self.includes[name] = d
             elif type == "struct":
                 self.structs[name] = d
+            elif type == "struct":
+                self.structs[name] = d
             elif type == "union":
                 self.unions[name] = d
             elif type == "enum":
@@ -409,7 +407,7 @@ class CLexer:
         return self.lineno
 
     def push(self, token):
-        self.tokens.insert(0, token)
+        self.tokens.insert(0, token);
 
     def debug(self):
         print "Last token: ", self.last
@@ -429,7 +427,7 @@ class CLexer:
             if line[0] == '#':
                 self.tokens = map((lambda x: ('preproc', x)),
                                   string.split(line))
-                break
+                break;
             l = len(line)
             if line[0] == '"' or line[0] == "'":
                 end = line[0]
@@ -658,18 +656,27 @@ class CParser:
         lines = string.split(comment, "\n")
         item = None
         for line in lines:
-            line = line.lstrip().lstrip('*').lstrip()
-
-            m = re.match('([_.a-zA-Z0-9]+):(.*)', line)
-            if m:
-                item = m.group(1)
-                line = m.group(2).lstrip()
-
-            if item:
+            while line != "" and (line[0] == ' ' or line[0] == '\t'):
+                line = line[1:]
+            while line != "" and line[0] == '*':
+                line = line[1:]
+            while line != "" and (line[0] == ' ' or line[0] == '\t'):
+                line = line[1:]
+            try:
+                (it, line) = string.split(line, ":", 1)
+                item = it
+                while line != "" and (line[0] == ' ' or line[0] == '\t'):
+                    line = line[1:]
                 if res.has_key(item):
                     res[item] = res[item] + " " + line
                 else:
                     res[item] = line
+            except:
+                if item != None:
+                    if res.has_key(item):
+                        res[item] = res[item] + " " + line
+                    else:
+                        res[item] = line
         self.index.info = res
 
     def strip_lead_star(self, line):
@@ -699,7 +706,7 @@ class CParser:
         if self.top_comment == "":
             self.top_comment = com
         if self.comment == None or com[0] == '*':
-            self.comment = com
+            self.comment = com;
         else:
             self.comment = self.comment + com
         token = self.lexer.token()
@@ -897,7 +904,7 @@ class CParser:
             while i < nbargs:
                 if args[i][1] == arg:
                     args[i] = (args[i][0], arg, desc)
-                    break
+                    break;
                 i = i + 1
             if i >= nbargs:
                 if not quiet:
@@ -1141,10 +1148,10 @@ class CParser:
                     type = type + token[1]
                     token = self.token()
             elif token != None and token[0] == 'sep' and token[1] == ';':
-                break
+                break;
             elif token != None and token[0] == 'name':
                 type = base_type
-                continue
+                continue;
             else:
                 self.error("parsing typedef: expecting ';'", token)
                 return token
@@ -1239,7 +1246,7 @@ class CParser:
                 else:
                     self.error("parseStruct: name", token)
                     token = self.token()
-                self.type = base_type
+                self.type = base_type;
         self.struct_fields = fields
          #self.debug("end parseStruct", token)
          #print fields
@@ -1289,7 +1296,7 @@ class CParser:
                 else:
                     self.error("parseUnion: name", token)
                     token = self.token()
-                self.type = base_type
+                self.type = base_type;
         self.union_fields = fields
         # self.debug("end parseUnion", token)
         # print fields
@@ -1303,7 +1310,7 @@ class CParser:
         name = None
         self.comment = None
         comment = ""
-        value = "0"
+        value = "-1"
         while token != None:
             if token[0] == "sep" and token[1] == "{":
                 token = self.token()
@@ -1633,7 +1640,7 @@ class CParser:
                 self.type = self.type + token[1]
                 token = self.token()
             if token == None or token[0] != "name" :
-                self.error("parsing function type, name expected", token)
+                self.error("parsing function type, name expected", token);
                 return token
             self.type = self.type + token[1]
             nametok = token
@@ -1643,14 +1650,14 @@ class CParser:
                 token = self.token()
                 if token != None and token[0] == "sep" and token[1] == '(':
                     token = self.token()
-                    type = self.type
-                    token = self.parseSignature(token)
-                    self.type = type
+                    type = self.type;
+                    token = self.parseSignature(token);
+                    self.type = type;
                 else:
-                    self.error("parsing function type, '(' expected", token)
+                    self.error("parsing function type, '(' expected", token);
                     return token
             else:
-                self.error("parsing function type, ')' expected", token)
+                self.error("parsing function type, ')' expected", token);
                 return token
             self.lexer.push(token)
             token = nametok
@@ -1675,7 +1682,7 @@ class CParser:
                     self.type = self.type + token[1]
                     token = self.token()
                 else:
-                    self.error("parsing array type, ']' expected", token)
+                    self.error("parsing array type, ']' expected", token);
                     return token
             elif token != None and token[0] == "sep" and token[1] == ':':
                  # remove :12 in case it's a limited int size
@@ -1904,7 +1911,7 @@ class CParser:
                         self.index_add(self.name, self.filename, static,
                                         "function", d)
                         token = self.token()
-                        token = self.parseBlock(token)
+                        token = self.parseBlock(token);
                 elif token[1] == ',':
                     self.comment = None
                     self.index_add(self.name, self.filename, static,
@@ -1948,25 +1955,18 @@ class docBuilder:
             self.includes = includes + included_files.keys()
         elif name == "libvirt-qemu":
             self.includes = includes + qemu_included_files.keys()
-        elif name == "libvirt-lxc":
-            self.includes = includes + lxc_included_files.keys()
         self.modules = {}
         self.headers = {}
         self.idx = index()
         self.xref = {}
         self.index = {}
         self.basename = name
-        self.errors = 0
 
     def warning(self, msg):
         global warnings
         warnings = warnings + 1
         print msg
 
-    def error(self, msg):
-        self.errors += 1
-        print >>sys.stderr, "Error:", msg
-
     def indexString(self, id, str):
         if str == None:
             return
@@ -2014,7 +2014,7 @@ class docBuilder:
         for header in self.headers.keys():
             parser = CParser(header)
             idx = parser.parse()
-            self.headers[header] = idx
+            self.headers[header] = idx;
             self.idx.merge(idx)
 
     def scanModules(self):
@@ -2032,19 +2032,19 @@ class docBuilder:
                 skip = 1
                 for incl in self.includes:
                     if string.find(file, incl) != -1:
-                        skip = 0
+                        skip = 0;
                         break
                 if skip == 0:
-                    self.modules[file] = None
+                    self.modules[file] = None;
             files = glob.glob(directory + "/*.h")
             for file in files:
                 skip = 1
                 for incl in self.includes:
                     if string.find(file, incl) != -1:
-                        skip = 0
+                        skip = 0;
                         break
                 if skip == 0:
-                    self.headers[file] = None
+                    self.headers[file] = None;
         self.scanHeaders()
         self.scanModules()
 
@@ -2067,11 +2067,11 @@ class docBuilder:
                     val = eval(info[0])
                 except:
                     val = info[0]
-                output.write(" value='%s'" % (val))
+                output.write(" value='%s'" % (val));
             if info[2] != None and info[2] != '':
-                output.write(" type='%s'" % info[2])
+                output.write(" type='%s'" % info[2]);
             if info[1] != None and info[1] != '':
-                output.write(" info='%s'" % escape(info[1]))
+                output.write(" info='%s'" % escape(info[1]));
         output.write("/>\n")
 
     def serialize_macro(self, output, name):
@@ -2119,7 +2119,7 @@ class docBuilder:
             if self.idx.structs.has_key(name) and ( \
                type(self.idx.structs[name].info) == type(()) or
                 type(self.idx.structs[name].info) == type([])):
-                output.write(">\n")
+                output.write(">\n");
                 try:
                     for field in self.idx.structs[name].info:
                         desc = field[2]
@@ -2136,7 +2136,7 @@ class docBuilder:
                     self.warning("Failed to serialize struct %s" % (name))
                 output.write("    </struct>\n")
             else:
-                output.write("/>\n")
+                output.write("/>\n");
         else :
             output.write("    <typedef name='%s' file='%s' type='%s'" % (
                          name, self.modulename_file(id.header), id.info))
@@ -2176,7 +2176,7 @@ class docBuilder:
                 if apstr != "":
                     apstr = apstr + " &amp;&amp; "
                 apstr = apstr + cond
-            output.write("      <cond>%s</cond>\n"% (apstr))
+            output.write("      <cond>%s</cond>\n"% (apstr));
         try:
             (ret, params, desc) = id.info
             output.write("      <info><![CDATA[%s]]></info>\n" % (desc))
@@ -2184,8 +2184,6 @@ class docBuilder:
             if ret[0] != None:
                 if ret[0] == "void":
                     output.write("      <return type='void'/>\n")
-                elif (ret[1] == None or ret[1] == '') and not ignored_functions.has_key(name):
-                    self.error("Missing documentation for return of function `%s'" % name)
                 else:
                     output.write("      <return type='%s' info='%s'/>\n" % (
                              ret[0], escape(ret[1])))
@@ -2193,17 +2191,13 @@ class docBuilder:
             for param in params:
                 if param[0] == 'void':
                     continue
-                if (param[2] == None or param[2] == ''):
-                    if ignored_functions.has_key(name):
-                        output.write("      <arg name='%s' type='%s' info=''/>\n" % (param[1], param[0]))
-                    else:
-                        self.error("Missing documentation for arg `%s' of function `%s'" % (param[1], name))
+                if param[2] == None:
+                    output.write("      <arg name='%s' type='%s' info=''/>\n" % (param[1], param[0]))
                 else:
                     output.write("      <arg name='%s' type='%s' info='%s'/>\n" % (param[1], param[0], escape(param[2])))
                     self.indexString(name, param[2])
         except:
-            print >>sys.stderr, "Exception:", sys.exc_info()[1]
-            self.warning("Failed to save function %s info: %s" % (name, `id.info`))
+            self.warning("Failed to save function %s info: " % name, `id.info`)
         output.write("    </%s>\n" % (id.type))
 
     def serialize_exports(self, output, file):
@@ -2388,7 +2382,7 @@ class docBuilder:
                 letter = id[0]
                 output.write("      <letter name='%s'>\n" % (letter))
             output.write("        <word name='%s'>\n" % (id))
-            tokens = index[id]
+            tokens = index[id];
             tokens.sort()
             tok = None
             for token in tokens:
@@ -2467,10 +2461,6 @@ class docBuilder:
         output.write("</api>\n")
         output.close()
 
-        if self.errors > 0:
-            print >>sys.stderr, "apibuild.py: %d error(s) encountered during generation" % self.errors
-            sys.exit(3)
-
         filename = "%s/%s-refs.xml" % (self.path, self.name)
         if not quiet:
             print "Saving XML Cross References %s" % (filename)
@@ -2483,8 +2473,8 @@ class docBuilder:
 
 
 def rebuild(name):
-    if name not in ["libvirt", "libvirt-qemu", "libvirt-lxc"]:
-        self.warning("rebuild() failed, unknown module %s") % name
+    if name not in ["libvirt", "libvirt-qemu"]:
+        self.warning("rebuild() failed, unkown module %s") % name
         return None
     builder = None
     srcdir = os.environ["srcdir"]
@@ -2526,7 +2516,6 @@ if __name__ == "__main__":
     else:
         rebuild("libvirt")
         rebuild("libvirt-qemu")
-        rebuild("libvirt-lxc")
     if warnings > 0:
         sys.exit(2)
     else:

docs/apps.html.in

@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html>
   <body>
     <h1>Applications using <strong>libvirt</strong></h1>
 
@@ -190,7 +188,7 @@
         A general purpose desktop management tool, able to manage
         virtual machines across both local and remotely accessed
         hypervisors. It is targeted at home and small office usage
-        up to managing 10-20 hosts and their VMs.
+        upto managing 10-20 hosts and their VMs.
       </dd>
       <dt><a href="http://virt-manager.org/">virt-viewer</a></dt>
       <dd>
@@ -204,13 +202,6 @@
     <h2><a name="iaas">Infrastructure as a Service (IaaS)</a></h2>
 
     <dl>
-      <dt><a href="http://cc1.ifj.edu.pl">Cracow Cloud One</a></dt>
-      <dd>The CC1 system provides a complete solution for Private
-        Cloud Computing. An intuitive web access interface with an
-        administration module and simple installation procedure make
-        it easy to benefit from private Cloud Computing technology.
-      </dd>
-
       <dt><a href="http://www.emotivecloud.net">EMOTIVE Cloud</a></dt>
       <dd>The EMOTIVE (Elastic Management Of Tasks In Virtualized
         Environments) middleware allows executing tasks and providing
@@ -349,7 +340,6 @@
           <li>Shows you Systems Inventory (based on Facter) and
           provides real time information about hosts status based on
           Puppet reports.</li>
-      </ul>
       </dd>
     </dl>
 

docs/archdomain.html.in

@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html>
   <body>
     <h1>Domain management architecture</h1>
   </body>

docs/architecture.html.in

@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<?xml version="1.0"?>
+<html>
   <body>
     <h1 >libvirt architecture</h1>
 

docs/archnetwork.html.in

@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<?xml version="1.0"?>
+<html>
   <body>
     <h1>Network management architecture</h1>
 

docs/archnode.html.in

@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html>
   <body>
     <h1>Node device management architecture</h1>
   </body>

docs/archstorage.html.in

@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html>
   <body>
     <h1>Storage management architecture</h1>
 

docs/auth.html.in

@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<?xml version="1.0"?>
+<html>
   <body>
     <h1 >Authentication &amp; access control</h1>
     <p>
@@ -26,7 +25,7 @@ for the authentication file using the following sequence:
         variable.</li>
       <li>The file path specified by the "authfile=/some/file" URI
         query parameter</li>
-      <li>The file $XDG_CONFIG_HOME/libvirt/auth.conf</li>
+      <li>The file $XDG_CONFIG_DIR/libvirt/auth.conf</li>
       <li>The file /etc/libvirt/auth.conf</li>
     </ol>
 
@@ -254,15 +253,13 @@ Plugin "gssapiv2" [loaded],     API version: 4
         features: WANT_CLIENT_FIRST|PROXY_AUTHENTICATION|NEED_SERVER_FQDN
 </pre>
     <p>
-Next it is necessary for the administrator of the Kerberos realm to
-issue a principal for the libvirt server. There needs to be one
-principal per host running the libvirt daemon. The principal should be
-named <code>libvirt/full.hostname@KERBEROS.REALM</code>.  This is
-typically done by running the <code>kadmin.local</code> command on the
-Kerberos server, though some Kerberos servers have alternate ways of
-setting up service principals.  Once created, the principal should be
-exported to a keytab, copied to the host running the libvirt daemon
-and placed in <code>/etc/libvirt/krb5.tab</code>
+Next it is necessary for the administrator of the Kerberos realm to issue a principle
+for the libvirt server. There needs to be one principle per host running the libvirt
+daemon. The principle should be named <code>libvirt/full.hostname@KERBEROS.REALM</code>.
+This is typically done by running the <code>kadmin.local</code> command on the Kerberos
+server, though some Kerberos servers have alternate ways of setting up service principles.
+Once created, the principle should be exported to a keytab, copied to the host running
+the libvirt daemon and placed in <code>/etc/libvirt/krb5.tab</code>
 </p>
     <pre>
 # kadmin.local
@@ -284,7 +281,7 @@ kadmin.local: quit
 </pre>
     <p>
 Any client application wishing to connect to a Kerberos enabled libvirt server
-merely needs to run <code>kinit</code> to gain a user principal. This may well
+merely needs to run <code>kinit</code> to gain a user principle. This may well
 be done automatically when a user logs into a desktop session, if PAM is setup
 to authenticate against Kerberos.
 </p>

docs/bindings.html.in

@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<?xml version="1.0"?>
+<html>
   <body>
     <h1 >Bindings for other languages</h1>
 

docs/bugs.html.in

@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<?xml version="1.0"?>
+<html>
   <body>
 
     <h1>Bug reporting</h1>

docs/cgroups.html.in

@@ -1,285 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <h1>Control Groups Resource Management</h1>
-
-    <ul id="toc"></ul>
-
-    <p>
-      The QEMU and LXC drivers make use of the Linux "Control Groups" facility
-      for applying resource management to their virtual machines and containers.
-    </p>
-
-    <h2><a name="requiredControllers">Required controllers</a></h2>
-
-    <p>
-      The control groups filesystem supports multiple "controllers". By default
-      the init system (such as systemd) should mount all controllers compiled
-      into the kernel at <code>/sys/fs/cgroup/$CONTROLLER-NAME</code>. Libvirt
-      will never attempt to mount any controllers itself, merely detect where
-      they are mounted.
-    </p>
-
-    <p>
-      The QEMU driver is capable of using the <code>cpuset</code>,
-      <code>cpu</code>, <code>memory</code>, <code>blkio</code> and
-      <code>devices</code> controllers. None of them are compulsory.
-      If any controller is not mounted, the resource management APIs
-      which use it will cease to operate. It is possible to explicitly
-      turn off use of a controller, even when mounted, via the
-      <code>/etc/libvirt/qemu.conf</code> configuration file.
-    </p>
-
-    <p>
-      The LXC driver is capable of using the <code>cpuset</code>,
-      <code>cpu</code>, <code>cpuset</code>, <code>freezer</code>,
-      <code>memory</code>, <code>blkio</code> and <code>devices</code>
-      controllers. The <code>cpuset</code>, <code>devices</code>
-      and <code>memory</code> controllers are compulsory. Without
-      them mounted, no containers can be started. If any of the
-      other controllers are not mounted, the resource management APIs
-      which use them will cease to operate.
-    </p>
-
-    <h2><a name="currentLayout">Current cgroups layout</a></h2>
-
-    <p>
-      As of libvirt 1.0.5 or later, the cgroups layout created by libvirt has been
-      simplified, in order to facilitate the setup of resource control policies by
-      administrators / management applications. The layout is based on the concepts of
-      "partitions" and "consumers". Each virtual machine or container is a consumer,
-      and has a corresponding cgroup named <code>$VMNAME.libvirt-{qemu,lxc}</code>.
-      Each consumer is associated with exactly one partition, which also have a
-      corresponding cgroup usually named <code>$PARTNAME.partition</code>. The
-      exceptions to this naming rule are the three top level default partitions,
-      named <code>/system</code> (for system services), <code>/user</code> (for
-      user login sessions) and <code>/machine</code> (for virtual machines and
-      containers). By default every consumer will of course be associated with
-      the <code>/machine</code> partition. This leads to a hierarchy that looks
-      like
-    </p>
-
-    <pre>
-$ROOT
-  |
-  +- system
-  |   |
-  |   +- libvirtd.service
-  |
-  +- machine
-      |
-      +- vm1.libvirt-qemu
-      |   |
-      |   +- emulator
-      |   +- vcpu0
-      |   +- vcpu1
-      |
-      +- vm2.libvirt-qemu
-      |   |
-      |   +- emulator
-      |   +- vcpu0
-      |   +- vcpu1
-      |
-      +- vm3.libvirt-qemu
-      |   |
-      |   +- emulator
-      |   +- vcpu0
-      |   +- vcpu1
-      |
-      +- container1.libvirt-lxc
-      |
-      +- container2.libvirt-lxc
-      |
-      +- container3.libvirt-lxc
-    </pre>
-
-    <p>
-      The default cgroups layout ensures that, when there is contention for
-      CPU time, it is shared equally between system services, user sessions
-      and virtual machines / containers. This prevents virtual machines from
-      locking the administrator out of the host, or impacting execution of
-      system services. Conversely, when there is no contention from
-      system services / user sessions, it is possible for virtual machines
-      to fully utilize the host CPUs.
-    </p>
-
-    <h2><a name="customPartiton">Using custom partitions</a></h2>
-
-    <p>
-      If there is a need to apply resource constraints to groups of
-      virtual machines or containers, then the single default
-      partition <code>/machine</code> may not be sufficiently
-      flexible. The administrator may wish to sub-divide the
-      default partition, for example into "testing" and "production"
-      partitions, and then assign each guest to a specific
-      sub-partition. This is achieved via a small element addition
-      to the guest domain XML config, just below the main <code>domain</code>
-      element
-    </p>
-
-    <pre>
-  ...
-  &lt;resource&gt;
-    &lt;partition&gt;/machine/production&lt;/partition&gt;
-  &lt;/resource&gt;
-  ...
-    </pre>
-
-    <p>
-      Libvirt will not auto-create the cgroups directory to back
-      this partition. In the future, libvirt / virsh will provide
-      APIs / commands to create custom partitions, but currently
-      this is left as an exercise for the administrator. For
-      example, given the XML config above, the admin would need
-      to create a cgroup named '/machine/production.partition'
-    </p>
-
-    <pre>
-# cd /sys/fs/cgroup
-# for i in blkio cpu,cpuacct cpuset devices freezer memory net_cls perf_event
-  do
-    mkdir $i/machine/production.partition
-  done
-# for i in cpuset.cpus  cpuset.mems
-  do
-    cat cpuset/machine/$i > cpuset/machine/production.partition/$i
-  done
-</pre>
-
-    <p>
-      <strong>Note:</strong> the cgroups directory created as a ".partition"
-      suffix, but the XML config does not require this suffix.
-    </p>
-
-    <p>
-      <strong>Note:</strong> the ability to place guests in custom
-      partitions is only available with libvirt &gt;= 1.0.5, using
-      the new cgroup layout. The legacy cgroups layout described
-      later did not support customization per guest.
-    </p>
-
-    <h2><a name="resourceAPIs">Resource management APIs/commands</a></h2>
-
-    <p>
-      Since libvirt aims to provide an API which is portable across
-      hypervisors, the concept of cgroups is not exposed directly
-      in the API or XML configuration. It is considered to be an
-      internal implementation detail. Instead libvirt provides a
-      set of APIs for applying resource controls, which are then
-      mapped to corresponding cgroup tunables
-    </p>
-
-    <h3>Scheduler tuning</h3>
-
-    <p>
-     Parameters from the "cpu" controller are exposed via the
-     <code>schedinfo</code> command in virsh.
-    </p>
-
-    <pre>
-# virsh schedinfo demo
-Scheduler      : posix
-cpu_shares     : 1024
-vcpu_period    : 100000
-vcpu_quota     : -1
-emulator_period: 100000
-emulator_quota : -1</pre>
-
-
-    <h3>Block I/O tuning</h3>
-
-    <p>
-     Parameters from the "blkio" controller are exposed via the
-     <code>bkliotune</code> command in virsh.
-    </p>
-
-
-    <pre>
-# virsh blkiotune demo
-weight         : 500
-device_weight  : </pre>
-
-    <h3>Memory tuning</h3>
-
-    <p>
-     Parameters from the "memory" controller are exposed via the
-     <code>memtune</code> command in virsh.
-    </p>
-
-    <pre>
-# virsh memtune demo
-hard_limit     : 580192
-soft_limit     : unlimited
-swap_hard_limit: unlimited
-    </pre>
-
-    <h3>Network tuning</h3>
-
-    <p>
-      The <code>net_cls</code> is not currently used. Instead traffic
-      filter policies are set directly against individual virtual
-      network interfaces.
-    </p>
-
-    <h2><a name="legacyLayout">Legacy cgroups layout</a></h2>
-
-    <p>
-      Prior to libvirt 1.0.5, the cgroups layout created by libvirt was different
-      from that described above, and did not allow for administrator customization.
-      Libvirt used a fixed, 3-level hierarchy <code>libvirt/{qemu,lxc}/$VMNAME</code>
-      which was rooted at the point in the hierarchy where libvirtd itself was
-      located. So if libvirtd was placed at <code>/system/libvirtd.service</code>
-      by systemd, the groups for each virtual machine / container would be located
-      at <code>/system/libvirtd.service/libvirt/{qemu,lxc}/$VMNAME</code>. In addition
-      to this, the QEMU drivers further child groups for each vCPU thread and the
-      emulator thread(s). This leads to a hierarchy that looked like
-    </p>
-
-
-    <pre>
-$ROOT
-  |
-  +- system
-      |
-      +- libvirtd.service
-           |
-           +- libvirt
-               |
-               +- qemu
-               |   |
-               |   +- vm1
-               |   |   |
-               |   |   +- emulator
-               |   |   +- vcpu0
-               |   |   +- vcpu1
-               |   |
-               |   +- vm2
-               |   |   |
-               |   |   +- emulator
-               |   |   +- vcpu0
-               |   |   +- vcpu1
-               |   |
-               |   +- vm3
-               |       |
-               |       +- emulator
-               |       +- vcpu0
-               |       +- vcpu1
-               |
-               +- lxc
-                   |
-                   +- container1
-                   |
-                   +- container2
-                   |
-                   +- container3
-    </pre>
-
-    <p>
-      Although current releases are much improved, historically the use of deep
-      hierarchies has had a significant negative impact on the kernel scalability.
-      The legacy libvirt cgroups layout highlighted these problems, to the detriment
-      of the performance of virtual machines and containers.
-    </p>
-  </body>
-</html>

docs/compiling.html.in

@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<?xml version="1.0"?>
+<html>
   <body>
     <h1><a name="installation">libvirt Installation</a></h1>
 

docs/contact.html.in

@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<?xml version="1.0"?>
+<html>
   <body>
     <h1>Contacting the development team</h1>
 

docs/csharp.html.in

@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<?xml version="1.0"?>
+<html>
   <body>
     <h1>C# API bindings</h1>
 

docs/deployment.html.in

@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html>
   <body>
     <h1>Deployment</h1>
 

docs/devguide.html.in

@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<?xml version="1.0"?>
+<html>
   <body>
     <h1>libvirt Application Development Guide</h1>
 

docs/docs.html.in

@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html>
   <body>
     <h1>Documentation</h1>
   </body>

docs/downloads.html.in

@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<?xml version="1.0"?>
+<html>
   <body>
     <h1>Downloads</h1>
 

docs/drivers.html.in

@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html>
   <body>
     <h1>Internal drivers</h1>
 
@@ -31,8 +29,6 @@
       <li><strong><a href="drvvmware.html">VMware Workstation/Player</a></strong></li>
       <li><strong><a href="drvxen.html">Xen</a></strong></li>
       <li><strong><a href="drvhyperv.html">Microsoft Hyper-V</a></strong></li>
-      <li><strong><a href="drvphyp.html">IBM PowerVM (phyp)</a></strong></li>
-      <li><strong><a href="drvparallels.html">Parallels</a></strong></li>
     </ul>
 
     <h2><a name="storage">Storage drivers</a></h2>

docs/drvesx.html.in

@@ -1,7 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
+<html><body>
     <h1>VMware ESX hypervisor driver</h1>
     <ul id="toc"></ul>
     <p>

docs/drvhyperv.html.in

@@ -1,7 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
+<html><body>
     <h1>Microsoft Hyper-V hypervisor driver</h1>
     <ul id="toc"></ul>
     <p>

docs/drvlxc.html.in

@@ -1,102 +1,49 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html>
   <body>
     <h1>LXC container driver</h1>
-
-    <ul id="toc"></ul>
-
 <p>
-The libvirt LXC driver manages "Linux Containers". At their simplest, containers
-can just be thought of as a collection of processes, separated from the main
-host processes via a set of resource namespaces and constrained via control
-groups resource tunables. The libvirt LXC driver has no dependency on the LXC
-userspace tools hosted on sourceforge.net. It directly utilizes the relevant
-kernel features to build the container environment. This allows for sharing
-of many libvirt technologies across both the QEMU/KVM and LXC drivers. In
-particular sVirt for mandatory access control, auditing of operations,
-integration with control groups and many other features.
+The libvirt LXC driver manages "Linux Containers".  Containers are sets of processes
+with private namespaces which can (but don't always) look like separate machines, but
+do not have their own OS.  Here are two example configurations.  The first is a very
+light-weight "application container" which does not have its own root image.
 </p>
 
-<h2><a name="cgroups">Control groups Requirements</a></h2>
+    <h2><a name="project">Project Links</a></h2>
+
+    <ul>
+      <li>
+        The <a href="http://lxc.sourceforge.net/">LXC</a> Linux
+        container system
+      </li>
+    </ul>
+
+<h2>Cgroups Requirements</h2>
 
 <p>
-In order to control the resource usage of processes inside containers, the
-libvirt LXC driver requires that certain cgroups controllers are mounted on
-the host OS. The minimum required controllers are 'cpuacct', 'memory' and
-'devices', while recommended extra controllers are 'cpu', 'freezer' and
-'blkio'. Libvirt will not mount the cgroups filesystem itself, leaving
-this up to the init system to take care of. Systemd will do the right thing
-in this respect, while for other init systems the <code>cgconfig</code>
-init service will be required. For further information, consult the general
-libvirt <a href="cgroups.html">cgroups documentation</a>.
-</p>
-
-<h2><a name="namespaces">Namespace requirements</a></h2>
-
-<p>
-In order to separate processes inside a container from those in the
-primary "host" OS environment, the libvirt LXC driver requires that
-certain kernel namespaces are compiled in. Libvirt currently requires
-the 'mount', 'ipc', 'pid', and 'uts' namespaces to be available. If
-separate network interfaces are desired, then the 'net' namespace is
-required. In the near future, the 'user' namespace will optionally be
-supported.
-</p>
-
-<p>
-<strong>NOTE: In the absence of support for the 'user' namespace,
-processes inside containers cannot be securely isolated from host
-process without the use of a mandatory access control technology
-such as SELinux or AppArmor.</strong>
-</p>
-
-<h2><a name="init">Default container setup</a></h2>
-
-<h3><a name="cliargs">Command line arguments</a></h3>
-
-<p>
-When the container "init" process is started, it will typically
-not be given any command line arguments (eg the equivalent of
-the bootloader args visible in <code>/proc/cmdline</code>). If
-any arguments are desired, then must be explicitly set in the
-container XML configuration via one or more <code>initarg</code>
-elements. For example, to run <code>systemd --unit emergency.service</code>
-would use the following XML
+The libvirt LXC driver requires that certain cgroups controllers are
+mounted on the host OS. The minimum required controllers are 'cpuacct',
+'memory' and 'devices', while recommended extra controllers are
+'cpu', 'freezer' and 'blkio'. The /etc/cgconfig.conf &amp; cgconfig
+init service used to mount cgroups at host boot time. To manually
+mount them use:
 </p>
 
 <pre>
-  &lt;os&gt;
-    &lt;type arch='x86_64'&gt;exe&lt;/type&gt;
-    &lt;init&gt;/bin/systemd&lt;/init&gt;
-    &lt;initarg&gt;--unit&lt;/initarg&gt;
-    &lt;initarg&gt;emergency.service&lt;/initarg&gt;
-  &lt;/os&gt;
+ # mount -t cgroup cgroup /dev/cgroup -o cpuacct,memory,devices,cpu,freezer,blkio
 </pre>
 
-<h3><a name="envvars">Environment variables</a></h3>
+<p>
+NB, the blkio controller in some kernels will not allow creation of nested
+sub-directories which will prevent correct operation of the libvirt LXC
+driver. On such kernels, it may be necessary to unmount the blkio controller.
+</p>
+
+
+<h2>Environment setup for the container init</h2>
 
 <p>
 When the container "init" process is started, it will be given several useful
-environment variables. The following standard environment variables are mandated
-by <a href="http://www.freedesktop.org/wiki/Software/systemd/ContainerInterface">systemd container interface</a>
-to be provided by all container technologies on Linux.
-</p>
-
-<dl>
-<dt>container</dt>
-<dd>The fixed string <code>libvirt-lxc</code> to identify libvirt as the creator</dd>
-<dt>container_uuid</dt>
-<dd>The UUID assigned to the container by libvirt</dd>
-<dt>PATH</dt>
-<dd>The fixed string <code>/bin:/usr/bin</code></dd>
-<dt>TERM</dt>
-<dd>The fixed string <code>linux</code></dd>
-</dl>
-
-<p>
-In addition to the standard variables, the following libvirt specific
-environment variables are also provided
+environment variables.
 </p>
 
 <dl>
@@ -105,152 +52,9 @@ environment variables are also provided
 <dt>LIBVIRT_LXC_UUID</dt>
 <dd>The UUID assigned to the container by libvirt</dd>
 <dt>LIBVIRT_LXC_CMDLINE</dt>
-<dd>The unparsed command line arguments specified in the container configuration.
-Use of this is discouraged, in favour of passing arguments directly to the
-container init process via the <code>initarg</code> config element.</dd>
+<dd>The unparsed command line arguments specified in the container configuration</dd>
 </dl>
 
-<h3><a name="fsmounts">Filesystem mounts</a></h3>
-
-<p>
-In the absence of any explicit configuration, the container will
-inherit the host OS filesystem mounts. A number of mount points will
-be made read only, or re-mounted with new instances to provide
-container specific data. The following special mounts are setup
-by libvirt
-</p>
-
-<ul>
-<li><code>/dev</code> a new "tmpfs" pre-populated with authorized device nodes</li>
-<li><code>/dev/pts</code> a new private "devpts" instance for console devices</li>
-<li><code>/sys</code> the host "sysfs" instance remounted read-only</li>
-<li><code>/proc</code> a new instance of the "proc" filesystem</li>
-<li><code>/proc/sys</code> the host "/proc/sys" bind-mounted read-only</li>
-<li><code>/sys/fs/selinux</code> the host "selinux" instance remounted read-only</li>
-<li><code>/sys/fs/cgroup/NNNN</code> the host cgroups controllers bind-mounted to
-only expose the sub-tree associated with the container</li>
-<li><code>/proc/meminfo</code> a FUSE backed file reflecting memory limits of the container</li>
-</ul>
-
-
-<h3><a name="devnodes">Device nodes</a></h3>
-
-<p>
-The container init process will be started with <code>CAP_MKNOD</code>
-capability removed and blocked from re-acquiring it. As such it will
-not be able to create any device nodes in <code>/dev</code> or anywhere
-else in its filesystems. Libvirt itself will take care of pre-populating
-the <code>/dev</code> filesystem with any devices that the container
-is authorized to use. The current devices that will be made available
-to all containers are
-</p>
-
-<ul>
-<li><code>/dev/zero</code></li>
-<li><code>/dev/null</code></li>
-<li><code>/dev/full</code></li>
-<li><code>/dev/random</code></li>
-<li><code>/dev/urandom</code></li>
-<li><code>/dev/stdin</code> symlinked to <code>/proc/self/fd/0</code></li>
-<li><code>/dev/stdout</code> symlinked to <code>/proc/self/fd/1</code></li>
-<li><code>/dev/stderr</code> symlinked to <code>/proc/self/fd/2</code></li>
-<li><code>/dev/fd</code> symlinked to <code>/proc/self/fd</code></li>
-<li><code>/dev/ptmx</code> symlinked to <code>/dev/pts/ptmx</code></li>
-<li><code>/dev/console</code> symlinked to <code>/dev/pts/0</code></li>
-</ul>
-
-<p>
-In addition, for every console defined in the guest configuration,
-a symlink will be created from <code>/dev/ttyN</code> symlinked to
-the corresponding <code>/dev/pts/M</code> pseudo TTY device. The
-first console will be <code>/dev/tty1</code>, with further consoles
-numbered incrementally from there.
-</p>
-
-<p>
-Further block or character devices will be made available to containers
-depending on their configuration.
-</p>
-
-<!--
-<h2>Container configuration</h2>
-
-<h3>Init process</h3>
-
-<h3>Console devices</h3>
-
-<h3>Filesystem devices</h3>
-
-<h3>Disk devices</h3>
-
-<h3>Block devices</h3>
-
-<h3>USB devices</h3>
-
-<h3>Character devices</h3>
-
-<h3>Network devices</h3>
--->
-
-<h2>Container security</h2>
-
-<h3>sVirt SELinux</h3>
-
-<p>
-In the absence of the "user" namespace being used, containers cannot
-be considered secure against exploits of the host OS. The sVirt SELinux
-driver provides a way to secure containers even when the "user" namespace
-is not used. The cost is that writing a policy to allow execution of
-arbitrary OS is not practical. The SELinux sVirt policy is typically
-tailored to work with an simpler application confinement use case,
-as provided by the "libvirt-sandbox" project.
-</p>
-
-<h3>Auditing</h3>
-
-<p>
-The LXC driver is integrated with libvirt's auditing subsystem, which
-causes audit messages to be logged whenever there is an operation
-performed against a container which has impact on host resources.
-So for example, start/stop, device hotplug will all log audit messages
-providing details about what action occurred and any resources
-associated with it. There are the following 3 types of audit messages
-</p>
-
-<ul>
-<li><code>VIRT_MACHINE_ID</code> - details of the SELinux process and
-image security labels assigned to the container.</li>
-<li><code>VIRT_CONTROL</code> - details of an action / operation
-performed against a container. There are the following types of
-operation
-  <ul>
-    <li><code>op=start</code> - a container has been started. Provides
-      the machine name, uuid and PID of the <code>libvirt_lxc</code>
-      controller process</li>
-    <li><code>op=init</code> - the init PID of the container has been
-      started. Provides the machine name, uuid and PID of the
-      <code>libvirt_lxc</code> controller process and PID of the
-      init process (in the host PID namespace)</li>
-    <li><code>op=stop</code> - a container has been stopped. Provides
-      the machine name, uuid</li>
-  </ul>
-</li>
-<li><code>VIRT_RESOURCE</code> - details of a host resource
-associated with a container action.</li>
-</ul>
-
-<h3>Device access</h3>
-
-<p>
-All containers are launched with the CAP_MKNOD capability cleared
-and removed from the bounding set. Libvirt will ensure that the
-/dev filesystem is pre-populated with all devices that a container
-is allowed to use. In addition, the cgroup "device" controller is
-configured to block read/write/mknod from all devices except those
-that a container is authorized to use.
-</p>
-
-<h2><a name="exconfig">Example configurations</a></h2>
 
 <h3>Example config version 1</h3>
 <p></p>
@@ -315,158 +119,21 @@ debootstrap, whatever) under /opt/vm-1-root:
 &lt;/domain&gt;
 </pre>
 
-
-<h2><a name="usage">Container usage / management</a></h2>
-
 <p>
-As with any libvirt virtualization driver, LXC containers can be
-managed via a wide variety of libvirt based tools. At the lowest
-level the <code>virsh</code> command can be used to perform many
-tasks, by passing the <code>-c lxc:///</code> argument. As an
-alternative to repeating the URI with every command, the <code>LIBVIRT_DEFAULT_URI</code>
-environment variable can be set to <code>lxc:///</code>. The
-examples that follow outline some common operations with virsh
-and LXC. For further details about usage of virsh consult its
-manual page.
-</p>
-
-<h3><a name="usageSave">Defining (saving) container configuration></a></h3>
-
-<p>
-The <code>virsh define</code> command takes an XML configuration
-document and loads it into libvirt, saving the configuration on disk
-</p>
-
+In both cases, you can define and start a container using:</p>
 <pre>
-# virsh -c lxc:/// define myguest.xml
+virsh --connect lxc:/// define v1.xml
+virsh --connect lxc:/// start vm1
 </pre>
-
-<h3><a name="usageView">Viewing container configuration</a></h3>
-
-<p>
-The <code>virsh dumpxml</code> command can be used to view the
-current XML configuration of a container. By default the XML
-output reflects the current state of the container. If the
-container is running, it is possible to explicitly request the
-persistent configuration, instead of the current live configuration
-using the <code>--inactive</code> flag
-</p>
-
+and then get a console  using:
 <pre>
-# virsh -c lxc:/// dumpxml myguest
+virsh --connect lxc:/// console vm1
 </pre>
-
-<h3><a name="usageStart">Starting containers</a></h3>
-
-<p>
-The <code>virsh start</code> command can be used to start a
-container from a previously defined persistent configuration
+<p>Now doing 'ps -ef' will only show processes in the container, for
+instance.  You can undefine it using
 </p>
-
 <pre>
-# virsh -c lxc:/// start myguest
+virsh --connect lxc:/// undefine vm1
 </pre>
-
-<p>
-It is also possible to start so called "transient" containers,
-which do not require a persistent configuration to be saved
-by libvirt, using the <code>virsh create</code> command.
-</p>
-
-<pre>
-# virsh -c lxc:/// create myguest.xml
-</pre>
-
-
-<h3><a name="usageStop">Stopping containers</a></h3>
-
-<p>
-The <code>virsh shutdown</code> command can be used
-to request a graceful shutdown of the container. By default
-this command will first attempt to send a message to the
-init process via the <code>/dev/initctl</code> device node.
-If no such device node exists, then it will send SIGTERM
-to PID 1 inside the container.
-</p>
-
-<pre>
-# virsh -c lxc:/// shutdown myguest
-</pre>
-
-<p>
-If the container does not respond to the graceful shutdown
-request, it can be forceably stopped using the <code>virsh destroy</code>
-</p>
-
-<pre>
-# virsh -c lxc:/// destroy myguest
-</pre>
-
-
-<h3><a name="usageReboot">Rebooting a container</a></h3>
-
-<p>
-The <code>virsh reboot</code> command can be used
-to request a graceful shutdown of the container. By default
-this command will first attempt to send a message to the
-init process via the <code>/dev/initctl</code> device node.
-If no such device node exists, then it will send SIGHUP
-to PID 1 inside the container.
-</p>
-
-<pre>
-# virsh -c lxc:/// reboot myguest
-</pre>
-
-<h3><a name="usageDelete">Undefining (deleting) a container configuration</a></h3>
-
-<p>
-The <code>virsh undefine</code> command can be used to delete the
-persistent configuration of a container. If the guest is currently
-running, this will turn it into a "transient" guest.
-</p>
-
-<pre>
-# virsh -c lxc:/// undefine myguest
-</pre>
-
-<h3><a name="usageConnect">Connecting to a container console</a></h3>
-
-<p>
-The <code>virsh console</code> command can be used to connect
-to the text console associated with a container. If the container
-has been configured with multiple console devices, then the
-<code>--devname</code> argument can be used to choose the
-console to connect to
-</p>
-
-<pre>
-# virsh -c lxc:/// console myguest
-</pre>
-
-<h3><a name="usageEnter">Running commands in a container</a></h3>
-
-<p>
-The <code>virsh lxc-enter-namespace</code> command can be used
-to enter the namespaces and security context of a container
-and then execute an arbitrary command.
-</p>
-
-<pre>
-# virsh -c lxc:/// lxc-enter-namespace myguest -- /bin/ls -al /dev
-</pre>
-
-<h3><a name="usageTop">Monitoring container utilization</a></h3>
-
-<p>
-The <code>virt-top</code> command can be used to monitor the
-activity and resource utilization of all containers on a
-host
-</p>
-
-<pre>
-# virt-top -c lxc:///
-</pre>
-
   </body>
 </html>

docs/drvopenvz.html.in

@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html> <!-- -*- html -*- -->
   <body>
     <h1>OpenVZ container driver</h1>
 

docs/drvparallels.html.in

@@ -1,7 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
+<html><body>
     <h1>Parallels Cloud Server driver</h1>
     <ul id="toc"></ul>
     <p>

docs/drvphyp.html.in

@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <h1>IBM PowerVM hypervisor driver (phyp)</h1>
-    <ul id="toc"></ul>
-    <p>
-        The IBM PowerVM driver can manage both HMC and IVM PowerVM
-        guests.  VIOS connections are tunneled through HMC.
-    </p>
-
-
-    <h2><a name="project">Project Links</a></h2>
-    <ul>
-      <li>
-        The <a href="http://www-03.ibm.com/systems/power/software/virtualization/index.html">IBM
-        PowerVM</a> hypervisor
-      </li>
-    </ul>
-
-
-    <h2><a name="uri">Connections to the PowerVM driver</a></h2>
-    <p>
-        Some example remote connection URIs for the driver are:
-    </p>
-<pre>
-phyp://user@hmc/system (HMC connection)
-phyp://user@ivm/system (IVM connection)
-</pre>
-    <p>
-        <strong>Note</strong>: In contrast to other drivers, the
-        PowerVM (or phyp) driver is a client-side-only driver,
-        internally using ssh to connect to the specified hmc or ivm
-        server. Therefore, the <a href="remote.html">remote transport
-        mechanism</a> provided by the remote driver and libvirtd will
-        not work, and you cannot use URIs like
-        <code>phyp+ssh://example.com</code>.
-    </p>
-
-
-    <h3><a name="uriformat">URI Format</a></h3>
-    <p>
-        URIs have this general form (<code>[...]</code> marks an
-        optional part, <code>{...|...}</code> marks a mandatory choice).
-    </p>
-<pre>
-phyp://[username@]{hmc|ivm}/managed_system
-</pre>
-
-</body></html>

docs/drvqemu.html.in

@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html>
   <body>
     <h1>KVM/QEMU hypervisor driver</h1>
 
@@ -19,7 +17,6 @@
       <li>
         The <a href="http://www.linux-kvm.org/">KVM</a> Linux
         hypervisor
-      </li>
       <li>
         The <a href="http://wiki.qemu.org/Index.html">QEMU</a> emulator
       </li>
@@ -560,7 +557,6 @@ $ virsh domxml-to-native qemu-argv demo.xml
       possible to add an element <code>&lt;qemu:commandline&gt;</code>
       under <code>driver</code>, with the following sub-elements
       repeated as often as needed:
-    </p>
       <dl>
         <dt><code>qemu:arg</code></dt>
         <dd>Add an additional command-line argument to the qemu
@@ -573,6 +569,7 @@ $ virsh domxml-to-native qemu-argv demo.xml
           pair recorded in the attributes <code>name</code>
           and optional <code>value</code>.</dd>
       </dl>
+
       <p>Example:</p><pre>
 &lt;domain type='qemu' xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'&gt;
   &lt;name&gt;QEmu-fedora-i686&lt;/name&gt;

docs/drvremote.html.in

@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html>
   <body>
     <h1>Remote management driver</h1>
   </body>

docs/drvtest.html.in

@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html>
   <body>
     <h1>Test "mock" driver</h1>
 

docs/drvuml.html.in

@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html>
   <body>
     <h1>User Mode Linux driver</h1>
 

docs/drvvbox.html.in

@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html>
     <body>
         <h1>VirtualBox hypervisor driver</h1>
         <p>
@@ -31,18 +29,6 @@ vbox+tcp://user@example.com/session  (remote access, SASl/Kerberos)
 vbox+ssh://user@example.com/session  (remote access, SSH tunnelled)
 </pre>
 
-    <p>
-      <strong>NOTE: as of libvirt 1.0.6, the VirtualBox driver will always
-        run inside the libvirtd daemon, instead of being built-in to the
-        libvirt.so library directly. This change was required due to the
-        fact that VirtualBox code is LGPLv2-only licensed, which is not
-        compatible with the libvirt.so license of LGPLv2-or-later. The
-        daemon will be auto-started when the first connection to VirtualBox
-        is requested. This change also means that it will not be possible
-        to use VirtualBox URIs on the Windows platform, until additional
-        work is completed to get the libvirtd daemon working there.</strong>
-    </p>
-
     <h2><a name="xmlconfig">Example domain XML config</a></h2>
 
 <pre>

docs/drvvmware.html.in

@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html>
     <body>
         <h1>VMware Workstation / Player hypervisors driver</h1>
         <p>

docs/drvxen.html.in

@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html>
   <body>
     <h1>Xen hypervisor driver</h1>
 

docs/errors.html.in

@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<?xml version="1.0"?>
+<html>
   <body>
     <h1 >Handling of errors</h1>
     <p>The main goals of libvirt when it comes to error handling are:</p>

docs/firewall.html.in

@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<?xml version="1.0"?>
+<html>
   <body>
     <h1 >Firewall and network filtering in libvirt</h1>
     <p>There are three pieces of libvirt functionality which do network
@@ -199,7 +198,7 @@ using an XML format. At a high level the format looks like this:
     </p>
     <p>The <code>&lt;rule&gt;</code> element is where all the interesting stuff
        happens. It has three attributes, an action, a traffic direction and an
-       optional priority. E.g.:
+       optional priority. eg:
     </p>
     <pre>&lt;rule action='drop' direction='out' priority='500'&gt;</pre>
     <p>Within the rule there are a wide variety of elements allowed, which
@@ -318,7 +317,7 @@ Bridge chain: PREROUTING, entries: 1, policy: ACCEPT
 
 Bridge chain: POSTROUTING, entries: 1, policy: ACCEPT
 -o vnet0 -j libvirt-O-vnet0</pre>
-    <p>To keep things manageable and easy to follow, the driver will then
+    <p>To keep things managable and easy to follow, the driver will then
        create further sub-chains for each protocol then it needs to match
        against:
     </p>

docs/format.html.in

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version="1.0"?>
 <html xmlns="http://www.w3.org/1999/xhtml">
   <body>
     <h1 >XML Format</h1>

docs/formatcaps.html.in

@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html>
   <body>
     <h1>Driver capabilities XML format</h1>
 

docs/formatnetwork.html.in

@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html>
   <body>
     <h1>Network XML format</h1>
 
@@ -35,7 +33,7 @@
     </p>
 
     <pre>
-      &lt;network ipv6='yes'&gt;
+      &lt;network&gt;
         &lt;name&gt;default&lt;/name&gt;
         &lt;uuid&gt;3e3fce45-4f53-4fa7-bb32-11f34168b82b&lt;/uuid&gt;
         ...</pre>
@@ -54,12 +52,6 @@
         The format must be RFC 4122 compliant, eg <code>3e3fce45-4f53-4fa7-bb32-11f34168b82b</code>.
         If omitted when defining/creating a new network, a random
         UUID is generated. <span class="since">Since 0.3.0</span></dd>
-      <dt><code>ipv6='yes'</code></dt>
-      <dd>The new, optional parameter <code>ipv6='yes'</code> enables
-        a network definition with no IPv6 gateway addresses specified
-        to have guest-to-guest communications.  For further information,
-        see the example below for the example with no gateway addresses.
-        <span class="since">Since 1.0.1</span></dd>
     </dl>
 
     <h3><a name="elementsConnect">Connectivity</a></h3>
@@ -138,39 +130,6 @@
             network, and to/from the host to the guests, are
             unrestricted and not NATed.<span class="since">Since
             0.4.2</span>
-
-            <p><span class="since">Since 1.0.3</span> it is possible to
-            specify a public IPv4 address and port range to be used for
-            the NAT by using the <code>&lt;nat&gt;</code> subelement.
-            The address range is set with the <code>&lt;address&gt;</code>
-            subelements and <code>start</code> and <code>stop</code>
-            attributes:
-            </p>
-            <pre>
-...
-  &lt;forward mode='nat'&gt;
-    &lt;nat&gt;
-      &lt;address start='1.2.3.4' end='1.2.3.10'/&gt;
-    &lt;/nat&gt;
-  &lt;/forward&gt;
-...</pre>
-            <p>
-            An singe IPv4 address can be set by setting
-            <code>start</code> and <code>end</code> attributes to
-            the same value.
-            </p>
-            <p>
-            The port range to be used for the <code>&lt;nat&gt;</code> can
-            be set via the subelement <code>&lt;port&gt;</code>:
-            </p>
-            <pre>
-...
-  &lt;forward mode='nat'&gt;
-    &lt;nat&gt;
-      &lt;port start='500' end='1000'/&gt;
-    &lt;/nat&gt;
-  &lt;/forward&gt;
-...</pre>
           </dd>
 
           <dt><code>route</code></dt>
@@ -281,20 +240,6 @@
             use the traditional <code>&lt; hostdev&gt;</code> device
             definition. <span class="since"> Since 0.10.0</span>
 
-            <p>
-              To use VFIO device assignment rather than
-              traditional/legacy KVM device assignment (VFIO is a new
-              method of device assignment that is compatible with UEFI
-              Secure Boot), a &lt;forward type='hostdev'&gt; interface
-              can have an optional <code>driver</code> sub-element
-              with a <code>name</code> attribute set to "vfio". To use
-              legacy KVM device assignment you can
-              set <code>name</code> to "kvm" (or simply omit the
-              &lt;driver&gt; element, since "kvm" is currently the
-              default).
-              <span class="since">Since 1.0.5 (QEMU and KVM only, requires kernel 3.6 or newer)</span>
-            </p>
-
             <p>Note that this "intelligent passthrough" of network
             devices is very similar to the functionality of a
             standard <code>&lt; hostdev&gt;</code> device, the
@@ -376,7 +321,6 @@
         <pre>
 ...
   &lt;forward mode='hostdev' managed='yes'&gt;
-    &lt;driver name='vfio'/&gt;
     &lt;address type='pci' domain='0' bus='4' slot='0' function='1'/&gt;
     &lt;address type='pci' domain='0' bus='4' slot='0' function='2'/&gt;
     &lt;address type='pci' domain='0' bus='4' slot='0' function='3'/&gt;
@@ -546,62 +490,6 @@
       starting.
     </p>
 
-    <h5><a name="elementsStaticroute">Static Routes</a></h5>
-    <p>
-      Static route definitions are used to provide routing information
-      to the virtualization host for networks which are not directly
-      reachable from the virtualization host, but *are* reachable from
-      a guest domain that is itself reachable from the
-      host <span class="since">since 1.0.6</span>.
-    </p>
-
-    <p>
-      As shown in <a href="formatnetwork.html#examplesNoGateway">this
-      example</a>, it is possible to define a virtual network
-      interface with no IPv4 or IPv6 addresses.  Such networks are
-      useful to provide host connectivity to networks which are only
-      reachable via a guest.  A guest with connectivity both to the
-      guest-only network and to another network that is directly
-      reachable from the host can act as a gateway between the
-      networks.  A static route added to the "host-visible" network
-      definition provides the routing information so that IP packets
-      can be sent from the virtualization host to guests on the hidden
-      network.
-    </p>
-
-    <p>
-      Here is a fragment of a definition which shows the static
-      route specification as well as the  IPv4 and IPv6 definitions
-      for network addresses which are referred to in the
-      <code>gateway</code> gateway address specifications.  Note
-      that the third static route specification includes the
-      <code>metric</code> attribute specification with a value of 2.
-      This particular route would *not* be preferred if there was
-      another existing rout on the system with the same address and
-      prefix but with a lower value for the metric. If there is a
-      route in the host system configuration that should be overriden
-      by a route in a virtual network whenever the virtual network is
-      running, the configuration for the system-defined route should
-      be modified to have a higher metric, and the route on the
-      virtual network given a lower metric (for example, the default
-      metric of "1").
-    </p>
-
-    <pre>
-      ...
-        &lt;ip address="192.168.122.1" netmask="255.255.255.0"&gt;
-          &lt;dhcp&gt;
-            &lt;range start="192.168.122.128" end="192.168.122.254" /&gt;
-          &lt;/dhcp&gt;
-        &lt;/ip&gt;
-        &lt;route address="192.168.222.0" prefix="24" gateway="192.168.122.2" /&gt;
-        &lt;ip family="ipv6" address="2001:db8:ca2:2::1" prefix="64" /&gt;
-        &lt;route family="ipv6" address="2001:db8:ca2:3::" prefix="64" gateway="2001:db8:ca2:2::2"/&gt;
-        &lt;route family="ipv6" address="2001:db9:4:1::" prefix="64" gateway="2001:db8:ca2:2::3" metric='2'&gt;
-        &lt;/route&gt;
-      ...
-    </pre>
-
     <h3><a name="elementsAddress">Addressing</a></h3>
 
     <p>
@@ -633,7 +521,6 @@
           &lt;/dhcp&gt;
         &lt;/ip&gt;
         &lt;ip family="ipv6" address="2001:db8:ca2:2::1" prefix="64" /&gt;
-        &lt;route family="ipv6" address="2001:db9:ca1:1::" prefix="64" gateway="2001:db8:ca2:2::2" /&gt;
       &lt;/network&gt;</pre>
 
     <dl>
@@ -690,10 +577,8 @@
         dotted-decimal format, or an IPv6 address in standard
         colon-separated hexadecimal format, that will be configured on
         the bridge
-        device associated with the virtual network. To the guests this IPv4
-        address will be their IPv4 default route.  For IPv6, the default route is
-        established via Router Advertisement.
-        For IPv4 addresses, the <code>netmask</code>
+        device associated with the virtual network. To the guests this
+        address will be their default route. For IPv4 addresses, the <code>netmask</code>
         attribute defines the significant bits of the network address,
         again specified in dotted-decimal format.  For IPv6 addresses,
         and as an alternate method for IPv4 addresses, you can specify
@@ -702,13 +587,10 @@
         could also be given as <code>prefix='24'</code>. The <code>family</code>
         attribute is used to specify the type of address - 'ipv4' or 'ipv6'; if no
         <code>family</code> is given, 'ipv4' is assumed. A network can have more than
-        one of each family of address defined, but only a single IPv4 address can have a
-        <code>dhcp</code> or <code>tftp</code> element. <span class="since">Since 0.3.0 </span>
+        one of each family of address defined, but only a single address can have a
+        <code>dhcp</code> or <code>tftp</code> element. <span class="since">Since 0.3.0;
         IPv6, multiple addresses on a single network, <code>family</code>, and
-        <code>prefix</code> are support <span class="since">Since 0.8.7</span>.
-        Similar to IPv4, one IPv6 address per network can also have
-        a <code>dhcp</code> definition.  <span class="since">Since 1.0.1</span>
-
+        <code>prefix</code> since 0.8.7</span>
         <dl>
           <dt><code>tftp</code></dt>
           <dd>Immediately within
@@ -726,44 +608,30 @@
             optional <code>dhcp</code> element. The presence of this element
             enables DHCP services on the virtual network. It will further
             contain one or more <code>range</code> elements. The
-            <code>dhcp</code> element supported for both
-            IPv4 <span class="since">Since 0.3.0</span>
-            and IPv6 <span class="since">Since 1.0.1</span>, but
-            only for one IP address of each type per network.
+            <code>dhcp</code> element is not supported for IPv6, and
+            is only supported on a single IP address per network for IPv4.
+            <span class="since">Since 0.3.0</span>
             <dl>
               <dt><code>range</code></dt>
               <dd>The <code>start</code> and <code>end</code> attributes on the
                 <code>range</code> element specify the boundaries of a pool of
-                addresses to be provided to DHCP clients. These two addresses
+                IPv4 addresses to be provided to DHCP clients. These two addresses
                 must lie within the scope of the network defined on the parent
-                <code>ip</code> element.  There may be zero or more
-                <code>range</code> elements specified.
-                <span class="since">Since 0.3.0</span>
-                <code>range</code> can be specified for one IPv4 address,
-                one IPv6 address, or both. <span class="since">Since 1.0.1</span>
+                <code>ip</code> element.  <span class="since">Since 0.3.0</span>
               </dd>
               <dt><code>host</code></dt>
               <dd>Within the <code>dhcp</code> element there may be zero or more
-                <code>host</code> elements.  These specify hosts which will be given
+                <code>host</code> elements; these specify hosts which will be given
                 names and predefined IP addresses by the built-in DHCP server. Any
-                IPv4 <code>host</code> element must specify the MAC address of the host to be assigned
+                such element must specify the MAC address of the host to be assigned
                 a given name (via the <code>mac</code> attribute), the IP to be
                 assigned to that host (via the <code>ip</code> attribute), and the
                 name to be given that host by the DHCP server (via the
                 <code>name</code> attribute).  <span class="since">Since 0.4.5</span>
-                An IPv6 <code>host</code> element differs slightly from that for IPv4:
-                there is no <code>mac</code> attribute since a MAC address has no
-                defined meaning in IPv6.  Instead, the <code>name</code> attribute is
-                used to identify the host to be assigned the IPv6 address.  For DHCPv6,
-                the name is the plain name of the client host sent by the
-                client to the server.  Note that this method of assigning a
-                specific IP address can also be used instead of the <code>mac</code>
-                attribute for IPv4.  <span class="since">Since 1.0.1</span>
               </dd>
               <dt><code>bootp</code></dt>
               <dd>The optional <code>bootp</code>
-                element specifies BOOTP options to be provided by the DHCP
-                server for IPv4 only.
+                element specifies BOOTP options to be provided by the DHCP server.
                 Two attributes are supported: <code>file</code> is mandatory and
                 gives the file to be used for the boot image; <code>server</code> is
                 optional and gives the address of the TFTP server from which the boot
@@ -806,29 +674,6 @@
         &lt;ip family="ipv6" address="2001:db8:ca2:2::1" prefix="64" /&gt;
       &lt;/network&gt;</pre>
 
-
-    <p>
-      Below is a variation of the above example which adds an IPv6
-      dhcp range definition.
-    </p>
-
-    <pre>
-      &lt;network&gt;
-        &lt;name&gt;default6&lt;/name&gt;
-        &lt;bridge name="virbr0" /&gt;
-        &lt;forward mode="nat"/&gt;
-        &lt;ip address="192.168.122.1" netmask="255.255.255.0"&gt;
-          &lt;dhcp&gt;
-            &lt;range start="192.168.122.2" end="192.168.122.254" /&gt;
-          &lt;/dhcp&gt;
-        &lt;/ip&gt;
-        &lt;ip family="ipv6" address="2001:db8:ca2:2::1" prefix="64" &gt;
-          &lt;dhcp&gt;
-            &lt;range start="2001:db8:ca2:2:1::10" end="2001:db8:ca2:2:1::ff" /&gt;
-          &lt;/dhcp&gt;
-        &lt;/ip&gt;
-      &lt;/network&gt;</pre>
-
     <h3><a name="examplesRoute">Routed network config</a></h3>
 
     <p>
@@ -853,63 +698,6 @@
         &lt;ip family="ipv6" address="2001:db8:ca2:2::1" prefix="64" /&gt;
       &lt;/network&gt;</pre>
 
-    <p>
-      Below is another IPv6 variation.  Instead of a dhcp range being
-      specified, this example has a couple of IPv6 host definitions.
-      Note that most of the dhcp host definitions use an "id" (client
-      id or DUID) since this has proven to be a more reliable way
-      of specifying the interface and its association with an IPv6
-      address.  The first is a DUID-LLT, the second a DUID-LL, and
-      the third a DUID-UUID.  <span class="since">Since 1.0.3</span>
-    </p>
-
-    <pre>
-      &lt;network&gt;
-        &lt;name&gt;local6&lt;/name&gt;
-        &lt;bridge name="virbr1" /&gt;
-        &lt;forward mode="route" dev="eth1"/&gt;
-        &lt;ip address="192.168.122.1" netmask="255.255.255.0"&gt;
-          &lt;dhcp&gt;
-            &lt;range start="192.168.122.2" end="192.168.122.254" /&gt;
-          &lt;/dhcp&gt;
-        &lt;/ip&gt;
-        &lt;ip family="ipv6" address="2001:db8:ca2:2::1" prefix="64" &gt;
-          &lt;dhcp&gt;
-            &lt;host name="paul"   ip="2001:db8:ca2:2:3::1" /&gt;
-            &lt;host id="0:1:0:1:18:aa:62:fe:0:16:3e:44:55:66"    ip="2001:db8:ca2:2:3::2" /&gt;
-            &lt;host id="0:3:0:1:0:16:3e:11:22:33" name="ralph"  ip="2001:db8:ca2:2:3::3" /&gt;
-            &lt;host id="0:4:7e:7d:f0:7d:a8:bc:c5:d2:13:32:11:ed:16:ea:84:63" name="badbob" ip="2001:db8:ca2:2:3::4" /&gt;
-          &lt;/dhcp&gt;
-        &lt;/ip&gt;
-      &lt;/network&gt;</pre>
-
-    <p>
-      Below is yet another IPv6 variation.  This variation has only
-      IPv6 defined with DHCPv6 on the primary IPv6 network.  A static
-      link if defined for a second IPv6 network which will not be
-      directly visible on the bridge interface but there will be a
-      static route defined for this network via the specified
-      gateway. Note that the gateway address must be directly
-      reachable via (on the same subnet as) one of the &lt;ip&gt;
-      addresses defined for this &lt;network&gt;.
-      <span class="since">Since 1.0.6</span>
-    </p>
-
-    <pre>
-      &lt;network&gt;
-        &lt;name&gt;net7&lt;/name&gt;
-        &lt;bridge name="virbr7" /&gt;
-        &lt;forward mode="route"/&gt;
-        &lt;ip family="ipv6" address="2001:db8:ca2:7::1" prefix="64" &gt;
-          &lt;dhcp&gt;
-            &lt;range start="2001:db8:ca2:7::100" end="2001:db8:ca2::1ff" /&gt;
-            &lt;host id="0:4:7e:7d:f0:7d:a8:bc:c5:d2:13:32:11:ed:16:ea:84:63" name="lucas" ip="2001:db8:ca2:2:3::4" /&gt;
-          &lt;/dhcp&gt;
-        &lt;/ip&gt;
-        &lt;route family="ipv6" address="2001:db8:ca2:8::" prefix="64" gateway="2001:db8:ca2:7::4" &gt;
-        &lt;/route&gt;
-      &lt;/network&gt;</pre>
-
     <h3><a name="examplesPrivate">Isolated network config</a></h3>
 
     <p>
@@ -932,31 +720,6 @@
         &lt;ip family="ipv6" address="2001:db8:ca2:3::1" prefix="64" /&gt;
       &lt;/network&gt;</pre>
 
-    <h3><a name="examplesPrivate6">Isolated IPv6 network config</a></h3>
-
-    <p>
-      This variation of an isolated network defines only IPv6.
-      Note that most of the dhcp host definitions use an "id" (client
-      id or DUID) since this has proven to be a more reliable way
-      of specifying the interface and its association with an IPv6
-      address.  The first is a DUID-LLT, the second a DUID-LL, and
-      the third a DUID-UUID.  <span class="since">Since 1.0.3</span>
-    </p>
-
-    <pre>
-      &lt;network&gt;
-        &lt;name&gt;sixnet&lt;/name&gt;
-        &lt;bridge name="virbr6" /&gt;
-        &lt;ip family="ipv6" address="2001:db8:ca2:6::1" prefix="64" &gt;
-          &lt;dhcp&gt;
-            &lt;host name="peter"   ip="2001:db8:ca2:6:6::1" /&gt;
-            &lt;host id="0:1:0:1:18:aa:62:fe:0:16:3e:44:55:66" ip="2001:db8:ca2:6:6::2" /&gt;
-            &lt;host id="0:3:0:1:0:16:3e:11:22:33" name="dariusz" ip="2001:db8:ca2:6:6::3" /&gt;
-            &lt;host id="0:4:7e:7d:f0:7d:a8:bc:c5:d2:13:32:11:ed:16:ea:84:63" name="anita" ip="2001:db8:ca2:6:6::4" /&gt;
-          &lt;/dhcp&gt;
-        &lt;/ip&gt;
-      &lt;/network&gt;</pre>
-
     <h3><a name="examplesBridge">Using an existing host bridge</a></h3>
 
     <p>
@@ -1010,25 +773,5 @@
         &lt;/forward&gt;
       &lt;/network&gt;</pre>
 
-    <h3><a name="examplesNoGateway">Network config with no gateway addresses</a></h3>
-
-    <p>
-    A valid network definition can contain no IPv4 or IPv6 addresses.  Such a definition
-    can be used for a "very private" or "very isolated" network since it will not be
-    possible to communicate with the virtualization host via this network.  However,
-    this virtual network interface can be used for communication between virtual guest
-    systems.  This works for IPv4 and <span class="since">(Since 1.0.1)</span> IPv6.
-    However, the new ipv6='yes' must be added for guest-to-guest IPv6
-    communication.
-    </p>
-
-    <pre>
-      &lt;network ipv6='yes'&gt;
-        &lt;name&gt;nogw&lt;/name&gt;
-        &lt;uuid&gt;7a3b7497-1ec7-8aef-6d5c-38dff9109e93&lt;/uuid&gt;
-        &lt;bridge name="virbr2" stp="on" delay="0" /&gt;
-        &lt;mac address='00:16:3E:5D:C7:9E'/&gt;
-      &lt;/network&gt;</pre>
-
   </body>
 </html>

docs/formatnode.html.in

@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html>
   <body>
     <h1>Node devices XML format</h1>
 
@@ -138,13 +136,9 @@
               <dd>The SCSI host number.</dd>
               <dt><code>capability</code></dt>
               <dd>Current capabilities include "vports_ops" (indicates
-                vport operations are supported) and "fc_host". "vport_ops"
-                could contain two optional sub-elements: <code>vports</code>,
-                and <code>max_vports</code>. <code>vports</code> shows the
-                number of vport in use. <code>max_vports</code> shows the
-                maximum vports the HBA supports. "fc_host" implies following
-                sub-elements: <code>wwnn</code>, <code>wwpn</code>, and
-                <code>fabric_wwn</code>.
+                vport operations are supported) and "fc_host", the later
+                implies following sub-elements: <code>wwnn</code>,
+                <code>wwpn</code>, <code>fabric_wwn</code>.
               </dd>
             </dl>
           </dd>

docs/formatnwfilter.html.in

@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html>
   <body>
     <h1>Network Filters</h1>
 
@@ -115,7 +113,7 @@
     <p>
       Filtering rules are organized in filter chains. These chains can be
       thought of as having a tree structure with packet
-      filtering rules as entries in individual chains (branches). <br/>
+      filtering rules as entries in individual chains (branches). <br>
       Packets start their filter evaluation in the <code>root</code> chain
       and can then continue their evaluation in other chains, return from
       those chains back into the <code>root</code> chain or be
@@ -229,7 +227,7 @@
     <p>
       A chain with a lower priority value is accessed before one with a
       higher value.
-      <br/>
+      <br><br>
       <span class="since">Since 0.9.8</span> the above listed chains
       can be assigned custom priorities by writing a value in the
       range [-1000, 1000] into the priority (XML) attribute in the filter
@@ -372,7 +370,7 @@
     <p>
       Further, the notation of $VARIABLE is short-hand for $VARIABLE[@0]. The
       former notation always assumes the iterator with Id '0'.
-    </p>
+    <p>
 
     <h3><a name="nwfelemsRulesAdvIPAddrDetection">Automatic IP address detection</a></h3>
     <p>
@@ -396,7 +394,7 @@
        When a VM is migrated to another host or resumed after a suspend operation,
        the first packet sent by the VM will again determine the IP address it can
        use on a particular interface.
-       <br/>
+       <br/><br>
        A value of <code>dhcp</code> specifies that libvirt should only honor DHCP
        server-assigned addresses with valid leases. This method supports the detection
        and usage of multiple IP address per interface.
@@ -569,7 +567,7 @@
         (matching the rule passes this filter, but returns control to
         the calling filter for further
         analysis) <span class="since">(since 0.9.7)</span>,
-        or <code>continue</code> (matching the rule goes on to the next
+        or <code>continue<code> (matching the rule goes on to the next
         rule for further analysis) <span class="since">(since
         0.9.7)</span>.
      </li>
@@ -587,7 +585,7 @@
         <span class="since">Since 0.9.8</span> this has been extended to cover
         the range of -1000 to 1000. If this attribute is not
         provided, priority 500 will automatically be assigned.
-        <br/>
+        <br>
         Note that filtering rules in the <code>root</code> chain are sorted
         with filters connected to the <code>root</code> chain following
         their priorities. This allows to interleave filtering rules with

docs/formatsecret.html.in

@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html>
   <body>
     <h1>Secret XML format</h1>
 
@@ -41,8 +39,8 @@
       <dd>
         Specifies what this secret is used for.  A mandatory
         <code>type</code> attribute specifies the usage category, currently
-        only <code>volume</code>, <code>ceph</code> and <code>iscsi</code>
-        are defined. Specific usage categories are described below.
+        only <code>volume</code> and <code>ceph</code> are defined.
+        Specific usage categories are described below.
       </dd>
     </dl>
 
@@ -64,22 +62,10 @@
       a single <code>name</code> element that specifies a usage name
       for the secret.  The Ceph secret can then be used by UUID or by
       this usage name via the <code>&lt;auth&gt;</code> element of
-      a <a href="formatdomain.html#elementsDisks">disk
+      a <a href="domain.html#elementsDisks">disk
       device</a>. <span class="since">Since 0.9.7</span>.
     </p>
 
-    <h3>Usage type "iscsi"</h3>
-
-    <p>
-      This secret is associated with an iSCSI target for CHAP authentication.
-      The <code>&lt;usage type='iscsi'&gt;</code> element must contain
-      a single <code>target</code> element that specifies a usage name
-      for the secret.  The iSCSI secret can then be used by UUID or by
-      this usage name via the <code>&lt;auth&gt;</code> element of
-      a <a href="formatdomain.html#elementsDisks">disk
-      device</a>. <span class="since">Since 1.0.4</span>.
-    </p>
-
     <h2><a name="example">Example</a></h2>
 
     <pre>

docs/formatsnapshot.html.in

@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html>
   <body>
     <h1>Snapshot XML format</h1>
 
@@ -26,7 +24,7 @@
         since the snapshot in a single file) and external (the
         snapshot is one file, and the changes since the snapshot are
         in another file).</dd>
-      <dt>memory state (or VM state)</dt>
+      <dt>VM state</dt>
       <dd>Tracks only the state of RAM and all other resources in use
         by the VM.  If the disks are unmodified between the time a VM
         state snapshot is taken and restored, then the guest will
@@ -35,7 +33,7 @@
         corruption.</dd>
       <dt>system checkpoint</dt>
       <dd>A combination of disk snapshots for all disks as well as VM
-        memory state, which can be used to resume the guest from where it
+        state, which can be used to resume the guest from where it
         left off with symptoms similar to hibernation (that is, TCP
         connections in the guest may have timed out, but no files or
         processes are lost).</dd>
@@ -43,7 +41,7 @@
 
     <p>
       Libvirt can manage all three types of snapshots.  For now, VM
-      state (memory) snapshots are created only by
+      state snapshots are created only by
       the <code>virDomainSave()</code>, <code>virDomainSaveFlags</code>,
       and <code>virDomainManagedSave()</code> functions, and restored
       via the <code>virDomainRestore()</code>,
@@ -108,17 +106,6 @@
         description is omitted when initially creating the snapshot,
         then this field will be empty.
       </dd>
-      <dt><code>memory</code></dt>
-      <dd>On input, this is an optional request for how to handle VM
-        memory state.  For an offline domain or a disk-only snapshot,
-        attribute <code>snapshot</code> must be <code>no</code>, since
-        there is no VM state saved; otherwise, the attribute can
-        be <code>internal</code> if the memory state is piggy-backed with
-        other internal disk state, or <code>external</code> along with
-        a second attribute <code>file</code> giving the absolute path
-        of the file holding the VM memory state.  <span class="since">Since
-        1.0.1</span>
-      </dd>
       <dt><code>disks</code></dt>
       <dd>On input, this is an optional listing of specific
         instructions for disk snapshots; it is needed when making a
@@ -148,9 +135,8 @@
             the <a href="formatdomain.html#elementsDisks">disk
             devices</a> specified for the domain at the time of the
             snapshot.  The attribute <code>snapshot</code> is
-            optional, and the possible values are the same as the
-            <code>snapshot</code> attribute for
-             <a href="formatdomain.html#elementsDisks">disk devices</a>
+            optional, and has the same values of the disk device
+            element for a domain
             (<code>no</code>, <code>internal</code>,
             or <code>external</code>).  Some hypervisors like ESX
             require that if specified, the snapshot mode must not
@@ -186,7 +172,7 @@
         to <code>virDomainRevertToSnapshot()</code>.  Additionally,
         this field can be the value "disk-snapshot"
         (<span class="since">since 0.9.5</span>) when it represents
-        only a disk snapshot (no VM memory state), and reverting to this
+        only a disk snapshot (no VM state), and reverting to this
         snapshot will default to an inactive guest.  Readonly.
       </dd>
       <dt><code>parent</code></dt>
@@ -236,7 +222,6 @@
   &lt;parent&gt;
     &lt;name&gt;bare-os-install&lt;/name&gt;
   &lt;/parent&gt;
-  &lt;memory snapshot='no'/&gt;
   &lt;disks&gt;
     &lt;disk name='vda' snapshot='external'&gt;
       &lt;driver type='qcow2'/&gt;

docs/formatstorage.html.in

@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html>
   <body>
     <h1>Storage pool and volume XML format</h1>
 
@@ -77,14 +75,6 @@
         &lt;/source&gt;
         ...</pre>
 
-    <pre>
-        ...
-        &lt;source&gt;
-        &lt;source&gt;
-          &lt;adapter type='fc_host' parent='scsi_host5' wwnn='20000000c9831b4b' wwpn='10000000c9831b4b'/&gt;
-        &lt;/source&gt;
-        ...</pre>
-
     <dl>
       <dt><code>device</code></dt>
       <dd>Provides the source for pools backed by physical devices.
@@ -94,27 +84,12 @@
       <dt><code>directory</code></dt>
       <dd>Provides the source for pools backed by directories. May
         only occur once. Contains a single attribute <code>path</code>
-        which is the fully qualified path to the backing directory.
+        which is the fully qualified path to the block device node.
         <span class="since">Since 0.4.1</span></dd>
       <dt><code>adapter</code></dt>
       <dd>Provides the source for pools backed by SCSI adapters. May
-        only occur once. Attribute <code>name</code> is the SCSI adapter
-        name (ex. "scsi_host1".  NB, although a name such as "host1" is
-        still supported for backwards compatibility, it is not recommended).
-        Attribute <code>type</code> (<span class="since">1.0.5</span>)
-        specifies the adapter type.  Valid values are "fc_host" and "scsi_host".
-        If omitted and the <code>name</code> attribute is specified, then it
-        defaults to "scsi_host". To keep backwards compatibility, the attribute
-        <code>type</code> is optional for the "scsi_host" adapter, but
-        mandatory for the "fc_host" adapter.  Attributes <code>wwnn</code>
-        (Word Wide Node Name) and <code>wwpn</code> (Word Wide Port Name)
-        (<span class="since">1.0.4</span>) are used by the "fc_host" adapter
-        to uniquely identify the device in the Fibre Channel storage fabric
-        (the device can be either a HBA or vHBA). Both wwnn and wwpn should
-        be specified (See command 'virsh nodedev-dumpxml' to known how to get
-        wwnn/wwpn of a (v)HBA). The optional attribute <code>parent</code>
-        (<span class="since">1.0.4</span>) specifies the parent device for
-        the "fc_host" adapter.
+        only occur once. Contains a single attribute <code>name</code>
+        which is the SCSI adapter name (ex. "host1").
         <span class="since">Since 0.6.2</span></dd>
       <dt><code>host</code></dt>
       <dd>Provides the source for pools backed by storage from a
@@ -126,7 +101,7 @@
       <dt><code>name</code></dt>
       <dd>Provides the source for pools backed by storage from a
         named element (e.g., a logical volume group name).
-        Contains a string identifier.
+        remote server. Contains a string identifier.
         <span class="since">Since 0.4.5</span></dd>
       <dt><code>format</code></dt>
       <dd>Provides information about the format of the pool. This
@@ -275,11 +250,7 @@
         allocated at time of creation. If set to a value smaller than the
         capacity, the pool has the <strong>option</strong> of deciding
         to sparsely allocate a volume. It does not have to honour requests
-        for sparse allocation though. Different types of pools may treat
-        sparse volumes differently. For example, the <code>logical</code>
-        pool will not automatically expand volume's allocation when it
-        gets full; the user is responsible for doing that or configuring
-        dmeventd to do so automatically.<br/>
+        for sparse allocation though.<br/>
         <br/>
         By default this is specified in bytes, but an optional attribute
         <code>unit</code> can be specified to adjust the passed value.

docs/formatstorageencryption.html.in

@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html>
   <body>
     <h1>Storage volume encryption XML format</h1>
 

docs/generic.css

@@ -4,7 +4,7 @@ body {
   padding: 0px;
   color: rgb(0,0,0);
   font-family: Verdana, Arial, Helvetica, sans-serif;
-  font-size: smaller;
+  font-size: 80%;
   background: #ffffff;
 }
 
@@ -64,6 +64,8 @@ h6 {
 dl dt {
   margin-left: 1em;
   margin-right: 2em;
+  font-weight: bold;
+  font-size: larger;
 }
 
 dl dd {

docs/goals.html.in

@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<?xml version="1.0"?>
+<html>
   <body>
     <h1>Terminology and goals</h1>
     <p>To avoid ambiguity about the terms used, here are the definitions

docs/hacking.html.in

@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html>
   <body>
     <h1>Contributor guidelines</h1>
 
@@ -11,12 +9,8 @@
       <li>Discuss any large changes on the mailing list first.  Post patches
         early and listen to feedback.</li>
 
-      <li><p>Post patches in unified diff format, with git rename
-        detection enabled.  You need a one-time setup of:</p>
-<pre>
-  git config diff.renames true
-</pre>
-        <p>After that, a command similar to this should work:</p>
+      <li><p>Post patches in unified diff format.  A command similar to this
+        should work:</p>
 <pre>
   diff -urp libvirt.orig/ libvirt.modified/ &gt; libvirt-myfeature.patch
 </pre>
@@ -24,11 +18,9 @@
           or:
         </p>
 <pre>
-  git diff &gt; libvirt-myfeature.patch
+  git diff > libvirt-myfeature.patch
 </pre>
-        <p>Also, for code motion patches, you may find that <code>git
-        diff --patience</code> provides an easier-to-read patch.
-        However, the usual workflow of libvirt developer is:</p>
+        <p>However, the usual workflow of libvirt developer is:</p>
 <pre>
   git checkout master
   git pull
@@ -67,21 +59,6 @@
         version if needed though).</p>
       </li>
 
-      <li><p>In your commit message, make the summary line reasonably
-          short (60 characters is typical), followed by a blank line,
-          followed by any longer description of why your patch makes
-          sense.  If the patch fixes a regression, and you know what
-          commit introduced the problem, mentioning that is useful.
-          If the patch resolves a bugzilla report, mentioning the URL
-          of the bug number is useful; but also summarize the issue
-          rather than making all readers follow the link.  You can use
-          'git shortlog -30' to get an idea of typical summary lines.
-          Libvirt does not currently attach any meaning to
-          Signed-off-by: lines, so it is up to you if you want to
-          include or omit them in the commit message.
-        </p>
-      </li>
-
       <li><p>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
@@ -111,9 +88,8 @@
   make syntax-check
   make -C tests valgrind
 </pre>
-        <p><a href="http://valgrind.org/">Valgrind</a> is a test that checks
-        for memory management issues, such as leaks or use of uninitialized
-        variables.
+        <p>
+          The latter test checks for memory leaks.
         </p>
 
         <p>
@@ -134,99 +110,7 @@
 <pre>
   ./qemuxml2xmltest
 </pre>
-        <p>There is also a <code>./run</code> script at the top level,
-          to make it easier to run programs that have not yet been
-          installed, as well as to wrap invocations of various tests
-          under gdb or Valgrind.
-        </p>
 
-      </li>
-      <li><p>The Valgrind test should produce similar output to
-          <code>make check</code>. If the output has traces within libvirt
-          API's, then investigation is required in order to determine the
-          cause of the issue. Output such as the following indicates some
-          sort of leak:
-        </p>
-<pre>
-==5414== 4 bytes in 1 blocks are definitely lost in loss record 3 of 89
-==5414==    at 0x4A0881C: malloc (vg_replace_malloc.c:270)
-==5414==    by 0x34DE0AAB85: xmlStrndup (in /usr/lib64/libxml2.so.2.7.8)
-==5414==    by 0x4CC97A6: virDomainVideoDefParseXML (domain_conf.c:7410)
-==5414==    by 0x4CD581D: virDomainDefParseXML (domain_conf.c:10188)
-==5414==    by 0x4CD8C73: virDomainDefParseNode (domain_conf.c:10640)
-==5414==    by 0x4CD8DDB: virDomainDefParse (domain_conf.c:10590)
-==5414==    by 0x41CB1D: testCompareXMLToArgvHelper (qemuxml2argvtest.c:100)
-==5414==    by 0x41E20F: virtTestRun (testutils.c:161)
-==5414==    by 0x41C7CB: mymain (qemuxml2argvtest.c:866)
-==5414==    by 0x41E84A: virtTestMain (testutils.c:723)
-==5414==    by 0x34D9021734: (below main) (in /usr/lib64/libc-2.15.so)
-</pre>
-        <p>In this example, the <code>virDomainDefParseXML()</code> had
-           an error path where the <code>virDomainVideoDefPtr video</code>
-           pointer was not properly disposed. By simply adding a
-           <code>virDomainVideoDefFree(video);</code> in the error path,
-           the issue was resolved.
-        </p>
-
-        <p>Another common mistake is calling a printing function, such as
-           <code>VIR_DEBUG()</code> without initializing a variable to be
-           printed.  The following example involved a call which could return
-           an error, but not set variables passed by reference to the call.
-           The solution was to initialize the variables prior to the call.
-        </p>
-<pre>
-==4749== Use of uninitialised value of size 8
-==4749==    at 0x34D904650B: _itoa_word (in /usr/lib64/libc-2.15.so)
-==4749==    by 0x34D9049118: vfprintf (in /usr/lib64/libc-2.15.so)
-==4749==    by 0x34D9108F60: __vasprintf_chk (in /usr/lib64/libc-2.15.so)
-==4749==    by 0x4CAEEF7: virVasprintf (stdio2.h:199)
-==4749==    by 0x4C8A55E: virLogVMessage (virlog.c:814)
-==4749==    by 0x4C8AA96: virLogMessage (virlog.c:751)
-==4749==    by 0x4DA0056: virNetTLSContextCheckCertKeyUsage (virnettlscontext.c:225)
-==4749==    by 0x4DA06DB: virNetTLSContextCheckCert (virnettlscontext.c:439)
-==4749==    by 0x4DA1620: virNetTLSContextNew (virnettlscontext.c:562)
-==4749==    by 0x4DA26FC: virNetTLSContextNewServer (virnettlscontext.c:927)
-==4749==    by 0x409C39: testTLSContextInit (virnettlscontexttest.c:467)
-==4749==    by 0x40AB8F: virtTestRun (testutils.c:161)
-</pre>
-        <p>Valgrind will also find some false positives or code paths
-           which cannot be resolved by making changes to the libvirt code.
-           For these paths, it is possible to add a filter to avoid the
-           errors. For example:
-        </p>
-<pre>
-==4643== 7 bytes in 1 blocks are possibly lost in loss record 4 of 20
-==4643==    at 0x4A0881C: malloc (vg_replace_malloc.c:270)
-==4643==    by 0x34D90853F1: strdup (in /usr/lib64/libc-2.15.so)
-==4643==    by 0x34EEC2C08A: ??? (in /usr/lib64/libnl.so.1.1)
-==4643==    by 0x34EEC15B81: ??? (in /usr/lib64/libnl.so.1.1)
-==4643==    by 0x34D8C0EE15: call_init.part.0 (in /usr/lib64/ld-2.15.so)
-==4643==    by 0x34D8C0EECF: _dl_init (in /usr/lib64/ld-2.15.so)
-==4643==    by 0x34D8C01569: ??? (in /usr/lib64/ld-2.15.so)
-
-</pre>
-        <p>In this instance, it is acceptible to modify the
-           <code>tests/.valgrind.supp</code> file in order to add a
-           suppression filter. The filter should be unique enough to
-           not suppress real leaks, but it should be generic enough to
-           cover multiple code paths. The format of the entry can be
-           found in the documentation found at the
-           <a href="http://valgrind.org/">Valgrind home page.</a>
-           The following trace was added to <code>tests/.valgrind.supp</code>
-           in order to suppress the warning:
-        </p>
-<pre>
-{
-    dlInitMemoryLeak1
-    Memcheck:Leak
-    fun:?alloc
-    ...
-    fun:call_init.part.0
-    fun:_dl_init
-    ...
-    obj:*/lib*/ld-2.*so*
-}
-</pre>
       </li>
       <li>Update tests and/or documentation, particularly if you are adding
         a new feature or changing the output of a program.</li>
@@ -328,84 +212,6 @@
     </p>
 
 
-    <h2><a name="bracket_spacing">Bracket spacing</a></h2>
-
-    <p>
-      The keywords <code>if</code>, <code>for</code>, <code>while</code>,
-      and <code>switch</code> must have a single space following them
-      before the opening bracket. E.g.
-    </p>
-    <pre>
-      if(foo)   // Bad
-      if (foo)  // Good
-</pre>
-
-    <p>
-      Function implementations must <strong>not</strong> have any whitespace
-      between the function name and the opening bracket. E.g.
-    </p>
-    <pre>
-      int foo (int wizz)  // Bad
-      int foo(int wizz)   // Good
-</pre>
-
-    <p>
-      Function calls must <strong>not</strong> have any whitespace
-      between the function name and the opening bracket. E.g.
-    </p>
-    <pre>
-      bar = foo (wizz);  // Bad
-      bar = foo(wizz);   // Good
-</pre>
-
-    <p>
-      Function typedefs must <strong>not</strong> have any whitespace
-      between the closing bracket of the function name and opening
-      bracket of the arg list. E.g.
-    </p>
-    <pre>
-      typedef int (*foo) (int wizz);  // Bad
-      typedef int (*foo)(int wizz);   // Good
-</pre>
-
-    <p>
-      There must not be any whitespace immediately following any
-      opening bracket, or immediately prior to any closing bracket. E.g.
-    </p>
-    <pre>
-      int foo( int wizz );  // Bad
-      int foo(int wizz);    // Good
-</pre>
-
-    <h2><a name="semicolon">Semicolons</a></h2>
-
-    <p>
-      Semicolons should never have a space beforehand.  Inside the
-      condition of a <code>for</code> loop, there should always be a
-      space or line break after each semicolon, except for the special
-      case of an infinite loop (although more infinite loops
-      use <code>while</code>).  While not enforced, loop counters
-      generally use post-increment.
-    </p>
-    <pre>
-      for (i = 0 ;i &lt; limit ; ++i) { // Bad
-      for (i = 0; i &lt; limit; i++) { // Good
-      for (;;) { // ok
-      while (1) { // Better
-</pre>
-    <p>
-      Empty loop bodies are better represented with curly braces and a
-      comment, although use of a semicolon is not currently rejected.
-    </p>
-    <pre>
-      while ((rc = waitpid(pid, &amp;st, 0) == -1) &amp;&amp;
-             errno == EINTR); // ok
-      while ((rc = waitpid(pid, &amp;st, 0) == -1) &amp;&amp;
-             errno == EINTR) { // Better
-          /* nothing */
-      }
-</pre>
-
     <h2><a name="curly_braces">Curly braces</a></h2>
 
     <p>
@@ -425,7 +231,7 @@
 </pre>
 
     <p>
-      However, the moment your loop/if/else body extends on to a second
+      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
@@ -548,13 +354,6 @@
 
     <h2><a name="preprocessor">Preprocessor</a></h2>
 
-    <p>Macros defined with an ALL_CAPS name should generally be
-      assumed to be unsafe with regards to arguments with side-effects
-      (that is, MAX(a++, b--) might increment a or decrement b too
-      many or too few times).  Exceptions to this rule are explicitly
-      documented for macros in viralloc.h and virstring.h.
-    </p>
-
     <p>
       For variadic macros, stick with C99 syntax:
     </p>
@@ -652,7 +451,7 @@
       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 viralloc.h.
+      routines, use the macros from memory.h.
     </p>
 
     <ul>
@@ -755,8 +554,8 @@
     <p>
       Usage of the <code>fdopen()</code>, <code>close()</code>, <code>fclose()</code>
       APIs is deprecated in libvirt code base to help avoiding double-closing of files
-      or file descriptors, which is particularly dangerous in a multi-threaded
-      application. Instead of these APIs, use the macros from virfile.h
+      or file descriptors, which is particulary dangerous in a multi-threaded
+      applications. Instead of these APIs, use the macros from virfile.h
     </p>
 
    <ul>
@@ -891,21 +690,6 @@
       virStrncpy(dest, src, strlen(src), sizeof(dest)).
     </p>
 
-<pre>
-  VIR_STRDUP(char *dst, const char *src);
-  VIR_STRNDUP(char *dst, const char *src, size_t n);
-</pre>
-    <p>
-      You should avoid using strdup or strndup directly as they do not report
-      out-of-memory error, and do not allow a NULL source. Use
-      VIR_STRDUP or VIR_STRNDUP macros instead, which return 0 for
-      NULL source, 1 for successful copy, and -1 for allocation
-      failure with the error already reported. In very
-      specific cases, when you don't want to report the out-of-memory error, you
-      can use VIR_STRDUP_QUIET or VIR_STRNDUP_QUIET, but such usage is very rare
-      and usually considered a flaw.
-    </p>
-
     <h2><a name="strbuf">Variable length string buffer</a></h2>
 
     <p>
@@ -966,7 +750,7 @@
   #include &lt;string.h&gt;
   #include &lt;limits.h&gt;
 
-  #if WITH_NUMACTL                Some system includes aren't supported
+  #if HAVE_NUMACTL                Some system includes aren't supported
   # include &lt;numa.h&gt;              everywhere so need these #if guards.
   #endif
 
@@ -982,12 +766,10 @@
 </pre>
 
     <p>
-      Of particular note: <b>Do not</b> include libvirt/libvirt.h,
-      libvirt/virterror.h, libvirt/libvirt-qemu.h, or libvirt/libvirt-lxc.h.
-      They are included by "internal.h" already and there are some special reasons
-      why you cannot include these files explicitly. One of the special cases,
-      "libvirt/libvirt.h" is included prior to "internal.h" in "remote_protocol.x",
-      to avoid exposing *_LAST enum elements.
+      Of particular note: <b>Do not</b> 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.
     </p>
 
 

docs/hacking1.xsl

@@ -1,7 +1,5 @@
 <?xml version="1.0"?>
-<xsl:stylesheet version="1.0"
-                xmlns:html="http://www.w3.org/1999/xhtml"
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
 <xsl:output method="xml" encoding="UTF-8" indent="no"/>
 
@@ -23,8 +21,8 @@
 
 <!-- resolve b/i/code tags in a first pass, because they interfere with line
      wrapping in the second pass -->
-<xsl:template match="html:b">*<xsl:apply-templates/>*</xsl:template>
-<xsl:template match="html:i">'<xsl:apply-templates/>'</xsl:template>
-<xsl:template match="html:code">"<xsl:apply-templates/>"</xsl:template>
+<xsl:template match="b">*<xsl:apply-templates/>*</xsl:template>
+<xsl:template match="i">'<xsl:apply-templates/>'</xsl:template>
+<xsl:template match="code">"<xsl:apply-templates/>"</xsl:template>
 
 </xsl:stylesheet>

docs/hacking2.xsl

@@ -1,7 +1,5 @@
 <?xml version="1.0"?>
-<xsl:stylesheet version="1.0"
-                xmlns:html="http://www.w3.org/1999/xhtml"
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
 <xsl:import href="wrapstring.xsl"/>
 
@@ -32,7 +30,7 @@ from docs/hacking.html.in!
 
 
 <!-- title -->
-<xsl:template match="html:h1">
+<xsl:template match="h1">
 <xsl:text>                         </xsl:text>
 <xsl:value-of select="normalize-space(.)"/>
 <xsl:text>
@@ -67,14 +65,14 @@ from docs/hacking.html.in!
 
 
 
-<xsl:template match="html:h2">
+<xsl:template match="h2">
 <xsl:value-of select="$newline"/>
 <xsl:call-template name="underline"/>
 </xsl:template>
 
 
 
-<xsl:template match="html:h3">
+<xsl:template match="h3">
 <xsl:call-template name="underline">
 <xsl:with-param name="char" select="'-'"/>
 </xsl:call-template>
@@ -93,13 +91,13 @@ from docs/hacking.html.in!
 
 
 
-<xsl:template match="html:ol|html:ul|html:p">
+<xsl:template match="ol|ul|p">
 <xsl:apply-templates/><xsl:value-of select="$newline"/><xsl:value-of select="$newline"/>
 </xsl:template>
 
 
 
-<xsl:template match="html:ol/html:li">
+<xsl:template match="ol/li">
 <xsl:choose>
 <xsl:when test=".//node()[position()=last()]/self::pre">(<xsl:value-of select="position()"/>) <xsl:apply-templates/>
 </xsl:when>
@@ -111,23 +109,23 @@ from docs/hacking.html.in!
 
 
 
-<xsl:template match="html:ul/html:li">- <xsl:apply-templates/><xsl:value-of select="$newline"/><xsl:value-of select="$newline"/>
+<xsl:template match="ul/li">- <xsl:apply-templates/><xsl:value-of select="$newline"/><xsl:value-of select="$newline"/>
 </xsl:template>
 
 
 
-<xsl:template match="html:li/html:ul/html:li">-- <xsl:apply-templates/><xsl:value-of select="$newline"/><xsl:value-of select="$newline"/>
+<xsl:template match="li/ul/li">-- <xsl:apply-templates/><xsl:value-of select="$newline"/><xsl:value-of select="$newline"/>
 </xsl:template>
 
 
 
 <!-- add newline before nested <ul> -->
-<xsl:template match="html:li/html:ul"><xsl:value-of select="$newline"/><xsl:value-of select="$newline"/><xsl:apply-templates/>
+<xsl:template match="li/ul"><xsl:value-of select="$newline"/><xsl:value-of select="$newline"/><xsl:apply-templates/>
 </xsl:template>
 
 
 
-<xsl:template match="html:pre">
+<xsl:template match="pre">
 <xsl:choose>
 <xsl:when test="starts-with(.,'&#xA;')"><xsl:value-of select="substring(.,2)"/><xsl:value-of select="$newline"/>
 </xsl:when>
@@ -139,7 +137,7 @@ from docs/hacking.html.in!
 
 
 
-<xsl:template match="html:a">
+<xsl:template match="a">
 <xsl:value-of select="$newline"/><xsl:value-of select="$newline"/>
 <xsl:text>  </xsl:text><xsl:apply-templates/>
 <xsl:value-of select="$newline"/>

docs/hooks.html.in

@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<?xml version="1.0"?>
+<html>
   <body>
     <h1>Hooks for specific system management</h1>
 
@@ -240,14 +239,13 @@
     <p>If a hook script returns with an exit code of 0, the libvirt daemon
        regards this as successful and performs no logging of it.</p>
     <p>However, if a hook script returns with a non zero exit code, the libvirt
-       daemon regards this as a failure, logs its return code, and
+       daemon regards this as a failure, logs it with return code 256, and
        additionally logs anything on stderr the hook script returns.</p>
     <p>For example, a hook script might use this code to indicate failure,
        and send a text string to stderr:</p>
     <pre>echo "Could not find required XYZZY" &gt;&amp;2
 exit 1</pre>
     <p>The resulting entry in the libvirt log will appear as:</p>
-    <pre>20:02:40.297: error : virHookCall:285 : Hook script execution failed: internal error Child process (LC_ALL=C PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-                       HOME=/root USER=root LOGNAME=root /etc/libvirt/hooks/qemu qemu prepare begin -) unexpected exit status 1: Could not find required XYZZY</pre>
+    <pre>20:02:40.297: error : virHookCall:416 : Hook script execution failed: Hook script /etc/libvirt/hooks/qemu qemu failed with error code 256:Could not find required XYZZY</pre>
   </body>
 </html>

docs/hvsupport.pl

@@ -11,14 +11,13 @@ my $srcdir = shift @ARGV;
 
 my $symslibvirt = "$srcdir/libvirt_public.syms";
 my $symsqemu = "$srcdir/libvirt_qemu.syms";
-my $symslxc = "$srcdir/libvirt_lxc.syms";
 my $drivertable = "$srcdir/driver.h";
 
 my %groupheaders = (
     "virDriver" => "Hypervisor APIs",
     "virNetworkDriver" => "Virtual Network APIs",
     "virInterfaceDriver" => "Host Interface APIs",
-    "virNodeDeviceDriver" => "Host Device APIs",
+    "virDeviceMonitor" => "Host Device APIs",
     "virStorageDriver" => "Storage Pool APIs",
     "virSecretDriver" => "Secret APIs",
     "virNWFilterDriver" => "Network Filter APIs",
@@ -113,48 +112,9 @@ while (defined($line = <FILE>)) {
 close FILE;
 
 
-# And the same for the LXC specific APIs
-
-open FILE, "<$symslxc"
-    or die "cannot read $symslxc: $!";
-
-$prevvers = undef;
-$vers = undef;
-while (defined($line = <FILE>)) {
-    chomp $line;
-    next if $line =~ /^\s*#/;
-    next if $line =~ /^\s*$/;
-    next if $line =~ /^\s*(global|local):/;
-    if ($line =~ /^\s*LIBVIRT_LXC_(\d+\.\d+\.\d+)\s*{\s*$/) {
-        if (defined $vers) {
-            die "malformed syms file";
-        }
-        $vers = $1;
-    } elsif ($line =~ /\s*}\s*;\s*$/) {
-        if (defined $prevvers) {
-            die "malformed syms file";
-        }
-        $prevvers = $vers;
-        $vers = undef;
-    } elsif ($line =~ /\s*}\s*LIBVIRT_LXC_(\d+\.\d+\.\d+)\s*;\s*$/) {
-        if ($1 ne $prevvers) {
-            die "malformed syms file $1 != $vers";
-        }
-        $prevvers = $vers;
-        $vers = undef;
-    } elsif ($line =~ /\s*(\w+)\s*;\s*$/) {
-        $apis{$1} = $vers;
-    } else {
-        die "unexpected data $line\n";
-    }
-}
-
-close FILE;
-
-
 # Some special things which aren't public APIs,
 # but we want to report
-$apis{virConnectSupportsFeature} = "0.3.2";
+$apis{virConnectDrvSupportsFeature} = "0.3.2";
 $apis{virDomainMigratePrepare} = "0.3.2";
 $apis{virDomainMigratePerform} = "0.3.2";
 $apis{virDomainMigrateFinish} = "0.3.2";
@@ -182,7 +142,7 @@ open FILE, "<$drivertable"
 my %groups;
 my $ingrp;
 while (defined($line = <FILE>)) {
-    if ($line =~ /struct _(vir\w*Driver)/) {
+    if ($line =~ /struct _(vir\w*(?:Driver|Monitor))/) {
         my $grp = $1;
         if ($grp ne "virStateDriver" &&
             $grp ne "virStreamDriver") {
@@ -190,15 +150,17 @@ while (defined($line = <FILE>)) {
             $groups{$ingrp} = { apis => {}, drivers => {} };
         }
     } elsif ($ingrp) {
-        if ($line =~ /^\s*vir(?:Drv)(\w+)\s+(\w+);\s*$/) {
+        if ($line =~ /^\s*vir(?:Drv|DevMon)(\w+)\s+(\w+);\s*$/) {
             my $field = $2;
             my $name = $1;
 
             my $api;
             if (exists $apis{"vir$name"}) {
                 $api = "vir$name";
-            } elsif ($name =~ /\w+(Open|Close)/) {
-                next;
+            } elsif (exists $apis{"virConnect$name"}) {
+                $api = "virConnect$name";
+            } elsif (exists $apis{"virNode$name"}) {
+                $api = "virNode$name";
             } else {
                 die "driver $name does not have a public API";
             }
@@ -256,8 +218,6 @@ foreach my $src (@srcs) {
                 die "Driver method for $api is NULL in $src" if $meth eq "NULL";
 
                 if (!exists($groups{$ingrp}->{apis}->{$api})) {
-                    next if $api =~ /\w(Open|Close)/;
-
                     die "Found unexpected method $api in $ingrp\n";
                 }
 
@@ -290,24 +250,24 @@ $groups{virDriver}->{apis}->{"domainMigrate"} = "virDomainMigrate";
 my $openAuthVers = (0 * 1000 * 1000) + (4 * 1000) + 0;
 
 foreach my $drv (keys %{$groups{"virDriver"}->{drivers}}) {
-    my $openVersStr = $groups{"virDriver"}->{drivers}->{$drv}->{"connectOpen"};
+    my $openVersStr = $groups{"virDriver"}->{drivers}->{$drv}->{"open"};
     my $openVers;
     if ($openVersStr =~ /(\d+)\.(\d+)\.(\d+)/) {
         $openVers = ($1 * 1000 * 1000) + ($2 * 1000) + $3;
     }
 
     # virConnectOpenReadOnly always matches virConnectOpen version
-    $groups{"virDriver"}->{drivers}->{$drv}->{"connectOpenReadOnly"} =
-        $groups{"virDriver"}->{drivers}->{$drv}->{"connectOpen"};
+    $groups{"virDriver"}->{drivers}->{$drv}->{"openReadOnly"} =
+        $groups{"virDriver"}->{drivers}->{$drv}->{"open"};
 
     # virConnectOpenAuth is always 0.4.0 if the driver existed
     # before this time, otherwise it matches the version of
     # the driver's virConnectOpen entry
     if ($openVersStr eq "Y" ||
         $openVers >= $openAuthVers) {
-        $groups{"virDriver"}->{drivers}->{$drv}->{"connectOpenAuth"} = $openVersStr;
+        $groups{"virDriver"}->{drivers}->{$drv}->{"openAuth"} = $openVersStr;
     } else {
-        $groups{"virDriver"}->{drivers}->{$drv}->{"connectOpenAuth"} = "0.4.0";
+        $groups{"virDriver"}->{drivers}->{$drv}->{"openAuth"} = "0.4.0";
     }
 }
 
@@ -341,9 +301,7 @@ foreach my $drv (keys %{$groups{"virDriver"}->{drivers}}) {
 # Finally we generate the HTML file with the tables
 
 print <<EOF;
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html>
 <head>
 <title>libvirt API support matrix</title>
 </head>

docs/index.html.in

@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<?xml version="1.0"?>
+<html>
   <body>
     <h1>The virtualization API</h1>
 
@@ -63,12 +62,6 @@
       <li>
         The <a href="http://libvirt.org/drvhyperv.html">Microsoft Hyper-V</a> hypervisor
       </li>
-      <li>
-        The <a href="http://libvirt.org/drvphyp.html">IBM PowerVM</a> hypervisor
-      </li>
-      <li>
-        The <a href="http://libvirt.org/drvparallels.html">Parallels</a> hypervisor
-      </li>
       <li>
         Virtual networks using bridging, NAT, VEPA and VN-LINK.
       </li>

docs/index.py

@@ -166,15 +166,15 @@ def checkTables(db, verbose = 1):
             print "table %s missing" % (table)
             createTable(db, table)
         try:
-            ret = c.execute("SELECT count(*) from %s" % table)
+            ret = c.execute("SELECT count(*) from %s" % table);
             row = c.fetchone()
             if verbose:
                 print "Table %s contains %d records" % (table, row[0])
         except:
             print "Troubles with table %s : repairing" % (table)
-            ret = c.execute("repair table %s" % table)
+            ret = c.execute("repair table %s" % table);
             print "repairing returned %d" % (ret)
-            ret = c.execute("SELECT count(*) from %s" % table)
+            ret = c.execute("SELECT count(*) from %s" % table);
             row = c.fetchone()
             print "Table %s contains %d records" % (table, row[0])
     if verbose:
@@ -600,7 +600,7 @@ def addWordHTML(word, resource, id, section, relevance):
             pass
     else:
         wordsDictHTML[word] = {}
-    d = wordsDictHTML[word]
+    d = wordsDictHTML[word];
     d[resource] = (relevance, id, section)
     return relevance
 
@@ -647,7 +647,7 @@ def addWordArchive(word, id, relevance):
             pass
     else:
         wordsDictArchive[word] = {}
-    d = wordsDictArchive[word]
+    d = wordsDictArchive[word];
     d[id] = relevance
     return relevance
 
@@ -989,7 +989,7 @@ def analyzeHTML(doc, resource, p, section, id):
     return words
 
 def analyzeHTML(doc, resource):
-    para = 0
+    para = 0;
     ctxt = doc.xpathNewContext()
     try:
         res = ctxt.xpathEval("//head/title")
@@ -1079,7 +1079,7 @@ def scanXMLMsgArchive(url, title, force = 0):
 
     try:
         print "Loading %s" % (url)
-        doc = libxml2.htmlParseFile(url, None)
+        doc = libxml2.htmlParseFile(url, None);
     except:
         doc = None
     if doc == None:
@@ -1102,7 +1102,7 @@ def scanXMLDateArchive(t = None, force = 0):
     url = getXMLDateArchive(t)
     print "loading %s" % (url)
     try:
-        doc = libxml2.htmlParseFile(url, None)
+        doc = libxml2.htmlParseFile(url, None);
     except:
         doc = None
     if doc == None:
@@ -1150,7 +1150,7 @@ def analyzeArchives(t = None, force = 0):
         refs = wordsDictArchive[word]
         if refs  == None:
             skipped = skipped + 1
-            continue
+            continue;
         for id in refs.keys():
             relevance = refs[id]
             updateWordArchive(word, id, relevance)
@@ -1170,7 +1170,7 @@ def analyzeHTMLTop():
         refs = wordsDictHTML[word]
         if refs  == None:
             skipped = skipped + 1
-            continue
+            continue;
         for resource in refs.keys():
             (relevance, id, section) = refs[resource]
             updateWordHTML(word, resource, section, id, relevance)
@@ -1199,7 +1199,7 @@ def analyzeAPITop():
         refs = wordsDict[word]
         if refs  == None:
             skipped = skipped + 1
-            continue
+            continue;
         for (module, symbol) in refs.keys():
             updateWord(word, symbol, refs[(module, symbol)])
             i = i + 1
@@ -1228,26 +1228,26 @@ def main():
             elif args[i] == '--archive':
                 analyzeArchives(None, force)
             elif args[i] == '--archive-year':
-                i = i + 1
+                i = i + 1;
                 year = args[i]
                 months = ["January" , "February", "March", "April", "May",
                           "June", "July", "August", "September", "October",
-                          "November", "December"]
+                          "November", "December"];
                 for month in months:
                     try:
                         str = "%s-%s" % (year, month)
                         T = time.strptime(str, "%Y-%B")
-                        t = time.mktime(T) + 3600 * 24 * 10
+                        t = time.mktime(T) + 3600 * 24 * 10;
                         analyzeArchives(t, force)
                     except:
                         print "Failed to index month archive:"
                         print sys.exc_type, sys.exc_value
             elif args[i] == '--archive-month':
-                i = i + 1
+                i = i + 1;
                 month = args[i]
                 try:
                     T = time.strptime(month, "%Y-%B")
-                    t = time.mktime(T) + 3600 * 24 * 10
+                    t = time.mktime(T) + 3600 * 24 * 10;
                     analyzeArchives(t, force)
                 except:
                     print "Failed to index month archive:"

docs/internals.html.in

@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html>
   <body>
     <h1>libvirt internals</h1>
 
@@ -11,106 +9,12 @@
     </p>
 
     <ul>
-      <li>Introduction to basic rules and guidelines for
-      <a href="hacking.html">hacking</a> on libvirt code</li>
+      <li>Introduction to basic rules and guidelines for <a href="hacking.html">hacking</a>
+            on libvirt code</li>
       <li>Guide to adding <a href="api_extension.html">public APIs</a></li>
-      <li>Approach for <a href="internals/command.html">spawning commands</a>
-      from libvirt driver code</li>
-      <li>The libvirt <a href="internals/rpc.html">RPC infrastructure</a></li>
-      <li>The <a href="internals/locking.html">Resource Lock Manager</a></li>
+      <li>Approach for <a href="internals/command.html">spawning commands</a> from
+        libvirt driver code</li>
     </ul>
 
-    <p>Before adding new code it will be important to get a basic understanding
-    of the many elements involved with making any call or change to the libvirt
-    code. The architecture <a href="goals.html">goals</a> must be adhered to
-    when submitting new code. Understanding the many places that need to be
-    touched and the interactions between various subsystems within libvirt
-    will directly correlate to the ability to be successful in getting new
-    code accepted.</p>
-    <p>The following diagram depicts code flow from a client application, in
-    this case the libvirt provided <code>virsh</code> command through the
-    various layers to elicit a response from some chosen hypervisor.
-    </p>
-
-    <p class="image">
-      <img alt="virConnectOpen calling sequence"
-           src="libvirt-virConnect-example.png"/>
-    </p>
-    <ul>
-        <li>"virsh -c qemu:///system list --all"
-        <p>After the virsh code processes the input arguments, it eventually
-        will make a call to open the connection using a default set of
-        authentication credentials (virConnectAuthDefault). </p></li>
-        <li>virConnectOpenAuth()
-        <p>Each of the virConnectOpen APIs will first call virInitialize() and
-        then revector through the local "do_open():" call.</p>
-          <ul>
-            <li>virInitialize()
-            <p>Calls the registration API for each of the drivers with
-            client-side only capabilities and then call the remoteRegister()
-            API last. This ensures the virDriverTab[] tries local drivers
-            first before using the remote driver.</p></li>
-            <li>Loop through virDriverTab[] entries trying to call their
-            respective "open" entry point (in our case remoteOpen())</li>
-            <li>After successful return from the virDriverTab[] open()
-            API, attempt to find and open other drivers (network, interface,
-            storage, etc.)</li>
-          </ul>
-        </li>
-        <li>remoteOpen()
-        <p>After a couple of URI checks, a call to doRemoteOpen() is made</p>
-          <ul>
-            <li>Determine network transport and host/port to use from URI
-            <p>The transport will be either tls, unix, ssh, libssh2, ext,
-            or tcp with the default of tls. Decode the host/port if provided
-            or default to "localhost".</p></li>
-            <li>virNetClientRegisterAsyncIO()
-            <p>Register an I/O callback mechanism to get returned data via
-            virNetClientIncomingEvent()</p></li>
-            <li>"call(...REMOTE_PROC_OPEN...)"
-            <p>Eventually routes into virNetClientProgramCall() which will
-            call virNetClientSendWithReply() and eventually uses
-            virNetClientIO()to send the message to libvirtd and
-            then waits for a response using virNetClientIOEventLoop()</p></li>
-            <li>virNetClientIncomingEvent()
-            <p>Receives the returned packet and processes through
-            virNetClientIOUpdateCallback()</p></li>
-          </ul>
-        </li>
-        <li>libvirtd Daemon
-        <p></p>
-          <ul>
-              <li>Daemon Startup
-              <p>The daemon initialization processing will declare itself
-              as a server via a virNetServerNew() call, then use
-              virDriverLoadModule() to find/load all known drivers,
-              set up an RPC server program using the <code>remoteProcs[]</code>
-              table via a virNetServerProgramNew() call. The table is the
-              corollary to the <code>remote_procedure</code> enum list in
-              the client. It lists all the functions to be called in
-              the same order. Once RPC is set up, networking server sockets
-              are opened, the various driver state initialization routines
-              are run from the <code>virStateDriverTab[]</code>, the network
-              links are enabled, and the daemon waits for work.</p></li>
-              <li>RPC
-              <p>When a message is received, the <code>remoteProcs[]</code>
-              table is referenced for the 'REMOTE_PROC_OPEN' call entry.
-              This results in remoteDispatchOpen() being called via the
-              virNetServerProgramDispatchCall().</p></li>
-              <li>remoteDispatchOpen()
-              <p>The API will read the argument passed picking out the
-              <code>name</code> of the driver to be opened. The code
-              will then call virConnectOpen() or virConnectOpenReadOnly()
-              depending on the argument <code>flags</code>.</p></li>
-              <li>virConnectOpen() or virConnectOpenReadOnly()
-              <p>Just like the client except that upon entry the URI
-              is what was passed from the client and will be found
-              and opened to process the data.</p>
-              <p>The returned structure data is returned via the
-              virNetServer interfaces to the remote driver which then
-              returns it to the client application.</p></li>
-          </ul>
-        </li>
-    </ul>
   </body>
 </html>

docs/internals/command.html.in

@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html>
   <body>
     <h1>Spawning processes / commands from libvirt drivers</h1>
 

docs/internals/locking.html.in

@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html>
   <body>
     <h1>Resource Lock Manager</h1>
 
@@ -152,7 +150,7 @@
     <h2><a name="usagePatterns">Lock usage patterns</a></h2>
 
     <p>
-      The following pseudo code illustrates the common
+      The following psuedo code illustrates the common
       patterns of operations invoked on the lock
       manager plugin callbacks.
     </p>
@@ -185,10 +183,6 @@
           .key = "pid",
           .value = { .i = dom->pid },
         },
-        { .type = VIR_LOCK_MANAGER_PARAM_TYPE_CSTRING,
-          .key = "uri",
-          .value = { .cstr = driver->uri },
-        },
       };
       mgr = virLockManagerNew(lockPlugin,
                               VIR_LOCK_MANAGER_TYPE_DOMAIN,
@@ -231,10 +225,6 @@
           .key = "pid",
           .value = { .i = dom->pid },
         },
-        { .type = VIR_LOCK_MANAGER_PARAM_TYPE_CSTRING,
-          .key = "uri",
-          .value = { .cstr = driver->uri },
-        },
       };
       mgr = virLockManagerNew(lockPlugin,
                               VIR_LOCK_MANAGER_TYPE_DOMAIN,

docs/internals/rpc.html.in

@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html>
   <body>
     <h1>libvirt RPC infrastructure</h1>
 
@@ -154,7 +152,6 @@
           <li>continue: for streams this indicates that further data packets
             will be following</li>
         </ol>
-      </dd>
     </dl>
 
     <h3><a href="protocolpayload">Packet payload</a></h3>
@@ -421,7 +418,7 @@
       After a complete packet has been read, the header must be decoded
       and all 6 fields fully validated, before attempting to dispatch
       the payload. Once dispatched, the payload can be decoded and passed
-      on to the appropriate API for execution. The RPC code must not take
+      onto the appropriate API for execution. The RPC code must not take
       any action based on the payload, since it has no way to validate
       the semantics of the payload data. It must delegate this to the
       execution API (e.g. corresponding libvirt public API).
@@ -788,7 +785,7 @@
       return value and output parameters, or error object and encode
       them into a reply packet. Again it does not attempt to do any
       semantic validation of output data, aside from variable length
-      field limit checks. The worker thread puts the reply packet on
+      field limit checks. The worker thread puts the reply packet onto
       the transmission queue for the client. The worker is now finished
       and goes back to wait for another incoming method call.
     </p>
@@ -814,10 +811,10 @@
       for the worker threads, it is sidetracked into a per-stream
       processing queue. When the stream becomes writable, queued
       incoming stream packets will be processed, passing their data
-      payload on the stream. Conversely when the stream becomes
+      payload onto the stream. Conversely when the stream becomes
       readable, chunks of data will be read from it, encoded into
       new outgoing packets, and placed on the client's transmit
-      queue.
+      queue
     </p>
 
     <h4><a name="apiserverdispatchex1">Example with overlapping methods</a></h4>

docs/intro.html.in

@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<?xml version="1.0"?>
+<html>
   <body>
     <h1>Architecture</h1>
     <p>Libvirt is a C toolkit manage the virtualization capabilities

docs/java.html.in

@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<?xml version="1.0"?>
+<html>
   <body>
     <h1>Java API bindings</h1>
 
@@ -158,15 +157,5 @@ from the C API, the only points to notice are:</p>
     various <span style="color: #E50073; background-color: #FFFFFF">methods</span>
     associated to the Domain class.</li>
     </ul>
-<h2>Maven</h2>
-  <p>Up until version 0.4.7 the Java bindings were available from the central maven repository.</p>
-  <p>If you want to use 0.4.8 or higher, please add the following repository to your pom.xml</p>
-  <pre>&lt;repositories&gt;
-  &lt;repository&gt;
-    &lt;id&gt;libvirt-org&lt;/id&gt;
-    &lt;url&gt;http://libvirt.org/maven2&lt;/url&gt;
-  &lt;/repository&gt;
-&lt;/repositories&gt;</pre>
-
   </body>
 </html>

docs/libvirt-virConnect-example.fig

@@ -1,58 +0,0 @@
-#FIG 3.2  Produced by xfig version 3.2.5b
-Landscape
-Center
-Inches
-Letter
-100.00
-Single
--2
-1200 2
-2 2 0 2 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
-	 450 375 4575 375 4575 1725 450 1725 450 375
-2 2 0 2 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
-	 1125 2475 4950 2475 4950 3600 1125 3600 1125 2475
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
-	1 0 1.00 60.00 120.00
-	 1725 1725 2175 2475
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
-	 3150 5700 6525 5700 6525 6900 3150 6900 3150 5700
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
-	 7875 6825 10125 6825 10125 7725 7875 7725 7875 6825
-2 2 0 2 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
-	 2550 4725 10350 4725 10350 7800 2550 7800 2550 4725
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 7 0 0 5
-	 8850 1950 11550 1950 11550 3360 8850 3360 8850 1950
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
-	1 0 1.00 60.00 120.00
-	 3975 3600 5025 4425
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
-	1 0 1.00 60.00 120.00
-	 8925 3225 5400 4425
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
-	1 0 1.00 60.00 120.00
-	 5625 6900 7875 7425
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 3
-	1 0 1.00 60.00 120.00
-	 11400 3375 11400 7575 10125 7575
-2 2 0 2 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
-	 8400 975 12450 975 12450 4125 8400 4125 8400 975
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 6
-	1 0 1.00 60.00 120.00
-	 10125 7125 10725 7125 10725 4425 7725 4425 7725 2700 8850 2700
-4 0 0 50 -1 16 12 0.0000 4 180 2430 1350 2895 virConnectOpenReadOnly(uri)\001
-4 0 0 50 -1 16 12 0.0000 4 180 3240 1350 3090 virConnectOpenAuth(uri, auth, flags)\001
-4 0 0 50 -1 0 12 0.0000 4 165 1350 3300 5850 virConnectOpen:\001
-4 0 0 50 -1 0 12 0.0000 4 165 2070 3300 6045 virConnectOpenReadOnly:\001
-4 0 0 50 -1 0 12 0.0000 4 165 1710 3300 6240 virConnectOpenAuth:\001
-4 0 0 50 -1 0 12 0.0000 4 180 900 3975 6600 do_open():\001
-4 0 0 50 -1 0 14 0.0000 4 135 1260 8025 7125 Rremote driver\001
-4 0 0 50 -1 16 24 0.0000 4 135 630 5025 4650 libvirt\001
-4 0 0 50 -1 0 14 0.0000 4 180 1890 9000 2175 remoteDispatchOpen():\001
-4 0 0 50 -1 0 12 0.0000 4 45 270 9300 2475 ...\001
-4 0 0 50 -1 0 12 0.0000 4 180 1440 9300 2670 virConnectOpen()\001
-4 0 0 50 -1 0 12 0.0000 4 180 2160 9300 2865 virConnectOpenReadOnly()\001
-4 0 0 50 -1 0 12 0.0000 4 45 270 9300 3060 ...\001
-4 0 0 50 -1 0 12 0.0000 4 180 1080 8250 7350 remoteOpen()\001
-4 0 0 50 -1 16 16 0.0000 4 165 3240 600 1050 "virsh -c qemu:///system list --all"\001
-4 0 0 50 -1 16 12 0.0000 4 180 1710 1350 2700 virConnectOpen(uri)\001
-4 0 0 50 -1 16 24 0.0000 4 135 720 9750 825 libvirtd\001

docs/libvirt.css

@@ -184,25 +184,23 @@ div.api {
     border: 1px solid #999999;
     background: #eeeeee;
     color: black;
-    padding: 3px;
 }
 
 div.api pre {
     margin: 0px;
     border: 0px;
     background: inherit;
-    padding: inherit;
 }
 
 div.api table {
     margin: 0px;
     padding-left: 2em;
-    border-spacing: 0px;
+    font-family: fixed;
+    whitespace: pre;
 }
 
 div.api table td, div.variablelist table td {
     vertical-align: top;
-    padding-left: 1em;
 }
 
 
@@ -414,66 +412,3 @@ table.data tbody td.n {
     background: rgb(255,220,220);
     text-align: center;
 }
-
-.api {
-    font-family: monospace;
-}
-
-.api .type {
-    font-weight: bold;
-    white-space: nowrap;
-    color: darkslateblue;
-}
-
-.api .keyword {
-    font-weight: bold;
-    color: #A2F;
-}
-
-.api .comment {
-    color: #080;
-    margin-left: 2em;
-    position: relative;
-}
-
-.api .comment:before {
-    content: ": ";
-    position: absolute;
-    left: -1.3em;
-}
-
-.api .undisclosed {
-    font-style: italic;
-    letter-spacing: .3ex;
-    font-weight: bolder;
-    text-transform: uppercase;
-    margin-left: 2em;
-}
-
-.api .directive {
-    color: teal;
-}
-
-.api :link:hover, .api :link:focus {
-    color: blue;
-    border-color: blue;
-}
-
-.api :link {
-    text-decoration: none;
-}
-
-dl.variablelist > dt {
-    display: block;
-    float: left;
-    font-style: italic;
-    font-weight: inherit;
-}
-
-.variablelist dd {
-    padding-left: 10em;
-}
-
-dl.variablelist > dt:after {
-    content: ": ";
-}

docs/locking.html.in

@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<?xml version="1.0"?>
+<html>
   <body>
     <h1>Virtual machine disk locking</h1>
 
@@ -121,28 +120,6 @@
       # mount /var/lib/libvirt/sanlock
     </pre>
 
-    <p>
-      If your sanlock daemon happen to run under non-root
-      privileges, you need to tell this to libvirt so it
-      chowns created files correctly. This can be done by
-      setting <code>user</code> and/or <code>group</code>
-      variables in the configuration file. Accepted values
-      range is specified in description to the same
-      variables in <code>/etc/libvirt/qemu.conf</code>. For
-      example:
-    </p>
-
-    <pre>
-      augtool -s set /files/etc/libvirt/qemu-sanlock.conf/user sanlock
-      augtool -s set /files/etc/libvirt/qemu-sanlock.conf/group sanlock
-    </pre>
-
-    <p>
-      But remember, that if this is NFS share, you need a
-      no_root_squash-ed one for chown (and chmod possibly)
-      to succeed.
-    </p>
-
     <p>
       In terms of storage requirements, if the filesystem
       uses 512 byte sectors, you need to allow for <code>1MB</code>
@@ -231,29 +208,5 @@
 &lt;/pool&gt;
     </pre>
 
-    <h2><a name="domainconfig">Domain configuration</a></h2>
-
-    <p>
-      In case sanlock loses access to disk locks for some reason, it will
-      kill all domains that lost their locks. This default behavior may
-      be changed using
-      <a href="formatdomain.html#elementsEvents">on_lockfailure
-      element</a> in domain XML. When this element is present, sanlock
-      will call <code>sanlock_helper</code> (provided by libvirt) with
-      the specified action. This helper binary will connect to libvirtd
-      and thus it may need to authenticate if libvirtd was configured to
-      require that on the read-write UNIX socket. To provide the
-      appropriate credentials to sanlock_helper, a
-      <a href="auth.html#Auth_client_config">client authentication
-      file</a> needs to contain something like the following:
-    </p>
-    <pre>
-[auth-libvirt-localhost]
-credentials=sanlock
-
-[credentials-sanlock]
-authname=login
-password=password
-    </pre>
   </body>
 </html>

docs/logging.html.in

@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<?xml version="1.0"?>
+<html>
   <body>
     <h1 >Logging in the library and the daemon</h1>
     <p>Libvirt includes logging facilities starting from version 0.6.0,

docs/migration.html.in

@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html>
   <body>
     <h1>Guest migration</h1>
 
@@ -32,7 +30,7 @@
     </p>
 
     <p>
-      <img class="diagram" src="migration-native.png" alt="Migration native path"/>
+      <img class="diagram" src="migration-native.png" alt="Migration native path">
     </p>
 
     <h3><a name="transporttunnel">libvirt tunnelled transport</a></h3>
@@ -50,7 +48,7 @@
     </p>
 
     <p>
-      <img class="diagram" src="migration-tunnel.png" alt="Migration tunnel path"/>
+      <img class="diagram" src="migration-tunnel.png" alt="Migration tunnel path">
     </p>
 
     <h2><a name="flow">Communication control paths/flows</a></h2>
@@ -77,7 +75,7 @@
     </p>
 
     <p>
-      <img class="diagram" src="migration-managed-direct.png" alt="Migration direct, managed"/>
+      <img class="diagram" src="migration-managed-direct.png" alt="Migration direct, managed">
     </p>
 
 
@@ -99,7 +97,7 @@
     </p>
 
     <p>
-      <img class="diagram" src="migration-managed-p2p.png" alt="Migration peer-to-peer"/>
+      <img class="diagram" src="migration-managed-p2p.png" alt="Migration peer-to-peer">
     </p>
 
 
@@ -115,7 +113,7 @@
     </p>
 
     <p>
-      <img class="diagram" src="migration-unmanaged-direct.png" alt="Migration direct, unmanaged"/>
+      <img class="diagram" src="migration-unmanaged-direct.png" alt="Migration direct, unmanaged">
     </p>
 
 
@@ -138,20 +136,6 @@
       facility should be used.
     </p>
 
-    <h2><a name="offline">Offline migration</a></h2>
-
-    <p>
-      Offline migration transfers inactive the definition of a domain
-      (which may or may not be active). After successful completion, the
-      domain remains in its current state on the source host and is defined
-      but inactive on the destination host. It's a bit more clever than
-      <code>virsh dumpxml</code> on source host followed by
-      <code>virsh define</code> on destination host, as offline migration
-      will run the pre-migration hook to update the domain XML on
-      destination host. Currently, copying non-shared storage is not
-      supported during offline migration.
-    </p>
-
     <h2><a name="uris">Migration URIs</a></h2>
 
     <p>
@@ -194,12 +178,12 @@
         should specify the hypervisor specific URI, using an IP address
         associated with the network to be used.</li>
       <li>The firewall restricts what ports are available. When libvirt
-        generates a migration URI it will pick a port number using hypervisor
+        generates a migration URI will pick a port number using hypervisor
         specific rules. Some hypervisors only require a single port to be
         open in the firewalls, while others require a whole range of port
         numbers. In the latter case the management application may wish
         to choose a specific port number outside the default range in order
-        to comply with local firewall policies.</li>
+        to comply with local firewall policies</li>
     </ol>
 
     <h2><a name="config">Configuration file handling</a></h2>

docs/newapi.xsl

@@ -6,8 +6,6 @@
   Daniel Veillard
 -->
 <xsl:stylesheet version="1.0"
-  xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:html="http://www.w3.org/1999/xhtml"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:exsl="http://exslt.org/common"
   xmlns:str="http://exslt.org/strings"
@@ -85,51 +83,17 @@
     </xsl:for-each>
   </xsl:template>
 
-  <xsl:template name="formattext">
-    <xsl:param name="text" />
-
-    <xsl:if test="$text">
-      <xsl:variable name="head" select="substring-before($text, '&#xA;&#xA;')"/>
-      <xsl:variable name="rest" select="substring-after($text, '&#xA;&#xA;')"/>
-
-      <xsl:choose>
-        <xsl:when test="$head">
-          <p>
-            <xsl:call-template name="dumptext">
-              <xsl:with-param name="text" select="$head"/>
-            </xsl:call-template>
-          </p>
-        </xsl:when>
-        <xsl:when test="not($rest)">
-          <p>
-            <xsl:call-template name="dumptext">
-              <xsl:with-param name="text" select="$text"/>
-            </xsl:call-template>
-          </p>
-        </xsl:when>
-      </xsl:choose>
-
-      <xsl:if test="$rest">
-        <xsl:call-template name="formattext">
-          <xsl:with-param name="text" select="$rest"/>
-        </xsl:call-template>
-      </xsl:if>
-    </xsl:if>
-  </xsl:template>
-
   <xsl:template match="macro" mode="toc">
-    <span class="directive">#define</span><xsl:text> </xsl:text>
+    <xsl:text>#define </xsl:text>
     <a href="#{@name}"><xsl:value-of select="@name"/></a>
     <xsl:text>
 </xsl:text>
   </xsl:template>
 
   <xsl:template match="variable" mode="toc">
-    <span class="type">
-      <xsl:call-template name="dumptext">
-        <xsl:with-param name="text" select="string(@type)"/>
-      </xsl:call-template>
-    </span>
+    <xsl:call-template name="dumptext">
+      <xsl:with-param name="text" select="string(@type)"/>
+    </xsl:call-template>
     <xsl:text> </xsl:text>
     <a name="{@name}"></a>
     <xsl:value-of select="@name"/>
@@ -138,21 +102,18 @@
   </xsl:template>
 
   <xsl:template match="typedef" mode="toc">
-    <span class="keyword">typedef</span>
-    <xsl:text> </xsl:text><xsl:variable name="name" select="string(@name)"/>
+    <xsl:text>typedef </xsl:text><xsl:variable name="name" select="string(@name)"/>
     <xsl:choose>
       <xsl:when test="@type = 'enum'">
-        <span class="keyword">enum</span><xsl:text> </xsl:text>
+        <xsl:text>enum </xsl:text>
 	<a href="#{$name}"><xsl:value-of select="$name"/></a>
 	<xsl:text>
 </xsl:text>
       </xsl:when>
       <xsl:otherwise>
-	<span class="type">
-          <xsl:call-template name="dumptext">
-            <xsl:with-param name="text" select="@type"/>
-          </xsl:call-template>
-        </span>
+	<xsl:call-template name="dumptext">
+	  <xsl:with-param name="text" select="@type"/>
+	</xsl:call-template>
 	<xsl:text> </xsl:text>
 	<a name="{$name}"><xsl:value-of select="$name"/></a>
 	<xsl:text>
@@ -166,7 +127,7 @@
     <h3><a name="{$name}"><code><xsl:value-of select="$name"/></code></a></h3>
     <div class="api">
       <pre>
-        <span class="keyword">enum</span><xsl:text> </xsl:text>
+        <xsl:text>enum </xsl:text>
         <xsl:value-of select="$name"/>
         <xsl:text> {
 </xsl:text>
@@ -180,11 +141,10 @@
             <td><xsl:value-of select="@value"/></td>
             <xsl:if test="@info != ''">
               <td>
-                <div class="comment">
-                  <xsl:call-template name="dumptext">
-                    <xsl:with-param name="text" select="@info"/>
-                  </xsl:call-template>
-                </div>
+                <xsl:text> : </xsl:text>
+                <xsl:call-template name="dumptext">
+                  <xsl:with-param name="text" select="@info"/>
+                </xsl:call-template>
               </td>
             </xsl:if>
           </tr>
@@ -198,8 +158,8 @@
   </xsl:template>
 
   <xsl:template match="struct" mode="toc">
-    <span class="keyword">typedef</span><xsl:text> </xsl:text>
-    <span class="type"><xsl:value-of select="@type"/></span>
+    <xsl:text>typedef </xsl:text>
+    <xsl:value-of select="@type"/>
     <xsl:text> </xsl:text>
     <a href="#{@name}"><xsl:value-of select="@name"/></a>
     <xsl:text>
@@ -210,83 +170,78 @@
     <h3><a name="{@name}"><code><xsl:value-of select="@name"/></code></a></h3>
     <div class="api">
       <pre>
-        <span class="keyword">struct </span>
+        <xsl:text>struct </xsl:text>
         <xsl:value-of select="@name"/>
-        <xsl:text> {
+        <xsl:text>{
 </xsl:text>
       </pre>
-      <xsl:if test="field">
-        <table>
-          <xsl:for-each select="field">
-            <xsl:choose>
-              <xsl:when test='@type = "union"'>
-                <tr><td><span class="keyword">union</span> {</td></tr>
-                <tr>
-                  <td><table>
-                    <xsl:for-each select="union/field">
-                      <tr>
-                        <td>
-                          <span class="type">
-                            <xsl:call-template name="dumptext">
-                              <xsl:with-param name="text" select="@type"/>
-                            </xsl:call-template>
-                          </span>
-                        </td>
-                        <td><xsl:value-of select="@name"/></td>
-                        <xsl:if test="@info != ''">
-                          <td>
-                            <div class="comment">
-                              <xsl:call-template name="dumptext">
-                                <xsl:with-param name="text" select="@info"/>
-                              </xsl:call-template>
-                            </div>
-                          </td>
-                        </xsl:if>
-                      </tr>
-                    </xsl:for-each>
-                  </table></td>
-                <td></td></tr>
-                <tr><td>}</td>
-                <td><xsl:value-of select="@name"/></td>
-                <xsl:if test="@info != ''">
-                  <td>
-                    <div class="comment">
-                      <xsl:call-template name="dumptext">
-                        <xsl:with-param name="text" select="@info"/>
-                      </xsl:call-template>
-                    </div>
-                  </td>
-                </xsl:if>
-                <td></td></tr>
-              </xsl:when>
-              <xsl:otherwise>
+      <table>
+        <xsl:for-each select="field">
+          <xsl:choose>
+            <xsl:when test='@type = "union"'>
+              <tr><td>union {</td></tr>
+              <tr>
+              <td><table>
+              <xsl:for-each select="union/field">
                 <tr>
                   <td>
-                    <span class="type">
-                      <xsl:call-template name="dumptext">
-                        <xsl:with-param name="text" select="@type"/>
-                      </xsl:call-template>
-                    </span>
+                    <xsl:call-template name="dumptext">
+                      <xsl:with-param name="text" select="@type"/>
+                    </xsl:call-template>
                   </td>
                   <td><xsl:value-of select="@name"/></td>
                   <xsl:if test="@info != ''">
                     <td>
-                      <div class="comment">
-                        <xsl:call-template name="dumptext">
+                      <xsl:text> : </xsl:text>
+                      <xsl:call-template name="dumptext">
                         <xsl:with-param name="text" select="@info"/>
-                        </xsl:call-template>
-                      </div>
+                      </xsl:call-template>
                     </td>
                   </xsl:if>
                 </tr>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:for-each>
-        </table>
-      </xsl:if>
-      <xsl:if test="not(field)">
-        <div class="undisclosed">The content of this structure is not made public by the API</div>
-      </xsl:if>
+              </xsl:for-each>
+              </table></td>
+              <td></td></tr>
+              <tr><td>}</td>
+              <td><xsl:value-of select="@name"/></td>
+                <xsl:if test="@info != ''">
+                  <td>
+                    <xsl:text> : </xsl:text>
+                    <xsl:call-template name="dumptext">
+                      <xsl:with-param name="text" select="@info"/>
+                    </xsl:call-template>
+                  </td>
+                </xsl:if>
+              <td></td></tr>
+            </xsl:when>
+            <xsl:otherwise>
+              <tr>
+                <td>
+                  <xsl:call-template name="dumptext">
+                    <xsl:with-param name="text" select="@type"/>
+                  </xsl:call-template>
+                </td>
+                <td><xsl:value-of select="@name"/></td>
+                <xsl:if test="@info != ''">
+                  <td>
+                    <xsl:text> : </xsl:text>
+                    <xsl:call-template name="dumptext">
+                      <xsl:with-param name="text" select="@info"/>
+                    </xsl:call-template>
+                  </td>
+                </xsl:if>
+              </tr>
+            </xsl:otherwise>
+          </xsl:choose>
+        </xsl:for-each>
+        <xsl:if test="not(field)">
+          <tr>
+            <td colspan="3">
+              <xsl:text>The content of this structure is not made public by the API</xsl:text>
+            </td>
+          </tr>
+        </xsl:if>
+      </table>
       <pre>
         <xsl:text>
 }
@@ -298,12 +253,12 @@
   <xsl:template match="macro">
     <xsl:variable name="name" select="string(@name)"/>
     <h3><a name="{$name}"><code><xsl:value-of select="$name"/></code></a></h3>
-    <pre class="api"><span class="directive">#define</span><xsl:text> </xsl:text><xsl:value-of select="$name"/></pre>
-    <div>
-    <xsl:call-template name="formattext">
+    <pre><xsl:text>#define </xsl:text><xsl:value-of select="$name"/></pre>
+    <p>
+    <xsl:call-template name="dumptext">
       <xsl:with-param name="text" select="info"/>
     </xsl:call-template>
-    </div><xsl:text>
+    </p><xsl:text>
 </xsl:text>
   </xsl:template>
 
@@ -312,11 +267,9 @@
     <xsl:variable name="nlen" select="string-length($name)"/>
     <xsl:variable name="tlen" select="string-length(return/@type)"/>
     <xsl:variable name="blen" select="(($nlen + 8) - (($nlen + 8) mod 8)) + (($tlen + 8) - (($tlen + 8) mod 8))"/>
-    <span class="type">
-      <xsl:call-template name="dumptext">
-        <xsl:with-param name="text" select="return/@type"/>
-      </xsl:call-template>
-    </span>
+    <xsl:call-template name="dumptext">
+      <xsl:with-param name="text" select="return/@type"/>
+    </xsl:call-template>
     <xsl:text>&#9;</xsl:text>
     <a href="#{@name}"><xsl:value-of select="@name"/></a>
     <xsl:if test="$blen - 40 &lt; -8">
@@ -327,14 +280,12 @@
     </xsl:if>
     <xsl:text>&#9;(</xsl:text>
     <xsl:if test="not(arg)">
-      <span class="type">void</span>
+      <xsl:text>void</xsl:text>
     </xsl:if>
     <xsl:for-each select="arg">
-      <span class="type">
-        <xsl:call-template name="dumptext">
-          <xsl:with-param name="text" select="@type"/>
-        </xsl:call-template>
-      </span>
+      <xsl:call-template name="dumptext">
+        <xsl:with-param name="text" select="@type"/>
+      </xsl:call-template>
       <xsl:text> </xsl:text>
       <xsl:value-of select="@name"/>
       <xsl:if test="position() != last()">
@@ -357,15 +308,13 @@
     <xsl:variable name="nlen" select="string-length($name)"/>
     <xsl:variable name="tlen" select="string-length(return/@type)"/>
     <xsl:variable name="blen" select="(($nlen + 8) - (($nlen + 8) mod 8)) + (($tlen + 8) - (($tlen + 8) mod 8))"/>
-    <span class="keyword">typedef</span><xsl:text> </xsl:text>
+    <xsl:text>typedef </xsl:text>
     <a href="#{$name}"><xsl:value-of select="$name"/></a>
     <xsl:text>
 </xsl:text>
-    <span class="type">
-      <xsl:call-template name="dumptext">
-        <xsl:with-param name="text" select="return/@type"/>
-      </xsl:call-template>
-    </span>
+    <xsl:call-template name="dumptext">
+      <xsl:with-param name="text" select="return/@type"/>
+    </xsl:call-template>
     <xsl:text>&#9;</xsl:text>
     <a href="#{$name}"><xsl:value-of select="$name"/></a>
     <xsl:if test="$blen - 40 &lt; -8">
@@ -376,14 +325,12 @@
     </xsl:if>
     <xsl:text>&#9;(</xsl:text>
     <xsl:if test="not(arg)">
-      <span class="type">void</span>
+      <xsl:text>void</xsl:text>
     </xsl:if>
     <xsl:for-each select="arg">
-      <span class="type">
-        <xsl:call-template name="dumptext">
-          <xsl:with-param name="text" select="@type"/>
-        </xsl:call-template>
-      </span>
+      <xsl:call-template name="dumptext">
+        <xsl:with-param name="text" select="@type"/>
+      </xsl:call-template>
       <xsl:text> </xsl:text>
       <xsl:value-of select="@name"/>
       <xsl:if test="position() != last()">
@@ -409,13 +356,11 @@
     <xsl:variable name="tlen" select="string-length(return/@type)"/>
     <xsl:variable name="blen" select="(($nlen + 8) - (($nlen + 8) mod 8)) + (($tlen + 8) - (($tlen + 8) mod 8))"/>
     <h3><a name="{$name}"><code><xsl:value-of select="$name"/></code></a></h3>
-    <pre class="api">
-    <span class="keyword">typedef</span><xsl:text> </xsl:text>
-    <span class="type">
-      <xsl:call-template name="dumptext">
-        <xsl:with-param name="text" select="return/@type"/>
-      </xsl:call-template>
-    </span>
+    <pre class="programlisting">
+    <xsl:text>typedef </xsl:text>
+    <xsl:call-template name="dumptext">
+      <xsl:with-param name="text" select="return/@type"/>
+    </xsl:call-template>
     <xsl:text>&#9;(*</xsl:text>
     <xsl:value-of select="@name"/>
     <xsl:if test="$blen - 40 &lt; -8">
@@ -426,19 +371,16 @@
     </xsl:if>
     <xsl:text>)&#9;(</xsl:text>
     <xsl:if test="not(arg)">
-      <span class="type">void</span>
+      <xsl:text>void</xsl:text>
     </xsl:if>
     <xsl:for-each select="arg">
-      <span class="type">
-        <xsl:call-template name="dumptext">
-          <xsl:with-param name="text" select="@type"/>
-        </xsl:call-template>
-      </span>
+      <xsl:call-template name="dumptext">
+        <xsl:with-param name="text" select="@type"/>
+      </xsl:call-template>
       <xsl:text> </xsl:text>
       <xsl:value-of select="@name"/>
       <xsl:if test="position() != last()">
-        <xsl:text>,
-</xsl:text>
+        <xsl:text>, </xsl:text><br/>
 	<xsl:if test="$blen - 40 &gt; 8">
 	  <xsl:text>&#9;</xsl:text>
 	</xsl:if>
@@ -451,30 +393,34 @@
     <xsl:text>)
 </xsl:text>
     </pre>
-    <div>
-    <xsl:call-template name="formattext">
+    <p>
+    <xsl:call-template name="dumptext">
       <xsl:with-param name="text" select="info"/>
     </xsl:call-template>
-    </div>
+    </p>
     <xsl:if test="arg | return">
-      <dl class="variablelist">
+      <div class="variablelist"><table border="0"><col align="left"/><tbody>
       <xsl:for-each select="arg">
-        <dt><xsl:value-of select="@name"/></dt>
-        <dd>
-          <xsl:call-template name="dumptext">
+        <tr>
+          <td><span class="term"><i><tt><xsl:value-of select="@name"/></tt></i>:</span></td>
+	  <td>
+	    <xsl:call-template name="dumptext">
 	      <xsl:with-param name="text" select="@info"/>
 	    </xsl:call-template>
-        </dd>
+	  </td>
+        </tr>
       </xsl:for-each>
       <xsl:if test="return/@info">
-        <dt>Returns</dt>
-        <dd>
-          <xsl:call-template name="dumptext">
-            <xsl:with-param name="text" select="return/@info"/>
-          </xsl:call-template>
-        </dd>
+        <tr>
+          <td><span class="term"><i><tt>Returns</tt></i>:</span></td>
+	  <td>
+	    <xsl:call-template name="dumptext">
+	      <xsl:with-param name="text" select="return/@info"/>
+	    </xsl:call-template>
+	  </td>
+        </tr>
       </xsl:if>
-      </dl>
+      </tbody></table></div>
     </xsl:if>
     <br/>
     <xsl:text>
@@ -487,12 +433,10 @@
     <xsl:variable name="tlen" select="string-length(return/@type)"/>
     <xsl:variable name="blen" select="(($nlen + 8) - (($nlen + 8) mod 8)) + (($tlen + 8) - (($tlen + 8) mod 8))"/>
     <h3><a name="{$name}"><code><xsl:value-of select="$name"/></code></a></h3>
-    <pre class="api">
-    <span class="type">
-      <xsl:call-template name="dumptext">
-        <xsl:with-param name="text" select="return/@type"/>
-      </xsl:call-template>
-    </span>
+    <pre class="programlisting">
+    <xsl:call-template name="dumptext">
+      <xsl:with-param name="text" select="return/@type"/>
+    </xsl:call-template>
     <xsl:text>&#9;</xsl:text>
     <xsl:value-of select="@name"/>
     <xsl:if test="$blen - 40 &lt; -8">
@@ -503,19 +447,16 @@
     </xsl:if>
     <xsl:text>&#9;(</xsl:text>
     <xsl:if test="not(arg)">
-      <span class="type">void</span>
+      <xsl:text>void</xsl:text>
     </xsl:if>
     <xsl:for-each select="arg">
-      <span class="type">
-        <xsl:call-template name="dumptext">
-          <xsl:with-param name="text" select="@type"/>
-        </xsl:call-template>
-      </span>
+      <xsl:call-template name="dumptext">
+        <xsl:with-param name="text" select="@type"/>
+      </xsl:call-template>
       <xsl:text> </xsl:text>
       <xsl:value-of select="@name"/>
       <xsl:if test="position() != last()">
-        <xsl:text>,
-</xsl:text>
+        <xsl:text>, </xsl:text><br/>
 	<xsl:if test="$blen - 40 &gt; 8">
 	  <xsl:text>&#9;</xsl:text>
 	</xsl:if>
@@ -525,33 +466,39 @@
 	<xsl:text>&#9;&#9;&#9;&#9;&#9; </xsl:text>
       </xsl:if>
     </xsl:for-each>
-    <xsl:text>)</xsl:text>
+    <xsl:text>)</xsl:text><br/>
+    <xsl:text>
+</xsl:text>
     </pre>
-    <div>
-    <xsl:call-template name="formattext">
+    <p>
+    <xsl:call-template name="dumptext">
       <xsl:with-param name="text" select="info"/>
     </xsl:call-template>
-    </div><xsl:text>
+    </p><xsl:text>
 </xsl:text>
     <xsl:if test="arg | return/@info">
-      <dl class="variablelist">
-        <xsl:for-each select="arg">
-          <dt><xsl:value-of select="@name"/></dt>
-          <dd>
-            <xsl:call-template name="dumptext">
-              <xsl:with-param name="text" select="@info"/>
-            </xsl:call-template>
-          </dd>
-        </xsl:for-each>
-        <xsl:if test="return/@info">
-          <dt>Returns</dt>
-          <dd>
+      <div class="variablelist"><table border="0"><col align="left"/><tbody>
+      <xsl:for-each select="arg">
+        <tr>
+          <td><span class="term"><i><tt><xsl:value-of select="@name"/></tt></i>:</span></td>
+	  <td>
+	    <xsl:call-template name="dumptext">
+	      <xsl:with-param name="text" select="@info"/>
+	    </xsl:call-template>
+	  </td>
+        </tr>
+      </xsl:for-each>
+      <xsl:if test="return/@info">
+        <tr>
+          <td><span class="term"><i><tt>Returns</tt></i>:</span></td>
+	  <td>
 	    <xsl:call-template name="dumptext">
 	      <xsl:with-param name="text" select="return/@info"/>
 	    </xsl:call-template>
-          </dd>
-        </xsl:if>
-      </dl>
+	  </td>
+        </tr>
+      </xsl:if>
+      </tbody></table></div>
     </xsl:if>
   </xsl:template>
 
@@ -600,20 +547,20 @@
         <h2>Table of Contents</h2>
         <xsl:if test="count(exports[@type='macro']) > 0">
           <h3><a href="#macros">Macros</a></h3>
-          <pre class="api">
+          <pre>
             <xsl:apply-templates select="exports[@type='macro']" mode="toc">
               <xsl:sort select='@symbol'/>
             </xsl:apply-templates>
           </pre>
         </xsl:if>
         <h3><a href="#types">Types</a></h3>
-        <pre class="api">
+        <pre>
           <xsl:apply-templates select="exports[@type='typedef']" mode="toc">
             <xsl:sort select='@symbol'/>
           </xsl:apply-templates>
         </pre>
         <h3><a href="#functions">Functions</a></h3>
-        <pre class="api">
+        <pre>
           <xsl:apply-templates select="exports[@type='function']" mode="toc">
             <xsl:sort select='@symbol'/>
           </xsl:apply-templates>

docs/page.xsl

@@ -1,16 +1,14 @@
 <?xml version="1.0"?>
 <xsl:stylesheet
-  xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:html="http://www.w3.org/1999/xhtml"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:exsl="http://exslt.org/common"
-  exclude-result-prefixes="xsl exsl html"
+  exclude-result-prefixes="xsl exsl"
   version="1.0">
 
   <!-- The sitemap.html.in page contains the master navigation structure -->
-  <xsl:variable name="sitemap" select="document('sitemap.html.in')/html:html/html:body/html:div[@id='sitemap']"/>
+  <xsl:variable name="sitemap" select="document('sitemap.html.in')/html/body/div[@id='sitemap']"/>
 
-  <xsl:template match="html:code[@class='docref']" mode="content">
+  <xsl:template match="code[@class='docref']" mode="content">
     <xsl:variable name="name"><xsl:value-of select="."/></xsl:variable>
     <a href="html/libvirt-libvirt.html#{$name}"><code><xsl:value-of select="$name"/></code></a>
   </xsl:template>
@@ -22,17 +20,17 @@
   </xsl:template>
 
 
-  <xsl:template match="html:ul[@id='toc']" mode="content">
+  <xsl:template match="ul[@id='toc']" mode="content">
     <xsl:call-template name="toc"/>
   </xsl:template>
 
   <!-- This processes the sitemap to form a context sensitive
        navigation menu for the current page -->
-  <xsl:template match="html:ul" mode="menu">
+  <xsl:template match="ul" mode="menu">
     <xsl:param name="pagename"/>
     <xsl:param name="level"/>
     <ul class="{concat('l', $level)}">
-      <xsl:for-each select="html:li">
+      <xsl:for-each select="li">
         <!-- The extra div tag here works around an IE6 whitespace collapsing problem -->
         <li><div>
           <!-- A menu is active if there is an 'a' tag with
@@ -40,7 +38,7 @@
                or a child menu -->
           <xsl:variable name="class">
             <xsl:choose>
-              <xsl:when test="count(.//html:a[@href = $pagename]) > 0">
+              <xsl:when test="count(.//a[@href = $pagename]) > 0">
                 <xsl:text>active</xsl:text>
               </xsl:when>
               <xsl:otherwise>
@@ -53,21 +51,21 @@
                the immediate 'a' tag has href matching the
                current pagename -->
           <xsl:choose>
-            <xsl:when test="$pagename = html:a/@href">
-              <span class="{$class}"><xsl:value-of select="html:a"/></span>
+            <xsl:when test="$pagename = a/@href">
+              <span class="{$class}"><xsl:value-of select="a"/></span>
             </xsl:when>
-            <xsl:when test="starts-with(html:a/@href, 'http://wiki.libvirt.org')">
-              <a title="{./html:span}" class="{$class}" href="{html:a/@href}"><xsl:value-of select="html:a"/></a>
+            <xsl:when test="starts-with(a/@href, 'http://wiki.libvirt.org')">
+              <a title="{./span}" class="{$class}" href="{a/@href}"><xsl:value-of select="a"/></a>
             </xsl:when>
             <xsl:otherwise>
-              <a title="{./html:span}" class="{$class}" href="{concat($href_base, html:a/@href)}"><xsl:value-of select="html:a"/></a>
+              <a title="{./span}" class="{$class}" href="{concat($href_base, a/@href)}"><xsl:value-of select="a"/></a>
             </xsl:otherwise>
           </xsl:choose>
 
           <!-- A sub-menu should only be expanded it contains
                an 'a' tag with href matching this pagename -->
-          <xsl:if test="count(.//html:a[@href = $pagename]) > 0">
-            <xsl:apply-templates select="html:ul" mode="menu">
+          <xsl:if test="count(.//a[@href = $pagename]) > 0">
+            <xsl:apply-templates select="ul" mode="menu">
               <xsl:with-param name="pagename" select="$pagename"/>
               <xsl:with-param name="level" select="$level + 1"/>
             </xsl:apply-templates>
@@ -79,33 +77,33 @@
 
   <xsl:template name="toc">
     <ul>
-      <xsl:for-each select="/html:html/html:body/html:h2[count(html:a) = 1]">
+      <xsl:for-each select="/html/body/h2[count(a) = 1]">
         <xsl:variable name="thish2" select="."/>
         <li>
-          <a href="#{html:a/@name}"><xsl:value-of select="html:a/text()"/></a>
-          <xsl:if test="count(./following-sibling::html:h3[preceding-sibling::html:h2[1] = $thish2 and count(html:a) = 1]) > 0">
+          <a href="#{a/@name}"><xsl:value-of select="a/text()"/></a>
+          <xsl:if test="count(./following-sibling::h3[preceding-sibling::h2[1] = $thish2 and count(a) = 1]) > 0">
             <ul>
-              <xsl:for-each select="./following-sibling::html:h3[preceding-sibling::html:h2[1] = $thish2 and count(html:a) = 1]">
+              <xsl:for-each select="./following-sibling::h3[preceding-sibling::h2[1] = $thish2 and count(a) = 1]">
                 <xsl:variable name="thish3" select="."/>
                 <li>
-                  <a href="#{html:a/@name}"><xsl:value-of select="html:a/text()"/></a>
-                  <xsl:if test="count(./following-sibling::html:h4[preceding-sibling::html:h3[1] = $thish3 and count(html:a) = 1]) > 0">
+                  <a href="#{a/@name}"><xsl:value-of select="a/text()"/></a>
+                  <xsl:if test="count(./following-sibling::h4[preceding-sibling::h3[1] = $thish3 and count(a) = 1]) > 0">
                     <ul>
-                      <xsl:for-each select="./following-sibling::html:h4[preceding-sibling::html:h3[1] = $thish3 and count(html:a) = 1]">
+                      <xsl:for-each select="./following-sibling::h4[preceding-sibling::h3[1] = $thish3 and count(a) = 1]">
                         <xsl:variable name="thish4" select="."/>
                         <li>
-                          <a href="#{html:a/@name}"><xsl:value-of select="html:a/text()"/></a>
-                          <xsl:if test="count(./following-sibling::html:h5[preceding-sibling::html:h4[1] = $thish4 and count(html:a) = 1]) > 0">
+                          <a href="#{a/@name}"><xsl:value-of select="a/text()"/></a>
+                          <xsl:if test="count(./following-sibling::h5[preceding-sibling::h4[1] = $thish4 and count(a) = 1]) > 0">
                             <ul>
-                              <xsl:for-each select="./following-sibling::html:h5[preceding-sibling::html:h4[1] = $thish4 and count(html:a) = 1]">
+                              <xsl:for-each select="./following-sibling::h5[preceding-sibling::h4[1] = $thish4 and count(a) = 1]">
                                 <xsl:variable name="thish5" select="."/>
                                 <li>
-                                  <a href="#{html:a/@name}"><xsl:value-of select="html:a/text()"/></a>
-                                  <xsl:if test="count(./following-sibling::html:h6[preceding-sibling::html:h5[1] = $thish5 and count(html:a) = 1]) > 0">
+                                  <a href="#{a/@name}"><xsl:value-of select="a/text()"/></a>
+                                  <xsl:if test="count(./following-sibling::h6[preceding-sibling::h5[1] = $thish5 and count(a) = 1]) > 0">
                                     <ul>
-                                      <xsl:for-each select="./following-sibling::html:h6[preceding-sibling::html:h5[1] = $thish5 and count(html:a) = 1]">
+                                      <xsl:for-each select="./following-sibling::h6[preceding-sibling::h5[1] = $thish5 and count(a) = 1]">
                                         <li>
-                                          <a href="#{html:a/@name}"><xsl:value-of select="html:a/text()"/></a>
+                                          <a href="#{a/@name}"><xsl:value-of select="a/text()"/></a>
                                         </li>
                                       </xsl:for-each>
                                     </ul>
@@ -138,7 +136,7 @@
       <head>
         <link rel="stylesheet" type="text/css" href="{$href_base}main.css"/>
         <link rel="SHORTCUT ICON" href="{$href_base}32favicon.png"/>
-        <title>libvirt: <xsl:value-of select="html:html/html:body/html:h1"/></title>
+        <title>libvirt: <xsl:value-of select="html/body/h1"/></title>
         <meta name="description" content="libvirt, virtualization, virtualization API"/>
       </head>
       <body>
@@ -155,13 +153,13 @@
         </div>
         <div id="body">
           <div id="menu">
-            <xsl:apply-templates select="exsl:node-set($sitemap)/html:ul" mode="menu">
+            <xsl:apply-templates select="exsl:node-set($sitemap)/ul" mode="menu">
               <xsl:with-param name="pagename" select="$pagename"/>
               <xsl:with-param name="level" select="0"/>
             </xsl:apply-templates>
           </div>
           <div id="content">
-            <xsl:apply-templates select="/html:html/html:body/*" mode="content"/>
+            <xsl:apply-templates select="/html/body/*" mode="content"/>
           </div>
         </div>
         <div id="footer">