* //* : renamed the project libvirt , this affects all makefiles,

the specs, the icons, the docs, etc ... * configure.in: prepare for 0.0.3 Daniel

* //* : renamed the project libvirt , this affects all makefiles,
the specs, the icons, the docs, etc ... * configure.in: prepare for 0.0.3 Daniel
8c423e6c · Daniel Veillard · 1c403644 · 8c423e6c · 8c423e6c · 8c423e6c
58 changed file
--- a/ChangeLog
+++ b/ChangeLog
+Wed Feb  8 11:43:43 EST 2006 Daniel Veillard <veillard@redhat.com>
+
+	* //* : renamed the project libvirt , this affects all makefiles,
+	  the specs, the icons, the docs, etc ...
+	* configure.in: prepare for 0.0.3
+
 Fri Feb  3 15:47:32 CET 2006 Karel Zak <kzak@redhat.com>

 	* src/virsh.c: fix order of the save command options

--- a/Makefile.am
+++ b/Makefile.am
@@ -2,12 +2,12 @@

 SUBDIRS = src include docs @PYTHON_SUBDIR@

-EXTRA_DIST = libvir.spec.in libvir.spec COPYING.LIB \
-             libvir.pc.in libvir.pc TODO AUTHORS ChangeLog \
+EXTRA_DIST = libvirt.spec.in libvirt.spec COPYING.LIB \
+             libvirt.pc.in libvirt.pc TODO AUTHORS ChangeLog \
 	     NEWS README 

 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libvir.pc
+pkgconfig_DATA = libvirt.pc

 rpm: clean
 	@(unset CDPATH ; $(MAKE) dist && rpmbuild -ta $(distdir).tar.gz)
--- a/NEWS
+++ b/NEWS

-        NEWS file for libvir
+        NEWS file for libvirt

  Note that this is automatically generated from the news webpage at:
-       http://libvir.org/news.html
+       http://libvirt.org/news.html

 Releases
 0.0.2: Jan 29 2006:

--- a/README
+++ b/README

-         LibVir : simple library to use the Xen hypervisor
+         LibVirt : simple API for virtualization

-  As of Wed Nov 2 2005, this is a completely new project, it is not
-usable in any way yet.
+  Libvir is a C toolkit to interract with the virtualization capabilities
+of recent versions of Linux (and other OSes). It is free software
+available under the GNU Lesser General Public License. Virtualization of
+the Linux Operating System means the ability to run multiple instances of
+Operating Systems concurently on a single hardware system where the basic
+resources are driven by a Linux instance. The library aim at providing
+long term stable C API initially for the Xen paravirtualization but
+should be able to integrate other virtualization mechanisms if needed.

 Daniel Veillard <veillard@redhat.com>
--- a/configure.in
+++ b/configure.in
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(src/libvir.c)
+AC_INIT(src/libvirt.c)
 AM_CONFIG_HEADER(config.h)
 AC_CANONICAL_HOST

 LIBVIR_MAJOR_VERSION=0
 LIBVIR_MINOR_VERSION=0
-LIBVIR_MICRO_VERSION=2
+LIBVIR_MICRO_VERSION=3
 LIBVIR_MICRO_VERSION_SUFFIX=
 LIBVIR_VERSION=$LIBVIR_MAJOR_VERSION.$LIBVIR_MINOR_VERSION.$LIBVIR_MICRO_VERSION$LIBVIR_MICRO_VERSION_SUFFIX
 LIBVIR_VERSION_INFO=`expr $LIBVIR_MAJOR_VERSION + $LIBVIR_MINOR_VERSION`:$LIBVIR_MICRO_VERSION:$LIBVIR_MINOR_VERSION
@@ -31,7 +31,7 @@ AC_SUBST(LIBVIR_VERSION_EXTRA)

 VERSION=${LIBVIR_VERSION}

-AM_INIT_AUTOMAKE(libvir, $VERSION)
+AM_INIT_AUTOMAKE(libvirt, $VERSION)

 dnl Checks for programs.
 AC_PROG_CC
@@ -192,4 +192,4 @@ rm -f COPYING

 AC_OUTPUT(Makefile src/Makefile include/Makefile docs/Makefile \
          docs/examples/Makefile \
-          libvir.pc libvir.spec include/libvir.h python/Makefile)
+          libvirt.pc libvirt.spec include/libvirt.h python/Makefile)
--- a/docs/APIchunk0.html
+++ b/docs/APIchunk0.html
--- a/docs/APIchunk1.html
+++ b/docs/APIchunk1.html
--- a/docs/APIchunk2.html
+++ b/docs/APIchunk2.html
--- a/docs/APIconstructors.html
+++ b/docs/APIconstructors.html
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /><link rel="stylesheet" type="text/css" href="libvir.css" /><link rel="SHORTCUT ICON" href="/32favicon.png" /><title>List of constructors for libvir</title></head><body><div id="container"><div id="intro"><div id="adjustments"></div><div id="pageHeader"></div><div id="content2"><h1 class="style1">List of constructors for libvir</h1><h2>Type unsigned int:</h2><p><a href="html/libvir-libvir.html#virDomainGetID">virDomainGetID</a><br />
-</p><h2>Type unsigned long:</h2><p><a href="html/libvir-libvir.html#virDomainGetMaxMemory">virDomainGetMaxMemory</a><br />
-</p><h2>Type virConnectPtr:</h2><p><a href="html/libvir-libvir.html#virConnectOpen">virConnectOpen</a><br />
-<a href="html/libvir-libvir.html#virConnectOpenReadOnly">virConnectOpenReadOnly</a><br />
-</p><h2>Type virDomainPtr:</h2><p><a href="html/libvir-libvir.html#virDomainCreateLinux">virDomainCreateLinux</a><br />
-<a href="html/libvir-libvir.html#virDomainLookupByID">virDomainLookupByID</a><br />
-<a href="html/libvir-libvir.html#virDomainLookupByName">virDomainLookupByName</a><br />
+<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /><link rel="stylesheet" type="text/css" href="libvirt.css" /><link rel="SHORTCUT ICON" href="/32favicon.png" /><title>List of constructors for libvirt</title></head><body><div id="container"><div id="intro"><div id="adjustments"></div><div id="pageHeader"></div><div id="content2"><h1 class="style1">List of constructors for libvirt</h1><h2>Type unsigned int:</h2><p><a href="html/libvirt-libvirt.html#virDomainGetID">virDomainGetID</a><br />
+</p><h2>Type unsigned long:</h2><p><a href="html/libvirt-libvirt.html#virDomainGetMaxMemory">virDomainGetMaxMemory</a><br />
+</p><h2>Type virConnectPtr:</h2><p><a href="html/libvirt-libvirt.html#virConnectOpen">virConnectOpen</a><br />
+<a href="html/libvirt-libvirt.html#virConnectOpenReadOnly">virConnectOpenReadOnly</a><br />
+</p><h2>Type virDomainPtr:</h2><p><a href="html/libvirt-libvirt.html#virDomainCreateLinux">virDomainCreateLinux</a><br />
+<a href="html/libvirt-libvirt.html#virDomainLookupByID">virDomainLookupByID</a><br />
+<a href="html/libvirt-libvirt.html#virDomainLookupByName">virDomainLookupByName</a><br />
 </p></div></div><div class="linkList2"><div class="llinks2"><h3 class="links2"><span>main menu</span></h3><ul><li><a href="index.html">Home</a></li><li><a style="font-weight:bold" href="html/index.html">API Menu</a></li><li><a href="ChangeLog.html">Recent Changes</a></li></ul></div><div class="llinks2"><h3 class="links2"><span>related links</span></h3><ul><li><a href="https://www.redhat.com/archives/libvir-list/">Mail archive</a></li><li><a href="http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html">Xen project</a></li><li><form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><input name="query" type="text" size="12" value="Search..." /><input name="submit" type="submit" value="Go" /></form></li><li><a href="http://xmlsoft.org/"><img src="Libxml2-Logo-90x34.gif" alt="Made with Libxml2 Logo" /></a></li></ul><p class="credits">Graphics and design by <a href="mail:dfong@redhat.com">Diana Fong</a></p></div></div><div id="bottom"><p class="p1"></p></div></div></body></html>
--- a/docs/APIfiles.html
+++ b/docs/APIfiles.html
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /><link rel="stylesheet" type="text/css" href="libvir.css" /><link rel="SHORTCUT ICON" href="/32favicon.png" /><title>List of Symbols per Module for libvir</title></head><body><div id="container"><div id="intro"><div id="adjustments"></div><div id="pageHeader"></div><div id="content2"><h1 class="style1">List of Symbols per Module for libvir</h1><h2><a name="libvir" id="libvir">Module libvir</a>:</h2><p><a href="html/libvir-libvir.html#LIBVIR_VERSION_NUMBER">LIBVIR_VERSION_NUMBER</a><br />
-<a href="html/libvir-libvir.html#VIR_DEVICE_DEFAULT">VIR_DEVICE_DEFAULT</a><br />
-<a href="html/libvir-libvir.html#VIR_DEVICE_RO">VIR_DEVICE_RO</a><br />
-<a href="html/libvir-libvir.html#VIR_DEVICE_RW">VIR_DEVICE_RW</a><br />
-<a href="html/libvir-libvir.html#VIR_DEVICE_RW_FORCE">VIR_DEVICE_RW_FORCE</a><br />
-<a href="html/libvir-libvir.html#VIR_DOMAIN_BLOCKED">VIR_DOMAIN_BLOCKED</a><br />
-<a href="html/libvir-libvir.html#VIR_DOMAIN_CRASHED">VIR_DOMAIN_CRASHED</a><br />
-<a href="html/libvir-libvir.html#VIR_DOMAIN_DESTROY">VIR_DOMAIN_DESTROY</a><br />
-<a href="html/libvir-libvir.html#VIR_DOMAIN_NONE">VIR_DOMAIN_NONE</a><br />
-<a href="html/libvir-libvir.html#VIR_DOMAIN_NOSTATE">VIR_DOMAIN_NOSTATE</a><br />
-<a href="html/libvir-libvir.html#VIR_DOMAIN_PAUSED">VIR_DOMAIN_PAUSED</a><br />
-<a href="html/libvir-libvir.html#VIR_DOMAIN_PRESERVE">VIR_DOMAIN_PRESERVE</a><br />
-<a href="html/libvir-libvir.html#VIR_DOMAIN_RENAME_RESTART">VIR_DOMAIN_RENAME_RESTART</a><br />
-<a href="html/libvir-libvir.html#VIR_DOMAIN_RESTART">VIR_DOMAIN_RESTART</a><br />
-<a href="html/libvir-libvir.html#VIR_DOMAIN_RUNNING">VIR_DOMAIN_RUNNING</a><br />
-<a href="html/libvir-libvir.html#VIR_DOMAIN_SHUTDOWN">VIR_DOMAIN_SHUTDOWN</a><br />
-<a href="html/libvir-libvir.html#VIR_DOMAIN_SHUTOFF">VIR_DOMAIN_SHUTOFF</a><br />
-<a href="html/libvir-libvir.html#_virDomainInfo">_virDomainInfo</a><br />
-<a href="html/libvir-libvir.html#_virDomainKernel">_virDomainKernel</a><br />
-<a href="html/libvir-libvir.html#virConnect">virConnect</a><br />
-<a href="html/libvir-libvir.html#virConnectClose">virConnectClose</a><br />
-<a href="html/libvir-libvir.html#virConnectGetType">virConnectGetType</a><br />
-<a href="html/libvir-libvir.html#virConnectGetVersion">virConnectGetVersion</a><br />
-<a href="html/libvir-libvir.html#virConnectListDomains">virConnectListDomains</a><br />
-<a href="html/libvir-libvir.html#virConnectNumOfDomains">virConnectNumOfDomains</a><br />
-<a href="html/libvir-libvir.html#virConnectOpen">virConnectOpen</a><br />
-<a href="html/libvir-libvir.html#virConnectOpenReadOnly">virConnectOpenReadOnly</a><br />
-<a href="html/libvir-libvir.html#virConnectPtr">virConnectPtr</a><br />
-<a href="html/libvir-libvir.html#virDeviceMode">virDeviceMode</a><br />
-<a href="html/libvir-libvir.html#virDomain">virDomain</a><br />
-<a href="html/libvir-libvir.html#virDomainCreateFlags">virDomainCreateFlags</a><br />
-<a href="html/libvir-libvir.html#virDomainCreateLinux">virDomainCreateLinux</a><br />
-<a href="html/libvir-libvir.html#virDomainDestroy">virDomainDestroy</a><br />
-<a href="html/libvir-libvir.html#virDomainFree">virDomainFree</a><br />
-<a href="html/libvir-libvir.html#virDomainGetID">virDomainGetID</a><br />
-<a href="html/libvir-libvir.html#virDomainGetInfo">virDomainGetInfo</a><br />
-<a href="html/libvir-libvir.html#virDomainGetMaxMemory">virDomainGetMaxMemory</a><br />
-<a href="html/libvir-libvir.html#virDomainGetName">virDomainGetName</a><br />
-<a href="html/libvir-libvir.html#virDomainGetOSType">virDomainGetOSType</a><br />
-<a href="html/libvir-libvir.html#virDomainGetXMLDesc">virDomainGetXMLDesc</a><br />
-<a href="html/libvir-libvir.html#virDomainInfo">virDomainInfo</a><br />
-<a href="html/libvir-libvir.html#virDomainInfoPtr">virDomainInfoPtr</a><br />
-<a href="html/libvir-libvir.html#virDomainKernel">virDomainKernel</a><br />
-<a href="html/libvir-libvir.html#virDomainKernelPtr">virDomainKernelPtr</a><br />
-<a href="html/libvir-libvir.html#virDomainLookupByID">virDomainLookupByID</a><br />
-<a href="html/libvir-libvir.html#virDomainLookupByName">virDomainLookupByName</a><br />
-<a href="html/libvir-libvir.html#virDomainPtr">virDomainPtr</a><br />
-<a href="html/libvir-libvir.html#virDomainRestart">virDomainRestart</a><br />
-<a href="html/libvir-libvir.html#virDomainRestore">virDomainRestore</a><br />
-<a href="html/libvir-libvir.html#virDomainResume">virDomainResume</a><br />
-<a href="html/libvir-libvir.html#virDomainSave">virDomainSave</a><br />
-<a href="html/libvir-libvir.html#virDomainSetMaxMemory">virDomainSetMaxMemory</a><br />
-<a href="html/libvir-libvir.html#virDomainShutdown">virDomainShutdown</a><br />
-<a href="html/libvir-libvir.html#virDomainState">virDomainState</a><br />
-<a href="html/libvir-libvir.html#virDomainSuspend">virDomainSuspend</a><br />
-<a href="html/libvir-libvir.html#virGetVersion">virGetVersion</a><br />
+<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /><link rel="stylesheet" type="text/css" href="libvirt.css" /><link rel="SHORTCUT ICON" href="/32favicon.png" /><title>List of Symbols per Module for libvirt</title></head><body><div id="container"><div id="intro"><div id="adjustments"></div><div id="pageHeader"></div><div id="content2"><h1 class="style1">List of Symbols per Module for libvirt</h1><h2><a name="libvirt" id="libvirt">Module libvirt</a>:</h2><p><a href="html/libvirt-libvirt.html#LIBVIR_VERSION_NUMBER">LIBVIR_VERSION_NUMBER</a><br />
+<a href="html/libvirt-libvirt.html#VIR_DEVICE_DEFAULT">VIR_DEVICE_DEFAULT</a><br />
+<a href="html/libvirt-libvirt.html#VIR_DEVICE_RO">VIR_DEVICE_RO</a><br />
+<a href="html/libvirt-libvirt.html#VIR_DEVICE_RW">VIR_DEVICE_RW</a><br />
+<a href="html/libvirt-libvirt.html#VIR_DEVICE_RW_FORCE">VIR_DEVICE_RW_FORCE</a><br />
+<a href="html/libvirt-libvirt.html#VIR_DOMAIN_BLOCKED">VIR_DOMAIN_BLOCKED</a><br />
+<a href="html/libvirt-libvirt.html#VIR_DOMAIN_CRASHED">VIR_DOMAIN_CRASHED</a><br />
+<a href="html/libvirt-libvirt.html#VIR_DOMAIN_DESTROY">VIR_DOMAIN_DESTROY</a><br />
+<a href="html/libvirt-libvirt.html#VIR_DOMAIN_NONE">VIR_DOMAIN_NONE</a><br />
+<a href="html/libvirt-libvirt.html#VIR_DOMAIN_NOSTATE">VIR_DOMAIN_NOSTATE</a><br />
+<a href="html/libvirt-libvirt.html#VIR_DOMAIN_PAUSED">VIR_DOMAIN_PAUSED</a><br />
+<a href="html/libvirt-libvirt.html#VIR_DOMAIN_PRESERVE">VIR_DOMAIN_PRESERVE</a><br />
+<a href="html/libvirt-libvirt.html#VIR_DOMAIN_RENAME_RESTART">VIR_DOMAIN_RENAME_RESTART</a><br />
+<a href="html/libvirt-libvirt.html#VIR_DOMAIN_RESTART">VIR_DOMAIN_RESTART</a><br />
+<a href="html/libvirt-libvirt.html#VIR_DOMAIN_RUNNING">VIR_DOMAIN_RUNNING</a><br />
+<a href="html/libvirt-libvirt.html#VIR_DOMAIN_SHUTDOWN">VIR_DOMAIN_SHUTDOWN</a><br />
+<a href="html/libvirt-libvirt.html#VIR_DOMAIN_SHUTOFF">VIR_DOMAIN_SHUTOFF</a><br />
+<a href="html/libvirt-libvirt.html#_virDomainInfo">_virDomainInfo</a><br />
+<a href="html/libvirt-libvirt.html#_virDomainKernel">_virDomainKernel</a><br />
+<a href="html/libvirt-libvirt.html#virConnect">virConnect</a><br />
+<a href="html/libvirt-libvirt.html#virConnectClose">virConnectClose</a><br />
+<a href="html/libvirt-libvirt.html#virConnectGetType">virConnectGetType</a><br />
+<a href="html/libvirt-libvirt.html#virConnectGetVersion">virConnectGetVersion</a><br />
+<a href="html/libvirt-libvirt.html#virConnectListDomains">virConnectListDomains</a><br />
+<a href="html/libvirt-libvirt.html#virConnectNumOfDomains">virConnectNumOfDomains</a><br />
+<a href="html/libvirt-libvirt.html#virConnectOpen">virConnectOpen</a><br />
+<a href="html/libvirt-libvirt.html#virConnectOpenReadOnly">virConnectOpenReadOnly</a><br />
+<a href="html/libvirt-libvirt.html#virConnectPtr">virConnectPtr</a><br />
+<a href="html/libvirt-libvirt.html#virDeviceMode">virDeviceMode</a><br />
+<a href="html/libvirt-libvirt.html#virDomain">virDomain</a><br />
+<a href="html/libvirt-libvirt.html#virDomainCreateFlags">virDomainCreateFlags</a><br />
+<a href="html/libvirt-libvirt.html#virDomainCreateLinux">virDomainCreateLinux</a><br />
+<a href="html/libvirt-libvirt.html#virDomainDestroy">virDomainDestroy</a><br />
+<a href="html/libvirt-libvirt.html#virDomainFree">virDomainFree</a><br />
+<a href="html/libvirt-libvirt.html#virDomainGetID">virDomainGetID</a><br />
+<a href="html/libvirt-libvirt.html#virDomainGetInfo">virDomainGetInfo</a><br />
+<a href="html/libvirt-libvirt.html#virDomainGetMaxMemory">virDomainGetMaxMemory</a><br />
+<a href="html/libvirt-libvirt.html#virDomainGetName">virDomainGetName</a><br />
+<a href="html/libvirt-libvirt.html#virDomainGetOSType">virDomainGetOSType</a><br />
+<a href="html/libvirt-libvirt.html#virDomainGetXMLDesc">virDomainGetXMLDesc</a><br />
+<a href="html/libvirt-libvirt.html#virDomainInfo">virDomainInfo</a><br />
+<a href="html/libvirt-libvirt.html#virDomainInfoPtr">virDomainInfoPtr</a><br />
+<a href="html/libvirt-libvirt.html#virDomainKernel">virDomainKernel</a><br />
+<a href="html/libvirt-libvirt.html#virDomainKernelPtr">virDomainKernelPtr</a><br />
+<a href="html/libvirt-libvirt.html#virDomainLookupByID">virDomainLookupByID</a><br />
+<a href="html/libvirt-libvirt.html#virDomainLookupByName">virDomainLookupByName</a><br />
+<a href="html/libvirt-libvirt.html#virDomainPtr">virDomainPtr</a><br />
+<a href="html/libvirt-libvirt.html#virDomainRestart">virDomainRestart</a><br />
+<a href="html/libvirt-libvirt.html#virDomainRestore">virDomainRestore</a><br />
+<a href="html/libvirt-libvirt.html#virDomainResume">virDomainResume</a><br />
+<a href="html/libvirt-libvirt.html#virDomainSave">virDomainSave</a><br />
+<a href="html/libvirt-libvirt.html#virDomainSetMaxMemory">virDomainSetMaxMemory</a><br />
+<a href="html/libvirt-libvirt.html#virDomainShutdown">virDomainShutdown</a><br />
+<a href="html/libvirt-libvirt.html#virDomainState">virDomainState</a><br />
+<a href="html/libvirt-libvirt.html#virDomainSuspend">virDomainSuspend</a><br />
+<a href="html/libvirt-libvirt.html#virGetVersion">virGetVersion</a><br />
 </p></div></div><div class="linkList2"><div class="llinks2"><h3 class="links2"><span>main menu</span></h3><ul><li><a href="index.html">Home</a></li><li><a style="font-weight:bold" href="html/index.html">API Menu</a></li><li><a href="ChangeLog.html">Recent Changes</a></li></ul></div><div class="llinks2"><h3 class="links2"><span>related links</span></h3><ul><li><a href="https://www.redhat.com/archives/libvir-list/">Mail archive</a></li><li><a href="http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html">Xen project</a></li><li><form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><input name="query" type="text" size="12" value="Search..." /><input name="submit" type="submit" value="Go" /></form></li><li><a href="http://xmlsoft.org/"><img src="Libxml2-Logo-90x34.gif" alt="Made with Libxml2 Logo" /></a></li></ul><p class="credits">Graphics and design by <a href="mail:dfong@redhat.com">Diana Fong</a></p></div></div><div id="bottom"><p class="p1"></p></div></div></body></html>
--- a/docs/APIfunctions.html
+++ b/docs/APIfunctions.html
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /><link rel="stylesheet" type="text/css" href="libvir.css" /><link rel="SHORTCUT ICON" href="/32favicon.png" /><title>List of function manipulating types in libvir</title></head><body><div id="container"><div id="intro"><div id="adjustments"></div><div id="pageHeader"></div><div id="content2"><h1 class="style1">List of function manipulating types in libvir</h1><h2>Type int *:</h2><p><a href="html/libvir-libvir.html#virConnectListDomains">virConnectListDomains</a><br />
-</p><h2>Type unsigned int:</h2><p><a href="html/libvir-libvir.html#virDomainCreateLinux">virDomainCreateLinux</a><br />
-</p><h2>Type unsigned long:</h2><p><a href="html/libvir-libvir.html#virDomainCreateLinux">virDomainCreateLinux</a><br />
-<a href="html/libvir-libvir.html#virDomainSetMaxMemory">virDomainSetMaxMemory</a><br />
-</p><h2>Type unsigned long *:</h2><p><a href="html/libvir-libvir.html#virConnectGetVersion">virConnectGetVersion</a><br />
-<a href="html/libvir-libvir.html#virGetVersion">virGetVersion</a><br />
-</p><h2>Type virConnectPtr:</h2><p><a href="html/libvir-libvir.html#virConnectClose">virConnectClose</a><br />
-<a href="html/libvir-libvir.html#virConnectGetType">virConnectGetType</a><br />
-<a href="html/libvir-libvir.html#virConnectGetVersion">virConnectGetVersion</a><br />
-<a href="html/libvir-libvir.html#virConnectListDomains">virConnectListDomains</a><br />
-<a href="html/libvir-libvir.html#virConnectNumOfDomains">virConnectNumOfDomains</a><br />
-<a href="html/libvir-libvir.html#virDomainCreateLinux">virDomainCreateLinux</a><br />
-<a href="html/libvir-libvir.html#virDomainLookupByID">virDomainLookupByID</a><br />
-<a href="html/libvir-libvir.html#virDomainLookupByName">virDomainLookupByName</a><br />
-<a href="html/libvir-libvir.html#virDomainRestore">virDomainRestore</a><br />
-</p><h2>Type virDomainInfoPtr:</h2><p><a href="html/libvir-libvir.html#virDomainGetInfo">virDomainGetInfo</a><br />
-</p><h2>Type virDomainPtr:</h2><p><a href="html/libvir-libvir.html#virDomainDestroy">virDomainDestroy</a><br />
-<a href="html/libvir-libvir.html#virDomainFree">virDomainFree</a><br />
-<a href="html/libvir-libvir.html#virDomainGetID">virDomainGetID</a><br />
-<a href="html/libvir-libvir.html#virDomainGetInfo">virDomainGetInfo</a><br />
-<a href="html/libvir-libvir.html#virDomainGetMaxMemory">virDomainGetMaxMemory</a><br />
-<a href="html/libvir-libvir.html#virDomainGetName">virDomainGetName</a><br />
-<a href="html/libvir-libvir.html#virDomainGetOSType">virDomainGetOSType</a><br />
-<a href="html/libvir-libvir.html#virDomainGetXMLDesc">virDomainGetXMLDesc</a><br />
-<a href="html/libvir-libvir.html#virDomainResume">virDomainResume</a><br />
-<a href="html/libvir-libvir.html#virDomainSave">virDomainSave</a><br />
-<a href="html/libvir-libvir.html#virDomainSetMaxMemory">virDomainSetMaxMemory</a><br />
-<a href="html/libvir-libvir.html#virDomainShutdown">virDomainShutdown</a><br />
-<a href="html/libvir-libvir.html#virDomainSuspend">virDomainSuspend</a><br />
+<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /><link rel="stylesheet" type="text/css" href="libvirt.css" /><link rel="SHORTCUT ICON" href="/32favicon.png" /><title>List of function manipulating types in libvirt</title></head><body><div id="container"><div id="intro"><div id="adjustments"></div><div id="pageHeader"></div><div id="content2"><h1 class="style1">List of function manipulating types in libvirt</h1><h2>Type int *:</h2><p><a href="html/libvirt-libvirt.html#virConnectListDomains">virConnectListDomains</a><br />
+</p><h2>Type unsigned int:</h2><p><a href="html/libvirt-libvirt.html#virDomainCreateLinux">virDomainCreateLinux</a><br />
+</p><h2>Type unsigned long:</h2><p><a href="html/libvirt-libvirt.html#virDomainCreateLinux">virDomainCreateLinux</a><br />
+<a href="html/libvirt-libvirt.html#virDomainSetMaxMemory">virDomainSetMaxMemory</a><br />
+</p><h2>Type unsigned long *:</h2><p><a href="html/libvirt-libvirt.html#virConnectGetVersion">virConnectGetVersion</a><br />
+<a href="html/libvirt-libvirt.html#virGetVersion">virGetVersion</a><br />
+</p><h2>Type virConnectPtr:</h2><p><a href="html/libvirt-libvirt.html#virConnectClose">virConnectClose</a><br />
+<a href="html/libvirt-libvirt.html#virConnectGetType">virConnectGetType</a><br />
+<a href="html/libvirt-libvirt.html#virConnectGetVersion">virConnectGetVersion</a><br />
+<a href="html/libvirt-libvirt.html#virConnectListDomains">virConnectListDomains</a><br />
+<a href="html/libvirt-libvirt.html#virConnectNumOfDomains">virConnectNumOfDomains</a><br />
+<a href="html/libvirt-libvirt.html#virDomainCreateLinux">virDomainCreateLinux</a><br />
+<a href="html/libvirt-libvirt.html#virDomainLookupByID">virDomainLookupByID</a><br />
+<a href="html/libvirt-libvirt.html#virDomainLookupByName">virDomainLookupByName</a><br />
+<a href="html/libvirt-libvirt.html#virDomainRestore">virDomainRestore</a><br />
+</p><h2>Type virDomainInfoPtr:</h2><p><a href="html/libvirt-libvirt.html#virDomainGetInfo">virDomainGetInfo</a><br />
+</p><h2>Type virDomainPtr:</h2><p><a href="html/libvirt-libvirt.html#virDomainDestroy">virDomainDestroy</a><br />
+<a href="html/libvirt-libvirt.html#virDomainFree">virDomainFree</a><br />
+<a href="html/libvirt-libvirt.html#virDomainGetID">virDomainGetID</a><br />
+<a href="html/libvirt-libvirt.html#virDomainGetInfo">virDomainGetInfo</a><br />
+<a href="html/libvirt-libvirt.html#virDomainGetMaxMemory">virDomainGetMaxMemory</a><br />
+<a href="html/libvirt-libvirt.html#virDomainGetName">virDomainGetName</a><br />
+<a href="html/libvirt-libvirt.html#virDomainGetOSType">virDomainGetOSType</a><br />
+<a href="html/libvirt-libvirt.html#virDomainGetXMLDesc">virDomainGetXMLDesc</a><br />
+<a href="html/libvirt-libvirt.html#virDomainResume">virDomainResume</a><br />
+<a href="html/libvirt-libvirt.html#virDomainSave">virDomainSave</a><br />
+<a href="html/libvirt-libvirt.html#virDomainSetMaxMemory">virDomainSetMaxMemory</a><br />
+<a href="html/libvirt-libvirt.html#virDomainShutdown">virDomainShutdown</a><br />
+<a href="html/libvirt-libvirt.html#virDomainSuspend">virDomainSuspend</a><br />
 </p></div></div><div class="linkList2"><div class="llinks2"><h3 class="links2"><span>main menu</span></h3><ul><li><a href="index.html">Home</a></li><li><a style="font-weight:bold" href="html/index.html">API Menu</a></li><li><a href="ChangeLog.html">Recent Changes</a></li></ul></div><div class="llinks2"><h3 class="links2"><span>related links</span></h3><ul><li><a href="https://www.redhat.com/archives/libvir-list/">Mail archive</a></li><li><a href="http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html">Xen project</a></li><li><form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><input name="query" type="text" size="12" value="Search..." /><input name="submit" type="submit" value="Go" /></form></li><li><a href="http://xmlsoft.org/"><img src="Libxml2-Logo-90x34.gif" alt="Made with Libxml2 Logo" /></a></li></ul><p class="credits">Graphics and design by <a href="mail:dfong@redhat.com">Diana Fong</a></p></div></div><div id="bottom"><p class="p1"></p></div></div></body></html>
--- a/docs/APIsymbols.html
+++ b/docs/APIsymbols.html
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /><link rel="stylesheet" type="text/css" href="libvir.css" /><link rel="SHORTCUT ICON" href="/32favicon.png" /><title>Alphabetic List of Symbols in libvir</title></head><body><div id="container"><div id="intro"><div id="adjustments"></div><div id="pageHeader"></div><div id="content2"><h1 class="style1">Alphabetic List of Symbols in libvir</h1><h2>Letter L:</h2><p><a href="html/libvir-libvir.html#LIBVIR_VERSION_NUMBER">LIBVIR_VERSION_NUMBER</a><br />
-</p><h2>Letter V:</h2><p><a href="html/libvir-libvir.html#VIR_DEVICE_DEFAULT">VIR_DEVICE_DEFAULT</a><br />
-<a href="html/libvir-libvir.html#VIR_DEVICE_RO">VIR_DEVICE_RO</a><br />
-<a href="html/libvir-libvir.html#VIR_DEVICE_RW">VIR_DEVICE_RW</a><br />
-<a href="html/libvir-libvir.html#VIR_DEVICE_RW_FORCE">VIR_DEVICE_RW_FORCE</a><br />
-<a href="html/libvir-libvir.html#VIR_DOMAIN_BLOCKED">VIR_DOMAIN_BLOCKED</a><br />
-<a href="html/libvir-libvir.html#VIR_DOMAIN_CRASHED">VIR_DOMAIN_CRASHED</a><br />
-<a href="html/libvir-libvir.html#VIR_DOMAIN_DESTROY">VIR_DOMAIN_DESTROY</a><br />
-<a href="html/libvir-libvir.html#VIR_DOMAIN_NONE">VIR_DOMAIN_NONE</a><br />
-<a href="html/libvir-libvir.html#VIR_DOMAIN_NOSTATE">VIR_DOMAIN_NOSTATE</a><br />
-<a href="html/libvir-libvir.html#VIR_DOMAIN_PAUSED">VIR_DOMAIN_PAUSED</a><br />
-<a href="html/libvir-libvir.html#VIR_DOMAIN_PRESERVE">VIR_DOMAIN_PRESERVE</a><br />
-<a href="html/libvir-libvir.html#VIR_DOMAIN_RENAME_RESTART">VIR_DOMAIN_RENAME_RESTART</a><br />
-<a href="html/libvir-libvir.html#VIR_DOMAIN_RESTART">VIR_DOMAIN_RESTART</a><br />
-<a href="html/libvir-libvir.html#VIR_DOMAIN_RUNNING">VIR_DOMAIN_RUNNING</a><br />
-<a href="html/libvir-libvir.html#VIR_DOMAIN_SHUTDOWN">VIR_DOMAIN_SHUTDOWN</a><br />
-<a href="html/libvir-libvir.html#VIR_DOMAIN_SHUTOFF">VIR_DOMAIN_SHUTOFF</a><br />
-</p><h2>Letter _:</h2><p><a href="html/libvir-libvir.html#_virDomainInfo">_virDomainInfo</a><br />
-<a href="html/libvir-libvir.html#_virDomainKernel">_virDomainKernel</a><br />
-</p><h2>Letter v:</h2><p><a href="html/libvir-libvir.html#virConnect">virConnect</a><br />
-<a href="html/libvir-libvir.html#virConnectClose">virConnectClose</a><br />
-<a href="html/libvir-libvir.html#virConnectGetType">virConnectGetType</a><br />
-<a href="html/libvir-libvir.html#virConnectGetVersion">virConnectGetVersion</a><br />
-<a href="html/libvir-libvir.html#virConnectListDomains">virConnectListDomains</a><br />
-<a href="html/libvir-libvir.html#virConnectNumOfDomains">virConnectNumOfDomains</a><br />
-<a href="html/libvir-libvir.html#virConnectOpen">virConnectOpen</a><br />
-<a href="html/libvir-libvir.html#virConnectOpenReadOnly">virConnectOpenReadOnly</a><br />
-<a href="html/libvir-libvir.html#virConnectPtr">virConnectPtr</a><br />
-<a href="html/libvir-libvir.html#virDeviceMode">virDeviceMode</a><br />
-<a href="html/libvir-libvir.html#virDomain">virDomain</a><br />
-<a href="html/libvir-libvir.html#virDomainCreateFlags">virDomainCreateFlags</a><br />
-<a href="html/libvir-libvir.html#virDomainCreateLinux">virDomainCreateLinux</a><br />
-<a href="html/libvir-libvir.html#virDomainDestroy">virDomainDestroy</a><br />
-<a href="html/libvir-libvir.html#virDomainFree">virDomainFree</a><br />
-<a href="html/libvir-libvir.html#virDomainGetID">virDomainGetID</a><br />
-<a href="html/libvir-libvir.html#virDomainGetInfo">virDomainGetInfo</a><br />
-<a href="html/libvir-libvir.html#virDomainGetMaxMemory">virDomainGetMaxMemory</a><br />
-<a href="html/libvir-libvir.html#virDomainGetName">virDomainGetName</a><br />
-<a href="html/libvir-libvir.html#virDomainGetOSType">virDomainGetOSType</a><br />
-<a href="html/libvir-libvir.html#virDomainGetXMLDesc">virDomainGetXMLDesc</a><br />
-<a href="html/libvir-libvir.html#virDomainInfo">virDomainInfo</a><br />
-<a href="html/libvir-libvir.html#virDomainInfoPtr">virDomainInfoPtr</a><br />
-<a href="html/libvir-libvir.html#virDomainKernel">virDomainKernel</a><br />
-<a href="html/libvir-libvir.html#virDomainKernelPtr">virDomainKernelPtr</a><br />
-<a href="html/libvir-libvir.html#virDomainLookupByID">virDomainLookupByID</a><br />
-<a href="html/libvir-libvir.html#virDomainLookupByName">virDomainLookupByName</a><br />
-<a href="html/libvir-libvir.html#virDomainPtr">virDomainPtr</a><br />
-<a href="html/libvir-libvir.html#virDomainRestart">virDomainRestart</a><br />
-<a href="html/libvir-libvir.html#virDomainRestore">virDomainRestore</a><br />
-<a href="html/libvir-libvir.html#virDomainResume">virDomainResume</a><br />
-<a href="html/libvir-libvir.html#virDomainSave">virDomainSave</a><br />
-<a href="html/libvir-libvir.html#virDomainSetMaxMemory">virDomainSetMaxMemory</a><br />
-<a href="html/libvir-libvir.html#virDomainShutdown">virDomainShutdown</a><br />
-<a href="html/libvir-libvir.html#virDomainState">virDomainState</a><br />
-<a href="html/libvir-libvir.html#virDomainSuspend">virDomainSuspend</a><br />
-<a href="html/libvir-libvir.html#virGetVersion">virGetVersion</a><br />
+<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /><link rel="stylesheet" type="text/css" href="libvirt.css" /><link rel="SHORTCUT ICON" href="/32favicon.png" /><title>Alphabetic List of Symbols in libvirt</title></head><body><div id="container"><div id="intro"><div id="adjustments"></div><div id="pageHeader"></div><div id="content2"><h1 class="style1">Alphabetic List of Symbols in libvirt</h1><h2>Letter L:</h2><p><a href="html/libvirt-libvirt.html#LIBVIR_VERSION_NUMBER">LIBVIR_VERSION_NUMBER</a><br />
+</p><h2>Letter V:</h2><p><a href="html/libvirt-libvirt.html#VIR_DEVICE_DEFAULT">VIR_DEVICE_DEFAULT</a><br />
+<a href="html/libvirt-libvirt.html#VIR_DEVICE_RO">VIR_DEVICE_RO</a><br />
+<a href="html/libvirt-libvirt.html#VIR_DEVICE_RW">VIR_DEVICE_RW</a><br />
+<a href="html/libvirt-libvirt.html#VIR_DEVICE_RW_FORCE">VIR_DEVICE_RW_FORCE</a><br />
+<a href="html/libvirt-libvirt.html#VIR_DOMAIN_BLOCKED">VIR_DOMAIN_BLOCKED</a><br />
+<a href="html/libvirt-libvirt.html#VIR_DOMAIN_CRASHED">VIR_DOMAIN_CRASHED</a><br />
+<a href="html/libvirt-libvirt.html#VIR_DOMAIN_DESTROY">VIR_DOMAIN_DESTROY</a><br />
+<a href="html/libvirt-libvirt.html#VIR_DOMAIN_NONE">VIR_DOMAIN_NONE</a><br />
+<a href="html/libvirt-libvirt.html#VIR_DOMAIN_NOSTATE">VIR_DOMAIN_NOSTATE</a><br />
+<a href="html/libvirt-libvirt.html#VIR_DOMAIN_PAUSED">VIR_DOMAIN_PAUSED</a><br />
+<a href="html/libvirt-libvirt.html#VIR_DOMAIN_PRESERVE">VIR_DOMAIN_PRESERVE</a><br />
+<a href="html/libvirt-libvirt.html#VIR_DOMAIN_RENAME_RESTART">VIR_DOMAIN_RENAME_RESTART</a><br />
+<a href="html/libvirt-libvirt.html#VIR_DOMAIN_RESTART">VIR_DOMAIN_RESTART</a><br />
+<a href="html/libvirt-libvirt.html#VIR_DOMAIN_RUNNING">VIR_DOMAIN_RUNNING</a><br />
+<a href="html/libvirt-libvirt.html#VIR_DOMAIN_SHUTDOWN">VIR_DOMAIN_SHUTDOWN</a><br />
+<a href="html/libvirt-libvirt.html#VIR_DOMAIN_SHUTOFF">VIR_DOMAIN_SHUTOFF</a><br />
+</p><h2>Letter _:</h2><p><a href="html/libvirt-libvirt.html#_virDomainInfo">_virDomainInfo</a><br />
+<a href="html/libvirt-libvirt.html#_virDomainKernel">_virDomainKernel</a><br />
+</p><h2>Letter v:</h2><p><a href="html/libvirt-libvirt.html#virConnect">virConnect</a><br />
+<a href="html/libvirt-libvirt.html#virConnectClose">virConnectClose</a><br />
+<a href="html/libvirt-libvirt.html#virConnectGetType">virConnectGetType</a><br />
+<a href="html/libvirt-libvirt.html#virConnectGetVersion">virConnectGetVersion</a><br />
+<a href="html/libvirt-libvirt.html#virConnectListDomains">virConnectListDomains</a><br />
+<a href="html/libvirt-libvirt.html#virConnectNumOfDomains">virConnectNumOfDomains</a><br />
+<a href="html/libvirt-libvirt.html#virConnectOpen">virConnectOpen</a><br />
+<a href="html/libvirt-libvirt.html#virConnectOpenReadOnly">virConnectOpenReadOnly</a><br />
+<a href="html/libvirt-libvirt.html#virConnectPtr">virConnectPtr</a><br />
+<a href="html/libvirt-libvirt.html#virDeviceMode">virDeviceMode</a><br />
+<a href="html/libvirt-libvirt.html#virDomain">virDomain</a><br />
+<a href="html/libvirt-libvirt.html#virDomainCreateFlags">virDomainCreateFlags</a><br />
+<a href="html/libvirt-libvirt.html#virDomainCreateLinux">virDomainCreateLinux</a><br />
+<a href="html/libvirt-libvirt.html#virDomainDestroy">virDomainDestroy</a><br />
+<a href="html/libvirt-libvirt.html#virDomainFree">virDomainFree</a><br />
+<a href="html/libvirt-libvirt.html#virDomainGetID">virDomainGetID</a><br />
+<a href="html/libvirt-libvirt.html#virDomainGetInfo">virDomainGetInfo</a><br />
+<a href="html/libvirt-libvirt.html#virDomainGetMaxMemory">virDomainGetMaxMemory</a><br />
+<a href="html/libvirt-libvirt.html#virDomainGetName">virDomainGetName</a><br />
+<a href="html/libvirt-libvirt.html#virDomainGetOSType">virDomainGetOSType</a><br />
+<a href="html/libvirt-libvirt.html#virDomainGetXMLDesc">virDomainGetXMLDesc</a><br />
+<a href="html/libvirt-libvirt.html#virDomainInfo">virDomainInfo</a><br />
+<a href="html/libvirt-libvirt.html#virDomainInfoPtr">virDomainInfoPtr</a><br />
+<a href="html/libvirt-libvirt.html#virDomainKernel">virDomainKernel</a><br />
+<a href="html/libvirt-libvirt.html#virDomainKernelPtr">virDomainKernelPtr</a><br />
+<a href="html/libvirt-libvirt.html#virDomainLookupByID">virDomainLookupByID</a><br />
+<a href="html/libvirt-libvirt.html#virDomainLookupByName">virDomainLookupByName</a><br />
+<a href="html/libvirt-libvirt.html#virDomainPtr">virDomainPtr</a><br />
+<a href="html/libvirt-libvirt.html#virDomainRestart">virDomainRestart</a><br />
+<a href="html/libvirt-libvirt.html#virDomainRestore">virDomainRestore</a><br />
+<a href="html/libvirt-libvirt.html#virDomainResume">virDomainResume</a><br />
+<a href="html/libvirt-libvirt.html#virDomainSave">virDomainSave</a><br />
+<a href="html/libvirt-libvirt.html#virDomainSetMaxMemory">virDomainSetMaxMemory</a><br />
+<a href="html/libvirt-libvirt.html#virDomainShutdown">virDomainShutdown</a><br />
+<a href="html/libvirt-libvirt.html#virDomainState">virDomainState</a><br />
+<a href="html/libvirt-libvirt.html#virDomainSuspend">virDomainSuspend</a><br />
+<a href="html/libvirt-libvirt.html#virGetVersion">virGetVersion</a><br />
 </p></div></div><div class="linkList2"><div class="llinks2"><h3 class="links2"><span>main menu</span></h3><ul><li><a href="index.html">Home</a></li><li><a style="font-weight:bold" href="html/index.html">API Menu</a></li><li><a href="ChangeLog.html">Recent Changes</a></li></ul></div><div class="llinks2"><h3 class="links2"><span>related links</span></h3><ul><li><a href="https://www.redhat.com/archives/libvir-list/">Mail archive</a></li><li><a href="http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html">Xen project</a></li><li><form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><input name="query" type="text" size="12" value="Search..." /><input name="submit" type="submit" value="Go" /></form></li><li><a href="http://xmlsoft.org/"><img src="Libxml2-Logo-90x34.gif" alt="Made with Libxml2 Logo" /></a></li></ul><p class="credits">Graphics and design by <a href="mail:dfong@redhat.com">Diana Fong</a></p></div></div><div id="bottom"><p class="p1"></p></div></div></body></html>
--- a/docs/ChangeLog.xsl
+++ b/docs/ChangeLog.xsl
@@ -11,7 +11,7 @@
      doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN"
      doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>

-  <xsl:param name="module">libvir</xsl:param>
+  <xsl:param name="module">libvirt</xsl:param>

  <!-- The table of content for the HTML page -->
  <xsl:variable name="menu_name">API Menu</xsl:variable>

--- a/docs/FAQ.html
+++ b/docs/FAQ.html
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /><link rel="stylesheet" type="text/css" href="libvir.css" /><link rel="SHORTCUT ICON" href="/32favicon.png" /><title>FAQ</title></head><body><div id="container"><div id="intro"><div id="adjustments"></div><div id="pageHeader"></div><div id="content2"><h1 class="style1">FAQ</h1><p>Table of Contents:</p><ul><li><a href="FAQ.html#License">License(s)</a></li>
+<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /><link rel="stylesheet" type="text/css" href="libvirt.css" /><link rel="SHORTCUT ICON" href="/32favicon.png" /><title>FAQ</title></head><body><div id="container"><div id="intro"><div id="adjustments"></div><div id="pageHeader"></div><div id="content2"><h1 class="style1">FAQ</h1><p>Table of Contents:</p><ul><li><a href="FAQ.html#License">License(s)</a></li>
  <li><a href="FAQ.html#Installati">Installation</a></li>
  <li><a href="FAQ.html#Compilatio">Compilation</a></li>
  <li><a href="FAQ.html#Developer">Developer corner</a></li>

--- a/docs/Makefile.am
+++ b/docs/Makefile.am
 ## Process this file with automake to produce Makefile.in
-SUBDIRS=
+SUBDIRS=examples

 # The directory containing the source code (if it contains documentation).
 DOC_SOURCE_DIR=../src
@@ -8,7 +8,7 @@ PAGES= index.html bugs.html FAQ.html
 APIPAGES=APIconstructors.html APIfiles.html APIfunctions.html \
    APIsymbols.html APIchunk0.html
 EXTRA_DIST=							\
-	   libvir-api.xml libxen-refs.xml apibuild.py		\
+	   libvirt-api.xml libvirt-refs.xml apibuild.py		\
 	   *.xsl *.html *.gif html/*.html html/*.png


@@ -16,7 +16,7 @@ man_MANS=

 all: web $(top_builddir)/NEWS $(man_MANS)

-api: libvir-api.xml libvir-refs.xml $(APIPAGES) $(srcdir)/html/index.html
+api: libvirt-api.xml libvirt-refs.xml $(APIPAGES) $(srcdir)/html/index.html

 web: $(PAGES)

@@ -29,24 +29,24 @@ $(PAGES): libvir.html site.xsl
 	  $(XMLLINT) --nonet --valid --noout $(PAGES) ; fi );


-$(APIPAGES): libvir-api.xml libvir-refs.xml $(top_srcdir)/docs/site.xsl $(top_srcdir)/docs/api.xsl
+$(APIPAGES): libvirt-api.xml libvirt-refs.xml $(top_srcdir)/docs/site.xsl $(top_srcdir)/docs/api.xsl
 	-@(if [ -x $(XSLTPROC) ] ; then \
-	  echo "Rebuilding the HTML API pages from libvir-refs.xml" ; \
+	  echo "Rebuilding the HTML API pages from libvirt-refs.xml" ; \
 	  $(XSLTPROC) --nonet --html $(top_srcdir)/docs/api.xsl \
 	                     $(top_srcdir)/docs/libvir.html ; fi );
 	-@(if [ -x $(XMLLINT) ] ; then \
 	  echo "Validating the HTML API pages" ; \
 	  $(XMLLINT) --nonet --valid --noout API*.html ; fi );

-$(srcdir)/html/index.html: libvir-api.xml $(srcdir)/newapi.xsl
+$(srcdir)/html/index.html: libvirt-api.xml $(srcdir)/newapi.xsl
 	-@(if [ -x $(XSLTPROC) ] ; then \
 	  echo "Rebuilding the HTML pages from the XML API" ; \
-	  $(XSLTPROC) --nonet $(srcdir)/newapi.xsl libvir-api.xml ; fi )
+	  $(XSLTPROC) --nonet $(srcdir)/newapi.xsl libvirt-api.xml ; fi )
 	-@(if [ -x $(XMLLINT) ] ; then \
 	  echo "Validating the resulting XHTML pages" ; \
 	  $(XMLLINT) --nonet --valid --noout html/*.html ; fi );

-libvir-api.xml libvir-refs.xml: apibuild.py ../include/*.h ../src/*.h ../src/*.c
+libvirt-api.xml libvirt-refs.xml: apibuild.py ../include/*.h ../src/*.h ../src/*.c
 	-(./apibuild.py)

 $(top_builddir)/NEWS: $(top_srcdir)/docs/news.xsl $(top_srcdir)/docs/news.html
@@ -57,7 +57,7 @@ clean-local:
 	rm -f *~ *.bak *.hierarchy *.signals *-unused.txt

 maintainer-clean-local: clean-local
-	rm -rf libvir-api.xml libvir-refs.xml
+	rm -rf libvirt-api.xml libvirt-refs.xml

 rebuild: api all


--- a/docs/api.xsl
+++ b/docs/api.xsl
 <?xml version="1.0"?>
-<!-- this stylesheet builds the API*.html , it works based on libvir-refs.xml
+<!-- this stylesheet builds the API*.html , it works based on libvirt-refs.xml
  -->
 <xsl:stylesheet version="1.0"
  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -16,13 +16,13 @@
      doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>

  <xsl:variable name="href_base" select="''"/>
-  <xsl:variable name="apirefs" select="document('libvir-refs.xml')"/>
+  <xsl:variable name="apirefs" select="document('libvirt-refs.xml')"/>
  <xsl:variable name="module" select="$apirefs/apirefs/@name"/>
  <xsl:key name="refhref" match="reference" use="@name"/>

  <xsl:template match="ref" mode="anchor">
    <xsl:variable name="name" select="@name"/>
-    <xsl:for-each select="document('libvir-refs.xml')">
+    <xsl:for-each select="document('libvirt-refs.xml')">
 	<a href="{key('refhref', $name)/@href}"><xsl:value-of select="$name"/></a><br/>
    </xsl:for-each>
  </xsl:template>

--- a/docs/apibuild.py
+++ b/docs/apibuild.py
@@ -2074,12 +2074,12 @@ class docBuilder:
 def rebuild():
    builder = None
    if glob.glob("../src/libvir.c") != [] :
-        print "Rebuilding API description for libvir"
-	builder = docBuilder("libvir", ["../src", "../include"],
+        print "Rebuilding API description for libvirt"
+	builder = docBuilder("libvirt", ["../src", "../include"],
 	                     [])
-    elif glob.glob("src/parser.c") != [] :
+    elif glob.glob("src/libvir.c") != [] :
        print "Rebuilding API description for libvir"
-	builder = docBuilder("libvir", ["src", "include"],
+	builder = docBuilder("libvirt", ["src", "include"],
 	                     [])
    else:
        print "rebuild() failed, unable to guess the module"

--- a/docs/architecture.html
+++ b/docs/architecture.html
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /><link rel="stylesheet" type="text/css" href="libvir.css" /><link rel="SHORTCUT ICON" href="/32favicon.png" /><title>libvir architecture</title></head><body><div id="container"><div id="intro"><div id="adjustments"></div><div id="pageHeader"></div><div id="content2"><h1 class="style1">libvir architecture</h1><h3>This is Xen specific since this is the only hypervisor supported at the
+<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /><link rel="stylesheet" type="text/css" href="libvirt.css" /><link rel="SHORTCUT ICON" href="/32favicon.png" /><title>libvir architecture</title></head><body><div id="container"><div id="intro"><div id="adjustments"></div><div id="pageHeader"></div><div id="content2"><h1 class="style1">libvir architecture</h1><h3>This is Xen specific since this is the only hypervisor supported at the
 moment</h3><p>When running in a Xen environment, programs using libvir have to execute
 in "Domain 0", which is the primary Linux OS loaded on the machine. That OS
 kernel provides most if not all of the actual drivers used by the set of

--- a/docs/bugs.html
+++ b/docs/bugs.html
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /><link rel="stylesheet" type="text/css" href="libvir.css" /><link rel="SHORTCUT ICON" href="/32favicon.png" /><title>Reporting bugs and getting help</title></head><body><div id="container"><div id="intro"><div id="adjustments"></div><div id="pageHeader"></div><div id="content2"><h1 class="style1">Reporting bugs and getting help</h1><p>There is a mailing-list <a href="mailto:libvir-list@redhat.com">libvir-list@redhat.com</a> for libvir,
+<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /><link rel="stylesheet" type="text/css" href="libvirt.css" /><link rel="SHORTCUT ICON" href="/32favicon.png" /><title>Reporting bugs and getting help</title></head><body><div id="container"><div id="intro"><div id="adjustments"></div><div id="pageHeader"></div><div id="content2"><h1 class="style1">Reporting bugs and getting help</h1><p>There is a mailing-list <a href="mailto:libvir-list@redhat.com">libvir-list@redhat.com</a> for libvir,
 with an  <a href="https://www.redhat.com/archives/libvir-list/">on-line
 archive</a>. Please subscribe to this list before posting by visiting the <a href="https://www.redhat.com/mailman/listinfo/libvir-list">associated Web</a>
 page and follow the instructions. Patches with explanations and provided as

--- a/docs/downloads.html
+++ b/docs/downloads.html
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /><link rel="stylesheet" type="text/css" href="libvir.css" /><link rel="SHORTCUT ICON" href="/32favicon.png" /><title>Downloads</title></head><body><div id="container"><div id="intro"><div id="adjustments"></div><div id="pageHeader"></div><div id="content2"><h1 class="style1">Downloads</h1><p>The latest versions of libvir can be found on the  <a href="ftp://libvir.org/libvir/">libvir.org</a> server ( <a href="http://libvir.org/sources/">HTTP</a>, <a href="ftp://libvir.org/libvir/">FTP</a>). You will find there the released
+<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /><link rel="stylesheet" type="text/css" href="libvirt.css" /><link rel="SHORTCUT ICON" href="/32favicon.png" /><title>Downloads</title></head><body><div id="container"><div id="intro"><div id="adjustments"></div><div id="pageHeader"></div><div id="content2"><h1 class="style1">Downloads</h1><p>The latest versions of libvir can be found on the  <a href="ftp://libvir.org/libvir/">libvir.org</a> server ( <a href="http://libvir.org/sources/">HTTP</a>, <a href="ftp://libvir.org/libvir/">FTP</a>). You will find there the released
 versions as well as <a href="http://libvir.org/sources/libvir-cvs-snapshot.tar.gz">snapshot
 tarballs</a> updated from CVS head every hour</p><p>Anonymous <a href="http://ximbiot.com/cvs/cvshome/docs/">CVS</a> is also
 available, first register onto the server:</p><p><code>cvs -d :pserver:anoncvs@libvir.org:2401/data/cvs login</code></p><p>it will request a password, enter <strong>anoncvs</strong>. Then you can

--- a/docs/examples/Makefile.am
+++ b/docs/examples/Makefile.am
 # Beware this is autogenerated by index.py
 INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I@srcdir@/include
-DEPS = $(top_builddir)/src/libvir.la
-LDADDS = @STATIC_BINARIES@ $(top_builddir)/src/libvir.la 
+DEPS = $(top_builddir)/src/libvirt.la
+LDADDS = @STATIC_BINARIES@ $(top_builddir)/src/libvirt.la 

 rebuild: examples.xml index.html


--- a/docs/examples/examples.xml
+++ b/docs/examples/examples.xml
@@ -10,12 +10,12 @@
    <includes>
    </includes>
    <uses>
-      <function line='43' file='libvir' name='virDomainGetInfo'/>
-      <function line='53' file='libvir' name='virDomainFree'/>
-      <function line='36' file='libvir' name='virDomainLookupByID'/>
-      <function line='55' file='libvir' name='virConnectClose'/>
-      <struct line='25' file='libvir' name='virDomainInfo'/>
-      <function line='29' file='libvir' name='virConnectOpenReadOnly'/>
+      <function line='43' file='libvirt' name='virDomainGetInfo'/>
+      <function line='53' file='libvirt' name='virDomainFree'/>
+      <function line='36' file='libvirt' name='virDomainLookupByID'/>
+      <function line='55' file='libvirt' name='virConnectClose'/>
+      <struct line='25' file='libvirt' name='virDomainInfo'/>
+      <function line='29' file='libvirt' name='virConnectOpenReadOnly'/>
    </uses>
  </example>
  <symbols>

--- a/docs/examples/index.py
+++ b/docs/examples/index.py
@@ -28,10 +28,10 @@ def load_api():
        return
    api_dict = {}
    try:
-        print "loading ../libvir-api.xml"
-        api_doc = libxml2.parseFile("../libvir-api.xml")
+        print "loading ../libvirt-api.xml"
+        api_doc = libxml2.parseFile("../libvirt-api.xml")
    except:
-        print "failed to parse ../libvir-api.xml"
+        print "failed to parse ../libvirt-api.xml"
 	sys.exit(1)

 def find_symbol(name):
@@ -222,8 +222,8 @@ def dump_Makefile():
        extras.append(file)
    Makefile="""# Beware this is autogenerated by index.py
 INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I@srcdir@/include
-DEPS = $(top_builddir)/src/libvir.la
-LDADDS = @STATIC_BINARIES@ $(top_builddir)/src/libvir.la 
+DEPS = $(top_builddir)/src/libvirt.la
+LDADDS = @STATIC_BINARIES@ $(top_builddir)/src/libvirt.la 

 rebuild: examples.xml index.html


--- a/docs/examples/info1.c
+++ b/docs/examples/info1.c
@@ -10,7 +10,7 @@
 */

 #include <stdio.h>
-#include <libvir.h>
+#include <libvirt.h>

 /**
 * getDomainInfo:

--- a/docs/html/book1.html
+++ b/docs/html/book1.html
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /><link rel="stylesheet" type="text/css" href="../libvir.css" /><link rel="SHORTCUT ICON" href="/32favicon.png" /><title>Reference Manual for libvir</title></head><body><div id="container"><div id="intro"><div id="adjustments"></div><div id="pageHeader"></div><div id="content2"><h1 class="style1">Reference Manual for libvir</h1><h2>Table of Contents</h2><ul><li><a href="libvir-libvir.html">libvir</a>: core interfaces for the libvir library</li></ul></div></div><div class="linkList2"><div class="llinks2"><h3 class="links2"><span>main menu</span></h3><ul><li><a href="../index.html">Home</a></li><li><a style="font-weight:bold" href="../html/index.html">API Menu</a></li><li><a href="../ChangeLog.html">Recent Changes</a></li></ul></div><div class="llinks2"><h3 class="links2"><span>related links</span></h3><ul><li><a href="https://www.redhat.com/archives/libvir-list/">Mail archive</a></li><li><a href="http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html">Xen project</a></li><li><form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><input name="query" type="text" size="12" value="Search..." /><input name="submit" type="submit" value="Go" /></form></li><li><a href="http://xmlsoft.org/"><img src="../Libxml2-Logo-90x34.gif" alt="Made with Libxml2 Logo" /></a></li></ul><p class="credits">Graphics and design by <a href="mail:dfong@redhat.com">Diana Fong</a></p></div></div><div id="bottom"><p class="p1"></p></div></div></body></html>
+<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /><link rel="stylesheet" type="text/css" href="../libvirt.css" /><link rel="SHORTCUT ICON" href="/32favicon.png" /><title>Reference Manual for libvir</title></head><body><div id="container"><div id="intro"><div id="adjustments"></div><div id="pageHeader"></div><div id="content2"><h1 class="style1">Reference Manual for libvir</h1><h2>Table of Contents</h2><ul><li><a href="libvirt-libvir.html">libvir</a>: core interfaces for the libvir library</li></ul></div></div><div class="linkList2"><div class="llinks2"><h3 class="links2"><span>main menu</span></h3><ul><li><a href="../index.html">Home</a></li><li><a style="font-weight:bold" href="../html/index.html">API Menu</a></li><li><a href="../ChangeLog.html">Recent Changes</a></li></ul></div><div class="llinks2"><h3 class="links2"><span>related links</span></h3><ul><li><a href="https://www.redhat.com/archives/libvir-list/">Mail archive</a></li><li><a href="http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html">Xen project</a></li><li><form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><input name="query" type="text" size="12" value="Search..." /><input name="submit" type="submit" value="Go" /></form></li><li><a href="http://xmlsoft.org/"><img src="../Libxml2-Logo-90x34.gif" alt="Made with Libxml2 Logo" /></a></li></ul><p class="credits">Graphics and design by <a href="mail:dfong@redhat.com">Diana Fong</a></p></div></div><div id="bottom"><p class="p1"></p></div></div></body></html>
--- a/docs/html/index.html
+++ b/docs/html/index.html
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /><link rel="stylesheet" type="text/css" href="../libvir.css" /><link rel="SHORTCUT ICON" href="/32favicon.png" /><title>Reference Manual for libvir</title></head><body><div id="container"><div id="intro"><div id="adjustments"></div><div id="pageHeader"></div><div id="content2"><h1 class="style1">Reference Manual for libvir</h1><h2>Table of Contents</h2><ul><li><a href="libvir-libvir.html">libvir</a>: core interfaces for the libvir library</li></ul></div></div><div class="linkList2"><div class="llinks2"><h3 class="links2"><span>main menu</span></h3><ul><li><a href="../index.html">Home</a></li><li><a style="font-weight:bold" href="../html/index.html">API Menu</a></li><li><a href="../ChangeLog.html">Recent Changes</a></li></ul></div><div class="llinks2"><h3 class="links2"><span>related links</span></h3><ul><li><a href="https://www.redhat.com/archives/libvir-list/">Mail archive</a></li><li><a href="http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html">Xen project</a></li><li><form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><input name="query" type="text" size="12" value="Search..." /><input name="submit" type="submit" value="Go" /></form></li><li><a href="http://xmlsoft.org/"><img src="../Libxml2-Logo-90x34.gif" alt="Made with Libxml2 Logo" /></a></li></ul><p class="credits">Graphics and design by <a href="mail:dfong@redhat.com">Diana Fong</a></p></div></div><div id="bottom"><p class="p1"></p></div></div></body></html>
+<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /><link rel="stylesheet" type="text/css" href="../libvirt.css" /><link rel="SHORTCUT ICON" href="/32favicon.png" /><title>Reference Manual for libvir</title></head><body><div id="container"><div id="intro"><div id="adjustments"></div><div id="pageHeader"></div><div id="content2"><h1 class="style1">Reference Manual for libvir</h1><h2>Table of Contents</h2><ul><li><a href="libvirt-libvir.html">libvir</a>: core interfaces for the libvir library</li></ul></div></div><div class="linkList2"><div class="llinks2"><h3 class="links2"><span>main menu</span></h3><ul><li><a href="../index.html">Home</a></li><li><a style="font-weight:bold" href="../html/index.html">API Menu</a></li><li><a href="../ChangeLog.html">Recent Changes</a></li></ul></div><div class="llinks2"><h3 class="links2"><span>related links</span></h3><ul><li><a href="https://www.redhat.com/archives/libvir-list/">Mail archive</a></li><li><a href="http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html">Xen project</a></li><li><form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><input name="query" type="text" size="12" value="Search..." /><input name="submit" type="submit" value="Go" /></form></li><li><a href="http://xmlsoft.org/"><img src="../Libxml2-Logo-90x34.gif" alt="Made with Libxml2 Logo" /></a></li></ul><p class="credits">Graphics and design by <a href="mail:dfong@redhat.com">Diana Fong</a></p></div></div><div id="bottom"><p class="p1"></p></div></div></body></html>
--- a/docs/index.html
+++ b/docs/index.html
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-    <link rel="stylesheet" type="text/css" href="libvir.css" />
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+    <link rel="stylesheet" type="text/css" href="libvirt.css" />
    <link rel="SHORTCUT ICON" href="/32favicon.png" />
    <title>the virtualization API</title>
  </head>

--- a/docs/intro.html
+++ b/docs/intro.html
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /><link rel="stylesheet" type="text/css" href="libvir.css" /><link rel="SHORTCUT ICON" href="/32favicon.png" /><title>Introduction</title></head><body><div id="container"><div id="intro"><div id="adjustments"></div><div id="pageHeader"></div><div id="content2"><h1 class="style1">Introduction</h1><p>Libvir is a C toolkit to interact with the virtualization capabilities of
+<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /><link rel="stylesheet" type="text/css" href="libvirt.css" /><link rel="SHORTCUT ICON" href="/32favicon.png" /><title>Introduction</title></head><body><div id="container"><div id="intro"><div id="adjustments"></div><div id="pageHeader"></div><div id="content2"><h1 class="style1">Introduction</h1><p>Libvir is a C toolkit to interact with the virtualization capabilities of
 recent versions of Linux (and other OSes), but libvir won't try to provide
 all possible interfaces for interacting with the virtualization features.</p><p>To avoid ambiguity about the terms used here here are the definitions for
 some of the specific concepts used in libvir documentation:</p><ul><li>a <strong>node</strong> is a single physical machine</li>

--- a/docs/libvir.css
+++ b/docs/libvir.css
--- a/docs/libvirtHeader.png
+++ b/docs/libvirtHeader.png
--- a/docs/libvirtLogo.png
+++ b/docs/libvirtLogo.png
--- a/docs/madeWith.png
+++ b/docs/madeWith.png
--- a/docs/newapi.xsl
+++ b/docs/newapi.xsl
 <?xml version="1.0"?>
 <!--
  Stylesheet to generate the HTML documentation from an XML API descriptions:
-  xsltproc newapi.xsl libvir-api.xml
+  xsltproc newapi.xsl libvirt-api.xml

  Daniel Veillard
 -->
@@ -34,16 +34,16 @@
           cellpadding="2" cellspacing="2">
      <tr valign="middle">
        <xsl:if test="$previous">
-          <td><a accesskey="p" href="libvir-{$previous/@name}.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></img></a></td>
-	  <th align="left"><a href="libvir-{$previous/@name}.html"><xsl:value-of select="$previous/@name"/></a></th>
+          <td><a accesskey="p" href="libvirt-{$previous/@name}.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></img></a></td>
+	  <th align="left"><a href="libvirt-{$previous/@name}.html"><xsl:value-of select="$previous/@name"/></a></th>
 	</xsl:if>
        <td><a accesskey="u" href="index.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></img></a></td>
 	<th align="left"><a href="index.html">API documentation</a></th>
        <td><a accesskey="h" href="../index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></img></a></td>
        <th align="center"><a href="../index.html">The virtualization API</a></th>
        <xsl:if test="$next">
-	  <th align="right"><a href="libvir-{$next/@name}.html"><xsl:value-of select="$next/@name"/></a></th>
-          <td><a accesskey="n" href="libvir-{$next/@name}.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></img></a></td>
+	  <th align="right"><a href="libvirt-{$next/@name}.html"><xsl:value-of select="$next/@name"/></a></th>
+          <td><a accesskey="n" href="libvirt-{$next/@name}.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></img></a></td>
        </xsl:if>
      </tr>
    </table>
@@ -57,7 +57,7 @@
    <xsl:variable name="ref" select="key('symbols', $token)"/>
    <xsl:choose>
      <xsl:when test="$ref">
-        <a href="libvir-{$ref/@file}.html#{$ref/@name}"><xsl:value-of select="$token"/></a>
+        <a href="libvirt-{$ref/@file}.html#{$ref/@name}"><xsl:value-of select="$token"/></a>
      </xsl:when>
      <xsl:otherwise>
        <xsl:value-of select="$token"/>
@@ -497,7 +497,7 @@
  <xsl:template match="file">
    <xsl:variable name="name" select="@name"/>
    <xsl:variable name="title">Module <xsl:value-of select="$name"/> from <xsl:value-of select="/api/@name"/></xsl:variable>
-    <xsl:document href="{$htmldir}/libvir-{$name}.html" method="xml" encoding="ISO-8859-1"
+    <xsl:document href="{$htmldir}/libvirt-{$name}.html" method="xml" encoding="ISO-8859-1"
      doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN"
      doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
      <html>
@@ -579,7 +579,7 @@
  <xsl:template match="file" mode="toc">
    <xsl:variable name="name" select="@name"/>
    <li>
-      <a href="libvir-{$name}.html"><xsl:value-of select="$name"/></a>
+      <a href="libvirt-{$name}.html"><xsl:value-of select="$name"/></a>
      <xsl:text>: </xsl:text>
      <xsl:value-of select="summary"/>
    </li>
@@ -628,7 +628,7 @@
      <xsl:with-param name="file" select="concat($htmldir, '/book1.html')"/>
    </xsl:call-template>
    <xsl:call-template name="mainpage">
-      <xsl:with-param name="file" select="concat($htmldir, '/libvir-lib.html')"/>
+      <xsl:with-param name="file" select="concat($htmldir, '/libvirt-lib.html')"/>
    </xsl:call-template>
    <!-- now build the file for each of the modules -->
    <xsl:apply-templates select="/api/files/file"/>

--- a/docs/news.html
+++ b/docs/news.html
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /><link rel="stylesheet" type="text/css" href="libvir.css" /><link rel="SHORTCUT ICON" href="/32favicon.png" /><title>Releases</title></head><body><div id="container"><div id="intro"><div id="adjustments"></div><div id="pageHeader"></div><div id="content2"><h1 class="style1">Releases</h1><p>Here is the list of official releases, however since it is early on in the
+<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /><link rel="stylesheet" type="text/css" href="libvirt.css" /><link rel="SHORTCUT ICON" href="/32favicon.png" /><title>Releases</title></head><body><div id="container"><div id="intro"><div id="adjustments"></div><div id="pageHeader"></div><div id="content2"><h1 class="style1">Releases</h1><p>Here is the list of official releases, however since it is early on in the
 development of libvir, it is preferable when possible to just use the <a href="downloads.html">CVS version or snapshot</a>, contact the mailing list
 and check the <a href="ChangeLog.html">ChangeLog</a> to gauge progresses.</p><h3>0.0.2: Jan 29 2006</h3><ul><li>Update of the documentation, web site redesign (Diana Fong)</li>
  <li>integration of HTTP xend RPC based on libxend by Anthony Liquori for

--- a/docs/news.xsl
+++ b/docs/news.xsl
@@ -6,10 +6,10 @@

  <xsl:template match="/">
    <xsl:text>
-        NEWS file for libvir
+        NEWS file for libvirt

  Note that this is automatically generated from the news webpage at:
-       http://libvir.org/news.html
+       http://libvirt.org/news.html

 </xsl:text>
    <xsl:apply-templates select="//xhtml:div[@id='content2']//xhtml:h3[1]/.."/>

--- a/docs/site.xsl
+++ b/docs/site.xsl
@@ -386,7 +386,7 @@
 - Write the styles in the head
 -->
  <xsl:template name="style">
-    <link rel="stylesheet" type="text/css" href="{$href_base}libvir.css" />
+    <link rel="stylesheet" type="text/css" href="{$href_base}libvirt.css" />
    <link rel="SHORTCUT ICON" href="/32favicon.png" />
  </xsl:template>

@@ -395,7 +395,7 @@
 -->
  <xsl:template name="top">
    <div id="top">
-      <img src="{$href_base}libvirHeader.png" alt="Libvir the virtualization API" />
+      <img src="{$href_base}libvirtHeader.png" alt="Libvirt the virtualization API" />
    </div>
  </xsl:template>

@@ -404,7 +404,7 @@
 -->
  <xsl:template name="topmain">
    <div id="topmain">
-      <img src="{$href_base}libvirLogo.png" alt="Libvir the virtualization API" />
+      <img src="{$href_base}libvirtLogo.png" alt="Libvirt the virtualization API" />
    </div>
  </xsl:template>


--- a/include/Makefile.am
+++ b/include/Makefile.am
 ## Process this file with automake to produce Makefile.in

-virincdir = $(includedir)/libvir
+virincdir = $(includedir)/libvirt

-virinc_HEADERS = libvir.h
+virinc_HEADERS = libvirt.h

 install-exec-hook:
 	$(mkinstalldirs) $(DESTDIR)$(virincdir)

-EXTRA_DIST = libvir.h.in
+EXTRA_DIST = libvirt.h.in
--- a/include/libvir.h
+++ b/include/libvir.h
 /*
- * libvir.h:
- * Summary: core interfaces for the libvir library
- * Description: Provides the interfaces of the libvir library to handle
+ * libvirt.h:
+ * Summary: core interfaces for the libvirt library
+ * Description: Provides the interfaces of the libvirt library to handle
 *              Xen domains from a process running in domain 0
 *
- * Copy:  Copyright (C) 2005 Red Hat, Inc.
+ * Copy:  Copyright (C) 2005,2006 Red Hat, Inc.
 *
 * See COPYING.LIB for the License of this software
 *
@@ -167,7 +167,7 @@ typedef enum {
 * version * 1,000,000 + minor * 1000 + micro
 */

-#define LIBVIR_VERSION_NUMBER 2
+#define LIBVIR_VERSION_NUMBER 3

 int			virGetVersion		(unsigned long *libVer,
 						 const char *type,

--- a/include/libvir.h.in
+++ b/include/libvir.h.in
 /*
- * libvir.h:
- * Summary: core interfaces for the libvir library
- * Description: Provides the interfaces of the libvir library to handle
+ * libvirt.h:
+ * Summary: core interfaces for the libvirt library
+ * Description: Provides the interfaces of the libvirt library to handle
 *              Xen domains from a process running in domain 0
 *
- * Copy:  Copyright (C) 2005 Red Hat, Inc.
+ * Copy:  Copyright (C) 2005,2006 Red Hat, Inc.
 *
 * See COPYING.LIB for the License of this software
 *

--- a/include/libvirt/Makefile.am
+++ b/include/libvirt/Makefile.am
 ## Process this file with automake to produce Makefile.in

-virincdir = $(includedir)/libvir
+virincdir = $(includedir)/libvirt

-virinc_HEADERS = libvir.h
+virinc_HEADERS = libvirt.h

 install-exec-hook:
 	$(mkinstalldirs) $(DESTDIR)$(virincdir)

-EXTRA_DIST = libvir.h.in
+EXTRA_DIST = libvirt.h.in
--- a/include/libvirt/libvirt.h
+++ b/include/libvirt/libvirt.h
+/*
+ * libvirt.h:
+ * Summary: core interfaces for the libvirt library
+ * Description: Provides the interfaces of the libvirt library to handle
+ *              Xen domains from a process running in domain 0
+ *
+ * Copy:  Copyright (C) 2005,2006 Red Hat, Inc.
+ *
+ * See COPYING.LIB for the License of this software
+ *
+ * Author: Daniel Veillard <veillard@redhat.com>
+ */
+
+#ifndef __VIR_VIRLIB_H__
+#define __VIR_VIRLIB_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * virConnect:
+ *
+ * a virConnect is a private structure representing a connection to
+ * the Xen Hypervisor.
+ */
+typedef struct _virConnect virConnect;
+
+/**
+ * virConnectPtr:
+ *
+ * a virConnectPtr is pointer to a virConnect private structure, this is the
+ * type used to reference a connection to the Xen Hypervisor in the API.
+ */
+typedef virConnect *virConnectPtr;
+
+/**
+ * virDomain:
+ *
+ * a virDomain is a private structure representing a Xen domain.
+ */
+typedef struct _virDomain virDomain;
+
+/**
+ * virDomainPtr:
+ *
+ * a virDomainPtr is pointer to a virDomain private structure, this is the
+ * type used to reference a Xen domain in the API.
+ */
+typedef virDomain *virDomainPtr;
+
+/**
+ * virDomainState:
+ *
+ * A domain may be in different states at a given point in time
+ */
+typedef enum {
+     VIR_DOMAIN_NOSTATE	= 0, /* no state */
+     VIR_DOMAIN_RUNNING	= 1, /* the domain is running */
+     VIR_DOMAIN_BLOCKED	= 2, /* the domain is blocked on resource */
+     VIR_DOMAIN_PAUSED	= 3, /* the domain is paused by user */
+     VIR_DOMAIN_SHUTDOWN= 4, /* the domain is being shut down */
+     VIR_DOMAIN_SHUTOFF	= 5, /* the domain is shut off */
+     VIR_DOMAIN_CRASHED = 6  /* the domain is crashed */
+} virDomainState;
+
+/**
+ * virDomainRestart:
+ *
+ * Flags that determine the action to take on a shutdown or crash of a domain
+ */
+typedef enum {
+     VIR_DOMAIN_DESTROY	= 1, /* destroy the domain */
+     VIR_DOMAIN_RESTART	= 2, /* restart the domain */
+     VIR_DOMAIN_PRESERVE= 3, /* keep as is, need manual destroy, for debug */
+     VIR_DOMAIN_RENAME_RESTART= 4/* restart under an new unique name */
+} virDomainRestart;
+
+/**
+ * virDeviceMode:
+ *
+ * Flags that determine permission to expose a device to the guest
+ */
+typedef enum {
+     VIR_DEVICE_DEFAULT	= 0, /* Default mode */
+     VIR_DEVICE_RO	= 1, /* Access read-only */
+     VIR_DEVICE_RW	= 2, /* Access read-write */
+     VIR_DEVICE_RW_FORCE= 3  /* Forced read-write even if already used */
+} virDeviceMode;
+
+/**
+ * virDomainInfoPtr:
+ *
+ * a virDomainInfo is a structure filled by virDomainGetInfo()
+ */
+
+typedef struct _virDomainInfo virDomainInfo;
+
+struct _virDomainInfo {
+    unsigned char state;	/* the running state, one of virDomainFlags */
+    unsigned long maxMem;	/* the maximum memory in KBytes allowed */
+    unsigned long memory;	/* the memory in KBytes used by the domain */
+    unsigned short nrVirtCpu;	/* the number of virtual CPUs for the domain */
+
+    /*
+     * Informations below are only available to clients with a connection
+     * with full access to the hypervisor
+     */
+    unsigned long long cpuTime;	/* the CPU time used in nanoseconds */
+    
+    /*
+     * TODO:
+     * - check what can be extracted publicly from xenstore
+     *   and what's private limited to the hypervisor call.
+     * - add padding to this structure for ABI long term protection
+     */
+};
+
+/**
+ * virDomainInfoPtr:
+ *
+ * a virDomainInfoPtr is a pointer to a virDomainInfo structure.
+ */
+
+typedef virDomainInfo *virDomainInfoPtr;
+
+/**
+ * virDomainKernel:
+ *
+ * a virDomainImage is the set of kernel related informations associated
+ * to a domain
+ */
+
+typedef struct _virDomainKernel virDomainKernel;
+
+struct _virDomainKernel {
+    const char *kernel;		/* filename pointing to the kernel image */
+    const char *ramdisk;	/* an optional init ramdisk */
+    const char *root;		/* an optional root block device */
+    const char *extra;		/* optional kernel command line parameters */
+};
+
+/**
+ * virDomainKernelPtr:
+ *
+ * a virDomainKernelPtr is a pointer to a virDomainKernel structure.
+ */
+
+typedef virDomainKernel *virDomainKernelPtr;
+
+/**
+ * virDomainCreateFlags:
+ *
+ * Flags OR'ed together to provide specific behaviour when creating a
+ * Domain.
+ */
+typedef enum {
+     VIR_DOMAIN_NONE = 0
+} virDomainCreateFlags;
+
+/* library versionning */
+
+/**
+ * LIBVIR_VERSION_NUMBER:
+ *
+ * Macro providing the version of the library as 
+ * version * 1,000,000 + minor * 1000 + micro
+ */
+
+#define LIBVIR_VERSION_NUMBER 3
+
+int			virGetVersion		(unsigned long *libVer,
+						 const char *type,
+						 unsigned long *typeVer);
+
+/*
+ * Connection and disconnections to the Hypervisor
+ */
+virConnectPtr		virConnectOpen		(const char *name);
+virConnectPtr		virConnectOpenReadOnly	(const char *name);
+int			virConnectClose		(virConnectPtr conn);
+const char *		virConnectGetType	(virConnectPtr conn);
+int			virConnectGetVersion	(virConnectPtr conn,
+						 unsigned long *hvVer);
+
+/*
+ * Gather list of running domains
+ */
+int			virConnectListDomains	(virConnectPtr conn,
+						 int *ids,
+						 int maxids);
+
+/*
+ * Number of domains
+ */
+int			virConnectNumOfDomains	(virConnectPtr conn);
+
+
+/*
+ * Domain creation and destruction
+ */
+virDomainPtr		virDomainCreateLinux	(virConnectPtr conn,
+						 const char *kernel_path,
+						 const char *initrd_path,
+						 const char *cmdline,
+						 unsigned long memory,
+						 unsigned int flags);
+virDomainPtr		virDomainLookupByName	(virConnectPtr conn,
+						 const char *name);
+virDomainPtr		virDomainLookupByID	(virConnectPtr conn,
+						 int id);
+int			virDomainShutdown	(virDomainPtr domain);
+int			virDomainDestroy	(virDomainPtr domain);
+int			virDomainFree		(virDomainPtr domain);
+
+/*
+ * Domain suspend/resume
+ */
+int			virDomainSuspend	(virDomainPtr domain);
+int			virDomainResume		(virDomainPtr domain);
+
+/*
+ * Domain save/restore
+ */
+int			virDomainSave		(virDomainPtr domain,
+						 const char *to);
+int			virDomainRestore	(virConnectPtr conn,
+						 const char *from);
+
+/*
+ * Domain runtime informations
+ */
+int			virDomainGetInfo	(virDomainPtr domain,
+						 virDomainInfoPtr info);
+						 
+/*
+ * Dynamic control of domains
+ */
+const char *		virDomainGetName	(virDomainPtr domain);
+unsigned int		virDomainGetID		(virDomainPtr domain);
+char *			virDomainGetOSType	(virDomainPtr domain);
+unsigned long		virDomainGetMaxMemory	(virDomainPtr domain);
+int			virDomainSetMaxMemory	(virDomainPtr domain,
+						 unsigned long memory);
+/*
+ * XML domain description
+ */
+char *			virDomainGetXMLDesc	(virDomainPtr domain, int flags);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __VIR_VIRLIB_H__ */
--- a/include/libvirt/libvirt.h.in
+++ b/include/libvirt/libvirt.h.in
+/*
+ * libvirt.h:
+ * Summary: core interfaces for the libvirt library
+ * Description: Provides the interfaces of the libvirt library to handle
+ *              Xen domains from a process running in domain 0
+ *
+ * Copy:  Copyright (C) 2005,2006 Red Hat, Inc.
+ *
+ * See COPYING.LIB for the License of this software
+ *
+ * Author: Daniel Veillard <veillard@redhat.com>
+ */
+
+#ifndef __VIR_VIRLIB_H__
+#define __VIR_VIRLIB_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * virConnect:
+ *
+ * a virConnect is a private structure representing a connection to
+ * the Xen Hypervisor.
+ */
+typedef struct _virConnect virConnect;
+
+/**
+ * virConnectPtr:
+ *
+ * a virConnectPtr is pointer to a virConnect private structure, this is the
+ * type used to reference a connection to the Xen Hypervisor in the API.
+ */
+typedef virConnect *virConnectPtr;
+
+/**
+ * virDomain:
+ *
+ * a virDomain is a private structure representing a Xen domain.
+ */
+typedef struct _virDomain virDomain;
+
+/**
+ * virDomainPtr:
+ *
+ * a virDomainPtr is pointer to a virDomain private structure, this is the
+ * type used to reference a Xen domain in the API.
+ */
+typedef virDomain *virDomainPtr;
+
+/**
+ * virDomainState:
+ *
+ * A domain may be in different states at a given point in time
+ */
+typedef enum {
+     VIR_DOMAIN_NOSTATE	= 0, /* no state */
+     VIR_DOMAIN_RUNNING	= 1, /* the domain is running */
+     VIR_DOMAIN_BLOCKED	= 2, /* the domain is blocked on resource */
+     VIR_DOMAIN_PAUSED	= 3, /* the domain is paused by user */
+     VIR_DOMAIN_SHUTDOWN= 4, /* the domain is being shut down */
+     VIR_DOMAIN_SHUTOFF	= 5, /* the domain is shut off */
+     VIR_DOMAIN_CRASHED = 6  /* the domain is crashed */
+} virDomainState;
+
+/**
+ * virDomainRestart:
+ *
+ * Flags that determine the action to take on a shutdown or crash of a domain
+ */
+typedef enum {
+     VIR_DOMAIN_DESTROY	= 1, /* destroy the domain */
+     VIR_DOMAIN_RESTART	= 2, /* restart the domain */
+     VIR_DOMAIN_PRESERVE= 3, /* keep as is, need manual destroy, for debug */
+     VIR_DOMAIN_RENAME_RESTART= 4/* restart under an new unique name */
+} virDomainRestart;
+
+/**
+ * virDeviceMode:
+ *
+ * Flags that determine permission to expose a device to the guest
+ */
+typedef enum {
+     VIR_DEVICE_DEFAULT	= 0, /* Default mode */
+     VIR_DEVICE_RO	= 1, /* Access read-only */
+     VIR_DEVICE_RW	= 2, /* Access read-write */
+     VIR_DEVICE_RW_FORCE= 3  /* Forced read-write even if already used */
+} virDeviceMode;
+
+/**
+ * virDomainInfoPtr:
+ *
+ * a virDomainInfo is a structure filled by virDomainGetInfo()
+ */
+
+typedef struct _virDomainInfo virDomainInfo;
+
+struct _virDomainInfo {
+    unsigned char state;	/* the running state, one of virDomainFlags */
+    unsigned long maxMem;	/* the maximum memory in KBytes allowed */
+    unsigned long memory;	/* the memory in KBytes used by the domain */
+    unsigned short nrVirtCpu;	/* the number of virtual CPUs for the domain */
+
+    /*
+     * Informations below are only available to clients with a connection
+     * with full access to the hypervisor
+     */
+    unsigned long long cpuTime;	/* the CPU time used in nanoseconds */
+    
+    /*
+     * TODO:
+     * - check what can be extracted publicly from xenstore
+     *   and what's private limited to the hypervisor call.
+     * - add padding to this structure for ABI long term protection
+     */
+};
+
+/**
+ * virDomainInfoPtr:
+ *
+ * a virDomainInfoPtr is a pointer to a virDomainInfo structure.
+ */
+
+typedef virDomainInfo *virDomainInfoPtr;
+
+/**
+ * virDomainKernel:
+ *
+ * a virDomainImage is the set of kernel related informations associated
+ * to a domain
+ */
+
+typedef struct _virDomainKernel virDomainKernel;
+
+struct _virDomainKernel {
+    const char *kernel;		/* filename pointing to the kernel image */
+    const char *ramdisk;	/* an optional init ramdisk */
+    const char *root;		/* an optional root block device */
+    const char *extra;		/* optional kernel command line parameters */
+};
+
+/**
+ * virDomainKernelPtr:
+ *
+ * a virDomainKernelPtr is a pointer to a virDomainKernel structure.
+ */
+
+typedef virDomainKernel *virDomainKernelPtr;
+
+/**
+ * virDomainCreateFlags:
+ *
+ * Flags OR'ed together to provide specific behaviour when creating a
+ * Domain.
+ */
+typedef enum {
+     VIR_DOMAIN_NONE = 0
+} virDomainCreateFlags;
+
+/* library versionning */
+
+/**
+ * LIBVIR_VERSION_NUMBER:
+ *
+ * Macro providing the version of the library as 
+ * version * 1,000,000 + minor * 1000 + micro
+ */
+
+#define LIBVIR_VERSION_NUMBER @LIBVIR_VERSION_NUMBER@
+
+int			virGetVersion		(unsigned long *libVer,
+						 const char *type,
+						 unsigned long *typeVer);
+
+/*
+ * Connection and disconnections to the Hypervisor
+ */
+virConnectPtr		virConnectOpen		(const char *name);
+virConnectPtr		virConnectOpenReadOnly	(const char *name);
+int			virConnectClose		(virConnectPtr conn);
+const char *		virConnectGetType	(virConnectPtr conn);
+int			virConnectGetVersion	(virConnectPtr conn,
+						 unsigned long *hvVer);
+
+/*
+ * Gather list of running domains
+ */
+int			virConnectListDomains	(virConnectPtr conn,
+						 int *ids,
+						 int maxids);
+
+/*
+ * Number of domains
+ */
+int			virConnectNumOfDomains	(virConnectPtr conn);
+
+
+/*
+ * Domain creation and destruction
+ */
+virDomainPtr		virDomainCreateLinux	(virConnectPtr conn,
+						 const char *kernel_path,
+						 const char *initrd_path,
+						 const char *cmdline,
+						 unsigned long memory,
+						 unsigned int flags);
+virDomainPtr		virDomainLookupByName	(virConnectPtr conn,
+						 const char *name);
+virDomainPtr		virDomainLookupByID	(virConnectPtr conn,
+						 int id);
+int			virDomainShutdown	(virDomainPtr domain);
+int			virDomainDestroy	(virDomainPtr domain);
+int			virDomainFree		(virDomainPtr domain);
+
+/*
+ * Domain suspend/resume
+ */
+int			virDomainSuspend	(virDomainPtr domain);
+int			virDomainResume		(virDomainPtr domain);
+
+/*
+ * Domain save/restore
+ */
+int			virDomainSave		(virDomainPtr domain,
+						 const char *to);
+int			virDomainRestore	(virConnectPtr conn,
+						 const char *from);
+
+/*
+ * Domain runtime informations
+ */
+int			virDomainGetInfo	(virDomainPtr domain,
+						 virDomainInfoPtr info);
+						 
+/*
+ * Dynamic control of domains
+ */
+const char *		virDomainGetName	(virDomainPtr domain);
+unsigned int		virDomainGetID		(virDomainPtr domain);
+char *			virDomainGetOSType	(virDomainPtr domain);
+unsigned long		virDomainGetMaxMemory	(virDomainPtr domain);
+int			virDomainSetMaxMemory	(virDomainPtr domain,
+						 unsigned long memory);
+/*
+ * XML domain description
+ */
+char *			virDomainGetXMLDesc	(virDomainPtr domain, int flags);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __VIR_VIRLIB_H__ */
--- a/libvir.pc.in
+++ b/libvir.pc.in
--- a/libvir.spec.in
+++ b/libvir.spec.in
 Summary: Library providing an API to use the Xen virtualization
-Name: libvir
+Name: libvirt
 Version: @VERSION@
 Release: 1
 License: LGPL
 Group: Development/Libraries
-Source: libvir-%{version}.tar.gz
+Source: libvirt-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://libvir.org/
 BuildRequires: xen python python-devel
 Requires: xen
+Obsoletes: libvir
 ExclusiveArch: i386 x86_64

 %description
@@ -16,24 +17,26 @@ This C library provides an API to use the Xen virtualization framework,
 and the virsh command line tool to control virtual domains.

 %package devel
-Summary: Libraries, includes, etc. to compile with the libvir library
+Summary: Libraries, includes, etc. to compile with the libvirt library
 Group: Development/Libraries
-Requires: libvir = %{version}
+Requires: libvirt = %{version}
+Obsoletes: libvir-devel

 %description devel
-Includes and documantations for the C library providing an API to use
+Includes and documentations for the C library providing an API to use
 the Xen virtualization framework

 %package python
-Summary: Python bindings for the libvir library
+Summary: Python bindings for the libvirt library
 Group: Development/Libraries
-Requires: libvir = %{version}
+Requires: libvirt = %{version}
+Obsoletes: libvir-python
 Requires: %{_libdir}/python%(echo `python -c "import sys; print sys.version[0:3]"`)

 %description python
-The libvir-python package contains a module that permits applications
+The libvirt-python package contains a module that permits applications
 written in the Python programming language to use the interface
-supplied by the libvir library to use the Xen virtualization framework.
+supplied by the libvirt library to use the Xen virtualization framework.

 %prep
 %setup -q
@@ -71,22 +74,26 @@ rm -fr %{buildroot}
 %defattr(-, root, root)

 %{_libdir}/lib*.so
-%{_includedir}/libvir/*.h
-%{_libdir}/pkgconfig/libvir.pc
+%{_includedir}/libvirt/*.h
+%{_libdir}/pkgconfig/libvirt.pc

 %doc docs/*.html docs/html docs/*.gif
-%doc docs/libvir-api.xml
+%doc docs/libvirt-api.xml

 %files python
 %defattr(-, root, root)

 %doc AUTHORS NEWS README COPYING.LIB
-%{_libdir}/python*/site-packages/libvir.py*
-%{_libdir}/python*/site-packages/libvirmod*
+%{_libdir}/python*/site-packages/libvirt.py*
+%{_libdir}/python*/site-packages/libvirtmod*
 %doc python/TODO
-%doc python/libvirclass.txt
+%doc python/libvirtclass.txt

 %changelog
+* Wed Feb  8 2006 Daniel Veillard <veillard@redhat.com> 0.0.3-1
+- changed library name to libvirt from libvir, complete and test the python 
+  bindings
+
 * Sun Jan 29 2006 Daniel Veillard <veillard@redhat.com> 0.0.2-1
 - upstream release of 0.0.2, use xend, save and restore added, python bindings
  fixed

--- a/python/Makefile.am
+++ b/python/Makefile.am
-# Makefile for libvir python library
+# Makefile for libvirt python library

 INCLUDES = \
        -I$(PYTHON_INCLUDES) \
@@ -6,7 +6,7 @@ INCLUDES = \
 	-I$(top_builddir)/include \
 	-I$(top_builddir)/$(subdir)

-DOCS_DIR = $(datadir)/doc/libvir-python-$(LIBVIR_VERSION)
+DOCS_DIR = $(datadir)/doc/libvirt-python-$(LIBVIR_VERSION)

 DOCS = ${srcdir}/TODO

@@ -14,40 +14,40 @@ EXTRA_DIST =		\
 	libvir.c	\
 	types.c		\
 	generator.py	\
-	libvir_wrap.h	\
-	libvir.py	\
-	libvir-python-api.xml \
+	libvirt_wrap.h	\
+	libvirt.py	\
+	libvirt-python-api.xml \
 	$(DOCS)

-libvirmod_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/.libs
+libvirtmod_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/.libs

 if WITH_PYTHON
-mylibs = $(top_builddir)/src/libvir.la
+mylibs = $(top_builddir)/src/libvirt.la

-all-local: libvir.py
+all-local: libvirt.py

-python_LTLIBRARIES = libvirmod.la
+python_LTLIBRARIES = libvirtmod.la

-libvirmod_la_SOURCES = libvir.c types.c libvir-py.c
-libvirmod_la_LIBADD = $(mylibs) 
+libvirtmod_la_SOURCES = libvir.c types.c libvirt-py.c libvirt-py.h
+libvirtmod_la_LIBADD = $(mylibs) 


 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(pythondir)
-	@INSTALL@ -m 0644 libvir.py $(DESTDIR)$(pythondir)
+	@INSTALL@ -m 0644 libvirt.py $(DESTDIR)$(pythondir)
 	$(mkinstalldirs) $(DESTDIR)$(DOCS_DIR)
 	@(for doc in $(DOCS) ; \
 	   do @INSTALL@ -m 0644 $$doc $(DESTDIR)$(DOCS_DIR) ; done)

 GENERATE = generator.py
-API_DESC = $(top_srcdir)/docs/libvir-api.xml $(srcdir)/libvir-python-api.xml
-GENERATED= libvir.py \
-           libvir-export.c \
-           libvirclass.txt \
-	   libvir-py.c \
-	   libvir-py.h
+API_DESC = $(top_srcdir)/docs/libvirt-api.xml $(srcdir)/libvirt-python-api.xml
+GENERATED= libvirt.py \
+           libvirt-export.c \
+           libvirtclass.txt \
+	   libvirt-py.c \
+	   libvirt-py.h

-CLEANFILES= $(GENERATED) gen_prog libvir.py
+CLEANFILES= $(GENERATED) gen_prog libvirt.py

 $(GENERATED): gen_prog

@@ -55,7 +55,7 @@ gen_prog: $(srcdir)/$(GENERATE) $(API_DESC)
 	$(PYTHON) $(srcdir)/$(GENERATE) $(srcdir)
 	touch gen_prog

-$(libvirmod_la_OBJECTS): $(GENERATED)
+$(libvirtmod_la_OBJECTS): $(GENERATED)

 else
 all: 

--- a/python/generator.py
+++ b/python/generator.py
@@ -20,7 +20,7 @@ else:
 #######################################################################
 #
 #  That part if purely the API acquisition phase from the
-#  libvir API description
+#  libvirt API description
 #
 #######################################################################
 import os
@@ -354,13 +354,13 @@ def print_function_wrapper(name, output, export, include):
            c_call = "\n    c_retval = %s->%s;\n" % (args[0][0], ret[2])
        else:
            c_call = "\n    c_retval = %s(%s);\n" % (name, c_call);
-        ret_convert = "    py_retval = libvir_%sWrap((%s) c_retval);\n" % (n,c)
+        ret_convert = "    py_retval = libvirt_%sWrap((%s) c_retval);\n" % (n,c)
        ret_convert = ret_convert + "    return(py_retval);\n"
    elif py_return_types.has_key(ret[0]):
        (f, t, n, c) = py_return_types[ret[0]]
        c_return = "    %s c_retval;\n" % (ret[0])
        c_call = "\n    c_retval = %s(%s);\n" % (name, c_call);
-        ret_convert = "    py_retval = libvir_%sWrap((%s) c_retval);\n" % (n,c)
+        ret_convert = "    py_retval = libvirt_%sWrap((%s) c_retval);\n" % (n,c)
        ret_convert = ret_convert + "    return(py_retval);\n"
    else:
        if skipped_types.has_key(ret[0]):
@@ -378,9 +378,9 @@ def print_function_wrapper(name, output, export, include):
        output.write("#if %s\n" % cond)

    include.write("PyObject * ")
-    include.write("libvir_%s(PyObject *self, PyObject *args);\n" % (name));
+    include.write("libvirt_%s(PyObject *self, PyObject *args);\n" % (name));

-    export.write("    { (char *)\"%s\", libvir_%s, METH_VARARGS, NULL },\n" %
+    export.write("    { (char *)\"%s\", libvirt_%s, METH_VARARGS, NULL },\n" %
                 (name, name))

    if file == "python":
@@ -399,7 +399,7 @@ def print_function_wrapper(name, output, export, include):
        return 1

    output.write("PyObject *\n")
-    output.write("libvir_%s(PyObject *self ATTRIBUTE_UNUSED," % (name))
+    output.write("libvirt_%s(PyObject *self ATTRIBUTE_UNUSED," % (name))
    output.write(" PyObject *args")
    if format == "":
 	output.write(" ATTRIBUTE_UNUSED")
@@ -432,14 +432,14 @@ def buildStubs():
    global unknown_types

    try:
-	f = open(os.path.join(srcPref,"libvir-api.xml"))
+	f = open(os.path.join(srcPref,"libvirt-api.xml"))
 	data = f.read()
 	(parser, target)  = getparser()
 	parser.feed(data)
 	parser.close()
    except IOError, msg:
 	try:
-	    f = open(os.path.join(srcPref,"..","docs","libvir-api.xml"))
+	    f = open(os.path.join(srcPref,"..","docs","libvirt-api.xml"))
 	    data = f.read()
 	    (parser, target)  = getparser()
 	    parser.feed(data)
@@ -449,11 +449,11 @@ def buildStubs():
 	    sys.exit(1)

    n = len(functions.keys())
-    print "Found %d functions in libvir-api.xml" % (n)
+    print "Found %d functions in libvirt-api.xml" % (n)

    py_types['pythonObject'] = ('O', "pythonObject", "pythonObject", "pythonObject")
    try:
-	f = open(os.path.join(srcPref,"libvir-python-api.xml"))
+	f = open(os.path.join(srcPref,"libvirt-python-api.xml"))
 	data = f.read()
 	(parser, target)  = getparser()
 	parser.feed(data)
@@ -462,22 +462,22 @@ def buildStubs():
 	print file, ":", msg


-    print "Found %d functions in libvir-python-api.xml" % (
+    print "Found %d functions in libvirt-python-api.xml" % (
 	  len(functions.keys()) - n)
    nb_wrap = 0
    failed = 0
    skipped = 0

-    include = open("libvir-py.h", "w")
+    include = open("libvirt-py.h", "w")
    include.write("/* Generated */\n\n")
-    export = open("libvir-export.c", "w")
+    export = open("libvirt-export.c", "w")
    export.write("/* Generated */\n\n")
-    wrapper = open("libvir-py.c", "w")
+    wrapper = open("libvirt-py.c", "w")
    wrapper.write("/* Generated */\n\n")
    wrapper.write("#include <Python.h>\n")
-    wrapper.write("#include <libvir.h>\n")
-    wrapper.write("#include \"libvir_wrap.h\"\n")
-    wrapper.write("#include \"libvir-py.h\"\n\n")
+    wrapper.write("#include <libvirt.h>\n")
+    wrapper.write("#include \"libvirt_wrap.h\"\n")
+    wrapper.write("#include \"libvirt-py.h\"\n\n")
    for function in functions.keys():
 	ret = print_function_wrapper(function, wrapper, export, include)
 	if ret < 0:
@@ -685,19 +685,19 @@ def buildWrappers():
 	info = (0, func, name, ret, args, file)
 	function_classes['None'].append(info)
   
-    classes = open("libvir.py", "w")
+    classes = open("libvirt.py", "w")
    classes.write("""#!/usr/bin/python -u
 #
-# Those are the autogenerated Python bindings for libvir.
-# Check python/generator.py in the source distribution of libvir
+# Those are the autogenerated Python bindings for libvirt.
+# Check python/generator.py in the source distribution of libvirt
 # to find out more about the generation process
 #
 """)

-    classes.write("import libvirmod\n")
+    classes.write("import libvirtmod\n")
    classes.write("import types\n\n")

-    txt = open("libvirclass.txt", "w")
+    txt = open("libvirtclass.txt", "w")
    txt.write("          Generated Classes for libvir-python\n\n")

    txt.write("#\n# Global functions of the module\n#\n\n")
@@ -732,7 +732,7 @@ def buildWrappers():
 		classes.write("    ret = ");
 	    else:
 		classes.write("    ");
-	    classes.write("libvirmod.%s(" % name)
+	    classes.write("libvirtmod.%s(" % name)
 	    n = 0
 	    for arg in args:
 		if n != 0:
@@ -788,7 +788,7 @@ def buildWrappers():
 	    if classes_destructors.has_key(classname):
 		classes.write("    def __del__(self):\n")
 		classes.write("        if self._o != None:\n")
-		classes.write("            libvirmod.%s(self._o)\n" %
+		classes.write("            libvirtmod.%s(self._o)\n" %
 			      classes_destructors[classname]);
 		classes.write("        self._o = None\n\n");
 		destruct=classes_destructors[classname]
@@ -836,7 +836,7 @@ def buildWrappers():
 		    classes.write("        ret = ");
 		else:
 		    classes.write("        ");
-		classes.write("libvirmod.%s(" % name)
+		classes.write("libvirtmod.%s(" % name)
 		n = 0
 		for arg in args:
 		    if n != 0:

--- a/python/libvir.c
+++ b/python/libvir.c
@@ -10,14 +10,14 @@
 */

 #include <Python.h>
-#include <libvir.h>
-#include "libvir_wrap.h"
-#include "libvir-py.h"
+#include <libvirt.h>
+#include "libvirt_wrap.h"
+#include "libvirt-py.h"

 void initlibvirmod(void);

 static PyObject *
-libvir_virDomainFree(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libvirt_virDomainFree(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
    PyObject *py_retval;
    int c_retval;
    virDomainPtr domain;
@@ -28,12 +28,12 @@ libvir_virDomainFree(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
    domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain);

    c_retval = virDomainFree(domain);
-    py_retval = libvir_intWrap((int) c_retval);
+    py_retval = libvirt_intWrap((int) c_retval);
    return(py_retval);
 }

 static PyObject *
-libvir_virConnectClose(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libvirt_virConnectClose(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
    PyObject *py_retval;
    int c_retval;
    virConnectPtr conn;
@@ -44,12 +44,12 @@ libvir_virConnectClose(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
    conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn);

    c_retval = virConnectClose(conn);
-    py_retval = libvir_intWrap((int) c_retval);
+    py_retval = libvirt_intWrap((int) c_retval);
    return(py_retval);
 }

 static PyObject *
-libvir_virConnectListDomainsID(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virConnectListDomainsID(PyObject *self ATTRIBUTE_UNUSED,
                               PyObject *args) {
    PyObject *py_retval;
    int ids[500], c_retval, i;
@@ -68,13 +68,13 @@ libvir_virConnectListDomainsID(PyObject *self ATTRIBUTE_UNUSED,
    }
    py_retval = PyList_New(c_retval);
    for (i = 0;i < c_retval;i++) {
-        PyList_SetItem(py_retval, i, libvir_intWrap(ids[i]));
+        PyList_SetItem(py_retval, i, libvirt_intWrap(ids[i]));
    }
    return(py_retval);
 }

 static PyObject *
-libvir_virDomainGetInfo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libvirt_virDomainGetInfo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
    PyObject *py_retval;
    int c_retval;
    virDomainPtr domain;
@@ -91,12 +91,12 @@ libvir_virDomainGetInfo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
 	return(Py_None);
    }
    py_retval = PyList_New(5);
-    PyList_SetItem(py_retval, 0, libvir_intWrap((int) info.state));
-    PyList_SetItem(py_retval, 1, libvir_longWrap((long) info.maxMem));
-    PyList_SetItem(py_retval, 2, libvir_longWrap((long) info.memory));
-    PyList_SetItem(py_retval, 3, libvir_intWrap((int) info.nrVirtCpu));
+    PyList_SetItem(py_retval, 0, libvirt_intWrap((int) info.state));
+    PyList_SetItem(py_retval, 1, libvirt_longWrap((long) info.maxMem));
+    PyList_SetItem(py_retval, 2, libvirt_longWrap((long) info.memory));
+    PyList_SetItem(py_retval, 3, libvirt_intWrap((int) info.nrVirtCpu));
    PyList_SetItem(py_retval, 4,
-                   libvir_longlongWrap((unsigned long long) info.cpuTime));
+                   libvirt_longlongWrap((unsigned long long) info.cpuTime));
    return(py_retval);
 }

@@ -105,12 +105,12 @@ libvir_virDomainGetInfo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
 *			The registration stuff				*
 *									*
 ************************************************************************/
-static PyMethodDef libvirMethods[] = {
-#include "libvir-export.c"
-    {(char *) "virDomainFree", libvir_virDomainFree, METH_VARARGS, NULL},
-    {(char *) "virConnectClose", libvir_virConnectClose, METH_VARARGS, NULL},
-    {(char *) "virConnectListDomainsID", libvir_virConnectListDomainsID, METH_VARARGS, NULL},
-    {(char *) "virDomainGetInfo", libvir_virDomainGetInfo, METH_VARARGS, NULL},
+static PyMethodDef libvirtMethods[] = {
+#include "libvirt-export.c"
+    {(char *) "virDomainFree", libvirt_virDomainFree, METH_VARARGS, NULL},
+    {(char *) "virConnectClose", libvirt_virConnectClose, METH_VARARGS, NULL},
+    {(char *) "virConnectListDomainsID", libvirt_virConnectListDomainsID, METH_VARARGS, NULL},
+    {(char *) "virDomainGetInfo", libvirt_virDomainGetInfo, METH_VARARGS, NULL},
    {NULL, NULL, 0, NULL}
 };

@@ -123,7 +123,7 @@ initlibvirmod(void)
        return;

    /* intialize the python extension module */
-    Py_InitModule((char *) "libvirmod", libvirMethods);
+    Py_InitModule((char *) "libvirtmod", libvirtMethods);

    initialized = 1;
 }
--- a/python/libvir-python-api.xml
+++ b/python/libvir-python-api.xml
--- a/python/libvir_wrap.h
+++ b/python/libvir_wrap.h
 /*
- * libvir_wrap.h: type wrappers for libvir python bindings
+ * libvirt_wrap.h: type wrappers for libvir python bindings
 *
 * Copyright (C) 2005 Red Hat, Inc.
 *
@@ -7,7 +7,7 @@
 */

 #include <Python.h>
-#include <libvir.h>
+#include <libvirt.h>

 #ifdef __GNUC__
 #ifdef ATTRIBUTE_UNUSED
@@ -38,12 +38,12 @@ typedef struct {
 } PyvirDomain_Object;


-PyObject * libvir_intWrap(int val);
-PyObject * libvir_longWrap(long val);
-PyObject * libvir_longlongWrap(long long val);
-PyObject * libvir_charPtrWrap(char *str);
-PyObject * libvir_constcharPtrWrap(const char *str);
-PyObject * libvir_charPtrConstWrap(const char *str);
-PyObject * libvir_virConnectPtrWrap(virConnectPtr node);
-PyObject * libvir_virDomainPtrWrap(virDomainPtr node);
+PyObject * libvirt_intWrap(int val);
+PyObject * libvirt_longWrap(long val);
+PyObject * libvirt_longlongWrap(long long val);
+PyObject * libvirt_charPtrWrap(char *str);
+PyObject * libvirt_constcharPtrWrap(const char *str);
+PyObject * libvirt_charPtrConstWrap(const char *str);
+PyObject * libvirt_virConnectPtrWrap(virConnectPtr node);
+PyObject * libvirt_virDomainPtrWrap(virDomainPtr node);

--- a/python/types.c
+++ b/python/types.c
@@ -7,51 +7,51 @@
 * Daniel Veillard <veillard@redhat.com>
 */

-#include "libvir_wrap.h"
+#include "libvirt_wrap.h"

 PyObject *
-libvir_intWrap(int val)
+libvirt_intWrap(int val)
 {
    PyObject *ret;

 #ifdef DEBUG
-    printf("libvir_intWrap: val = %d\n", val);
+    printf("libvirt_intWrap: val = %d\n", val);
 #endif
    ret = PyInt_FromLong((long) val);
    return (ret);
 }

 PyObject *
-libvir_longWrap(long val)
+libvirt_longWrap(long val)
 {
    PyObject *ret;

 #ifdef DEBUG
-    printf("libvir_longWrap: val = %ld\n", val);
+    printf("libvirt_longWrap: val = %ld\n", val);
 #endif
    ret = PyInt_FromLong(val);
    return (ret);
 }

 PyObject *
-libvir_longlongWrap(long long val)
+libvirt_longlongWrap(long long val)
 {
    PyObject *ret;

 #ifdef DEBUG
-    printf("libvir_longWrap: val = %ld\n", val);
+    printf("libvirt_longWrap: val = %ld\n", val);
 #endif
    ret = PyLong_FromUnsignedLongLong((unsigned long long) val);
    return (ret);
 }

 PyObject *
-libvir_charPtrWrap(char *str)
+libvirt_charPtrWrap(char *str)
 {
    PyObject *ret;

 #ifdef DEBUG
-    printf("libvir_xmlcharPtrWrap: str = %s\n", str);
+    printf("libvirt_xmlcharPtrWrap: str = %s\n", str);
 #endif
    if (str == NULL) {
        Py_INCREF(Py_None);
@@ -63,12 +63,12 @@ libvir_charPtrWrap(char *str)
 }

 PyObject *
-libvir_constcharPtrWrap(const char *str)
+libvirt_constcharPtrWrap(const char *str)
 {
    PyObject *ret;

 #ifdef DEBUG
-    printf("libvir_xmlcharPtrWrap: str = %s\n", str);
+    printf("libvirt_xmlcharPtrWrap: str = %s\n", str);
 #endif
    if (str == NULL) {
        Py_INCREF(Py_None);
@@ -79,12 +79,12 @@ libvir_constcharPtrWrap(const char *str)
 }

 PyObject *
-libvir_charPtrConstWrap(const char *str)
+libvirt_charPtrConstWrap(const char *str)
 {
    PyObject *ret;

 #ifdef DEBUG
-    printf("libvir_xmlcharPtrWrap: str = %s\n", str);
+    printf("libvirt_xmlcharPtrWrap: str = %s\n", str);
 #endif
    if (str == NULL) {
        Py_INCREF(Py_None);
@@ -95,12 +95,12 @@ libvir_charPtrConstWrap(const char *str)
 }

 PyObject *
-libvir_virDomainPtrWrap(virDomainPtr node)
+libvirt_virDomainPtrWrap(virDomainPtr node)
 {
    PyObject *ret;

 #ifdef DEBUG
-    printf("libvir_virDomainPtrWrap: node = %p\n", node);
+    printf("libvirt_virDomainPtrWrap: node = %p\n", node);
 #endif
    if (node == NULL) {
        Py_INCREF(Py_None);
@@ -113,12 +113,12 @@ libvir_virDomainPtrWrap(virDomainPtr node)
 }

 PyObject *
-libvir_virConnectPtrWrap(virConnectPtr node)
+libvirt_virConnectPtrWrap(virConnectPtr node)
 {
    PyObject *ret;

 #ifdef DEBUG
-    printf("libvir_virConnectPtrWrap: node = %p\n", node);
+    printf("libvirt_virConnectPtrWrap: node = %p\n", node);
 #endif
    if (node == NULL) {
        Py_INCREF(Py_None);

--- a/src/Makefile.am
+++ b/src/Makefile.am
 ## Process this file with automake to produce Makefile.in

 INCLUDES = -I$(top_builddir)/include -I@srcdir@/include
-DEPS = libvir.la
-LDADDS = @STATIC_BINARIES@ libvir.la
+DEPS = libvirt.la
+LDADDS = @STATIC_BINARIES@ libvirt.la
 VIRSH_LIBS = @VIRSH_LIBS@

-EXTRA_DIST = libvir_sym.version
+EXTRA_DIST = libvirt_sym.version

-lib_LTLIBRARIES = libvir.la
-libvir_la_LIBADD = 
-libvir_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libvir_sym.version \
+lib_LTLIBRARIES = libvirt.la
+libvirt_la_LIBADD = 
+libvirt_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libvirt_sym.version \
                    -version-info @LIBVIR_VERSION_INFO@
-libvir_la_SOURCES =						\
-		libvir.c internal.h				\
+libvirt_la_SOURCES =						\
+		libvirt.c internal.h				\
 		hash.c hash.h					\
 		xml.c						\
 		xen_internal.c xen_internal.h			\

--- a/src/internal.h
+++ b/src/internal.h
@@ -12,7 +12,7 @@
 #include <netinet/tcp.h>

 #include "hash.h"
-#include "libvir.h"
+#include "libvirt.h"

 #ifdef __cplusplus
 extern "C" {

--- a/src/libvir.c
+++ b/src/libvir.c
 /*
- * libvir.c: Main interfaces for the libvir library to handle virtualization
+ * libvirt.c: Main interfaces for the libvirt library to handle virtualization
 *           domains from a process running in domain 0
 *
- * Copyright (C) 2005 Red Hat, Inc.
+ * Copyright (C) 2005,2006 Red Hat, Inc.
 *
 * See COPYING.LIB for the License of this software
 *
 * Daniel Veillard <veillard@redhat.com>
 */

-#include "libvir.h"
+#include "libvirt.h"

 #include <stdio.h>
 #include <stdlib.h>

--- a/src/libvir_sym.version
+++ b/src/libvir_sym.version
--- a/src/virsh.c
+++ b/src/virsh.c
@@ -13,7 +13,7 @@

 #define _GNU_SOURCE    /* isblank() */

-#include "libvir.h"
+#include "libvirt.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

--- a/src/xend_internal.c
+++ b/src/xend_internal.c
@@ -27,7 +27,7 @@
 #include <arpa/inet.h>
 #include <netdb.h>

-#include "libvir.h"
+#include "libvirt.h"
 #include "internal.h"
 #include "sexpr.h"
 #include "xend_internal.h"

--- a/src/xend_internal.h
+++ b/src/xend_internal.h
@@ -17,7 +17,7 @@
 #include <stdint.h>
 #include <stdbool.h>

-#include "libvir.h"
+#include "libvirt.h"

 #ifdef __cplusplus
 extern "C" {

--- a/src/xml.c
+++ b/src/xml.c
@@ -8,7 +8,7 @@
 * Daniel Veillard <veillard@redhat.com>
 */

-#include "libvir.h"
+#include "libvirt.h"

 #include <stdio.h>
 #include <stdlib.h>