* include/libvirt/libvirt.h include/libvirt/libvirt.h.in

  src/libvirt.c: fixes a few problems in the documentation
  pointed out by Toth Istvan.
* docs/*: regenerated the docs
Daniel

diff --git a/ChangeLog b/ChangeLog
index 15cd5e950962c22965c8e81623e6b2cd674f6b48..51153341bea9dbcd8c1679e9694024bc4230a908 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Sep 10 11:35:06 CEST 2007 Daniel Veillard <veillard@redhat.com>
+
+       * include/libvirt/libvirt.h include/libvirt/libvirt.h.in
+         src/libvirt.c: fixes a few problems in the documentation
+         pointed out by Toth Istvan.
+       * docs/*: regenerated the docs
+
 Wed Sep  5 16:31:00 CEST 2007 Daniel Veillard <veillard@redhat.com>
 
        * docs/libvir.html docs/uri.html: remove references to libvirt_qemud

diff --git a/docs/APIchunk1.html b/docs/APIchunk1.html
index cc4b753464a2fecdec4f1e9cfbb4c623b3df3f2d..8bd30237ec7bd4897197fcf50d825db86b37f97d 100644 (file)
--- a/docs/APIchunk1.html
+++ b/docs/APIchunk1.html
@@ -13,7 +13,8 @@
 </dd><dt>What</dt><dd><a href="html/libvirt-virterror.html#_virError">_virError</a><br />
 </dd><dt>When</dt><dd><a href="html/libvirt-libvirt.html#virDomainGetConnect">virDomainGetConnect</a><br />
 <a href="html/libvirt-libvirt.html#virNetworkGetConnect">virNetworkGetConnect</a><br />
-</dd></dl><h2>Letter X:</h2><dl><dt>XML</dt><dd><a href="html/libvirt-libvirt.html#virConnectGetMaxVcpus">virConnectGetMaxVcpus</a><br />
+</dd></dl><h2>Letter X:</h2><dl><dt>XML</dt><dd><a href="html/libvirt-libvirt.html#virConnectGetCapabilities">virConnectGetCapabilities</a><br />
+<a href="html/libvirt-libvirt.html#virConnectGetMaxVcpus">virConnectGetMaxVcpus</a><br />
 <a href="html/libvirt-libvirt.html#virDomainAttachDevice">virDomainAttachDevice</a><br />
 <a href="html/libvirt-libvirt.html#virDomainCreateLinux">virDomainCreateLinux</a><br />
 <a href="html/libvirt-libvirt.html#virDomainDefineXML">virDomainDefineXML</a><br />
@@ -22,7 +23,8 @@
 <a href="html/libvirt-libvirt.html#virNetworkCreateXML">virNetworkCreateXML</a><br />
 <a href="html/libvirt-libvirt.html#virNetworkDefineXML">virNetworkDefineXML</a><br />
 <a href="html/libvirt-libvirt.html#virNetworkGetXMLDesc">virNetworkGetXMLDesc</a><br />
-</dd><dt>Xen</dt><dd><a href="html/libvirt-libvirt.html#virDomainCoreDump">virDomainCoreDump</a><br />
+</dd><dt>Xen</dt><dd><a href="html/libvirt-libvirt.html#_virDomainBlockStats">_virDomainBlockStats</a><br />
+<a href="html/libvirt-libvirt.html#virDomainCoreDump">virDomainCoreDump</a><br />
 <a href="html/libvirt-libvirt.html#virDomainGetVcpus">virDomainGetVcpus</a><br />
 <a href="html/libvirt-libvirt.html#virDomainPinVcpu">virDomainPinVcpu</a><br />
 <a href="html/libvirt-libvirt.html#virGetVersion">virGetVersion</a><br />

diff --git a/docs/APIchunk2.html b/docs/APIchunk2.html
index 8a6da91b895201e82062b8e93a2dae11d2141f71..376a8b3a4d5f9a193b3bfbb1560c551bb361c647 100644 (file)
--- a/docs/APIchunk2.html
+++ b/docs/APIchunk2.html
@@ -27,6 +27,7 @@
 <a href="html/libvirt-libvirt.html#virDomainUndefine">virDomainUndefine</a><br />
 <a href="html/libvirt-libvirt.html#virNetworkCreate">virNetworkCreate</a><br />
 <a href="html/libvirt-libvirt.html#virNetworkUndefine">virNetworkUndefine</a><br />
+</dd><dt>defining</dt><dd><a href="html/libvirt-libvirt.html#virConnectGetCapabilities">virConnectGetCapabilities</a><br />
 </dd><dt>described</dt><dd><a href="html/libvirt-libvirt.html#virDomainGetVcpus">virDomainGetVcpus</a><br />
 </dd><dt>description</dt><dd><a href="html/libvirt-libvirt.html#virDomainAttachDevice">virDomainAttachDevice</a><br />
 <a href="html/libvirt-libvirt.html#virDomainCreateLinux">virDomainCreateLinux</a><br />

diff --git a/docs/APIchunk3.html b/docs/APIchunk3.html
index 3c4c897b72ce74855e21323f47e0e857f9f5e6b4..d52fbc80b7b0fc72ef613fadd6db1613a6b98c1d 100644 (file)
--- a/docs/APIchunk3.html
+++ b/docs/APIchunk3.html
@@ -265,6 +265,7 @@
 <a href="html/libvirt-libvirt.html#virDomainMigrate">virDomainMigrate</a><br />
 <a href="html/libvirt-libvirt.html#virNetworkGetBridgeName">virNetworkGetBridgeName</a><br />
 <a href="html/libvirt-libvirt.html#virNetworkGetXMLDesc">virNetworkGetXMLDesc</a><br />
+</dd><dt>mysterious</dt><dd><a href="html/libvirt-libvirt.html#_virDomainBlockStats">_virDomainBlockStats</a><br />
 </dd></dl><h2 align="center"><a href="APIchunk0.html">A-V</a>
 <a href="APIchunk1.html">W-c</a>
 <a href="APIchunk2.html">d-g</a>

diff --git a/docs/APIchunk4.html b/docs/APIchunk4.html
index 07b641a1e891ce4d25246e3f99e7898bd379931f..fd9ee9e6bc4874903065c200aeabe2ef9ea64397 100644 (file)
--- a/docs/APIchunk4.html
+++ b/docs/APIchunk4.html
@@ -72,7 +72,7 @@
 <a href="html/libvirt-libvirt.html#virNetworkCreateXML">virNetworkCreateXML</a><br />
 </dd><dt>only</dt><dd><a href="html/libvirt-libvirt.html#virConnectGetVersion">virConnectGetVersion</a><br />
 <a href="html/libvirt-libvirt.html#virDomainGetInfo">virDomainGetInfo</a><br />
-</dd><dt>opaque</dt><dd><a href="html/libvirt-libvirt.html#virConnectGetCapabilities">virConnectGetCapabilities</a><br />
+</dd><dt>oo_req</dt><dd><a href="html/libvirt-libvirt.html#_virDomainBlockStats">_virDomainBlockStats</a><br />
 </dd><dt>operation</dt><dd><a href="html/libvirt-libvirt.html#virDomainGetOSType">virDomainGetOSType</a><br />
 <a href="html/libvirt-libvirt.html#virDomainReboot">virDomainReboot</a><br />
 </dd><dt>option</dt><dd><a href="html/libvirt-libvirt.html#virDomainShutdown">virDomainShutdown</a><br />
@@ -261,6 +261,7 @@
 </dd><dt>returns</dt><dd><a href="html/libvirt-libvirt.html#VIR_CPU_MAPLEN">VIR_CPU_MAPLEN</a><br />
 <a href="html/libvirt-libvirt.html#VIR_CPU_USABLE">VIR_CPU_USABLE</a><br />
 <a href="html/libvirt-libvirt.html#VIR_GET_CPUMAP">VIR_GET_CPUMAP</a><br />
+<a href="html/libvirt-libvirt.html#_virDomainBlockStats">_virDomainBlockStats</a><br />
 <a href="html/libvirt-libvirt.html#virConnectGetHostname">virConnectGetHostname</a><br />
 <a href="html/libvirt-libvirt.html#virConnectGetURI">virConnectGetURI</a><br />
 <a href="html/libvirt-libvirt.html#virConnectGetVersion">virConnectGetVersion</a><br />

diff --git a/docs/APIchunk5.html b/docs/APIchunk5.html
index 48448169bb2e9ee160d1645ba9cf89bd9bd6388c..b1be1d4db563b735fef7afbe909f1712a185655f 100644 (file)
--- a/docs/APIchunk5.html
+++ b/docs/APIchunk5.html
@@ -124,8 +124,7 @@
 <a href="html/libvirt-libvirt.html#virNetworkGetName">virNetworkGetName</a><br />
 <a href="html/libvirt-libvirt.html#virNetworkGetUUIDString">virNetworkGetUUIDString</a><br />
 <a href="html/libvirt-libvirt.html#virNetworkLookupByUUIDString">virNetworkLookupByUUIDString</a><br />
-</dd><dt>structure</dt><dd><a href="html/libvirt-libvirt.html#virConnectGetCapabilities">virConnectGetCapabilities</a><br />
-<a href="html/libvirt-libvirt.html#virDomainBlockStats">virDomainBlockStats</a><br />
+</dd><dt>structure</dt><dd><a href="html/libvirt-libvirt.html#virDomainBlockStats">virDomainBlockStats</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#virDomainGetInfo">virDomainGetInfo</a><br />
@@ -212,7 +211,8 @@
 <a href="html/libvirt-libvirt.html#virDomainFree">virDomainFree</a><br />
 <a href="html/libvirt-libvirt.html#virNetworkDestroy">virNetworkDestroy</a><br />
 <a href="html/libvirt-libvirt.html#virNetworkFree">virNetworkFree</a><br />
-</dd><dt>this</dt><dd><a href="html/libvirt-virterror.html#_virError">_virError</a><br />
+</dd><dt>this</dt><dd><a href="html/libvirt-libvirt.html#_virDomainBlockStats">_virDomainBlockStats</a><br />
+<a href="html/libvirt-virterror.html#_virError">_virError</a><br />
 <a href="html/libvirt-libvirt.html#virConnectGetHostname">virConnectGetHostname</a><br />
 <a href="html/libvirt-libvirt.html#virConnectGetURI">virConnectGetURI</a><br />
 <a href="html/libvirt-libvirt.html#virDomainBlockStats">virDomainBlockStats</a><br />

diff --git a/docs/APIchunk6.html b/docs/APIchunk6.html
index c2b560847e6786fb07ac6de9e5b3b13baaa040a2..7bedf5c1ce78049cdcf8c7b586a0219bf075fbb8 100644 (file)
--- a/docs/APIchunk6.html
+++ b/docs/APIchunk6.html
@@ -83,8 +83,6 @@
 </dd><dt>version</dt><dd><a href="html/libvirt-libvirt.html#LIBVIR_VERSION_NUMBER">LIBVIR_VERSION_NUMBER</a><br />
 <a href="html/libvirt-libvirt.html#virConnectGetVersion">virConnectGetVersion</a><br />
 <a href="html/libvirt-libvirt.html#virGetVersion">virGetVersion</a><br />
-</dd><dt>virCapabilities</dt><dd><a href="html/libvirt-libvirt.html#virConnectGetCapabilities">virConnectGetCapabilities</a><br />
-</dd><dt>virCapabilitiesPtr</dt><dd><a href="html/libvirt-libvirt.html#virConnectGetCapabilities">virConnectGetCapabilities</a><br />
 </dd><dt>virConnCopyLastError</dt><dd><a href="html/libvirt-virterror.html#virConnGetLastError">virConnGetLastError</a><br />
 </dd><dt>virConnectGetCapabilities</dt><dd><a href="html/libvirt-libvirt.html#virDomainMigrate">virDomainMigrate</a><br />
 </dd><dt>virConnectGetMaxVcpus</dt><dd><a href="html/libvirt-libvirt.html#virDomainGetMaxVcpus">virDomainGetMaxVcpus</a><br />

diff --git a/docs/APIfiles.html b/docs/APIfiles.html
index 46e788da6a09df827019c3ba2a65730e345da932..ea7433e42a65223fc6cc237dcc76355b4df4b18b 100644 (file)
--- a/docs/APIfiles.html
+++ b/docs/APIfiles.html
@@ -62,6 +62,7 @@
 <a href="html/libvirt-libvirt.html#virDomainAttachDevice">virDomainAttachDevice</a><br />
 <a href="html/libvirt-libvirt.html#virDomainBlockStats">virDomainBlockStats</a><br />
 <a href="html/libvirt-libvirt.html#virDomainBlockStatsPtr">virDomainBlockStatsPtr</a><br />
+<a href="html/libvirt-libvirt.html#virDomainBlockStatsStruct">virDomainBlockStatsStruct</a><br />
 <a href="html/libvirt-libvirt.html#virDomainCoreDump">virDomainCoreDump</a><br />
 <a href="html/libvirt-libvirt.html#virDomainCreate">virDomainCreate</a><br />
 <a href="html/libvirt-libvirt.html#virDomainCreateFlags">virDomainCreateFlags</a><br />
@@ -88,6 +89,7 @@
 <a href="html/libvirt-libvirt.html#virDomainInfoPtr">virDomainInfoPtr</a><br />
 <a href="html/libvirt-libvirt.html#virDomainInterfaceStats">virDomainInterfaceStats</a><br />
 <a href="html/libvirt-libvirt.html#virDomainInterfaceStatsPtr">virDomainInterfaceStatsPtr</a><br />
+<a href="html/libvirt-libvirt.html#virDomainInterfaceStatsStruct">virDomainInterfaceStatsStruct</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#virDomainLookupByUUID">virDomainLookupByUUID</a><br />

diff --git a/docs/APIsymbols.html b/docs/APIsymbols.html
index 871e4c3f777a95608f353a31f0f346ba21c43ec7..6a68f70c514bb83255b141887c67f0fb0a589f93 100644 (file)
--- a/docs/APIsymbols.html
+++ b/docs/APIsymbols.html
@@ -132,6 +132,7 @@
 <a href="html/libvirt-libvirt.html#virDomainAttachDevice">virDomainAttachDevice</a><br />
 <a href="html/libvirt-libvirt.html#virDomainBlockStats">virDomainBlockStats</a><br />
 <a href="html/libvirt-libvirt.html#virDomainBlockStatsPtr">virDomainBlockStatsPtr</a><br />
+<a href="html/libvirt-libvirt.html#virDomainBlockStatsStruct">virDomainBlockStatsStruct</a><br />
 <a href="html/libvirt-libvirt.html#virDomainCoreDump">virDomainCoreDump</a><br />
 <a href="html/libvirt-libvirt.html#virDomainCreate">virDomainCreate</a><br />
 <a href="html/libvirt-libvirt.html#virDomainCreateFlags">virDomainCreateFlags</a><br />
@@ -158,6 +159,7 @@
 <a href="html/libvirt-libvirt.html#virDomainInfoPtr">virDomainInfoPtr</a><br />
 <a href="html/libvirt-libvirt.html#virDomainInterfaceStats">virDomainInterfaceStats</a><br />
 <a href="html/libvirt-libvirt.html#virDomainInterfaceStatsPtr">virDomainInterfaceStatsPtr</a><br />
+<a href="html/libvirt-libvirt.html#virDomainInterfaceStatsStruct">virDomainInterfaceStatsStruct</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#virDomainLookupByUUID">virDomainLookupByUUID</a><br />

diff --git a/docs/devhelp/libvirt-libvirt.html b/docs/devhelp/libvirt-libvirt.html
index e7e0467ba29e4526fce62ea825c4417fd579087a..cec369730403945c7380c4fcde009aceb18d4eac 100644 (file)
--- a/docs/devhelp/libvirt-libvirt.html
+++ b/docs/devhelp/libvirt-libvirt.html
@@ -49,26 +49,28 @@
 #define <a href="#VIR_UUID_STRING_BUFLEN">VIR_UUID_STRING_BUFLEN</a>;
 #define <a href="#VIR_GET_CPUMAP">VIR_GET_CPUMAP</a>(cpumaps, maplen, vcpu);
 #define <a href="#VIR_UNUSE_CPU">VIR_UNUSE_CPU</a>(cpumap, cpu);
+typedef struct _virDomainBlockStats <a href="#virDomainBlockStatsStruct">virDomainBlockStatsStruct</a>;
 typedef enum <a href="#virDomainMigrateFlags">virDomainMigrateFlags</a>;
 typedef struct _virNodeInfo <a href="#virNodeInfo">virNodeInfo</a>;
 typedef struct _virNetwork <a href="#virNetwork">virNetwork</a>;
-typedef struct _virDomainBlockStats * <a href="#virDomainBlockStatsPtr">virDomainBlockStatsPtr</a>;
+typedef <a href="libvirt-libvirt.html#virDomainBlockStatsStruct">virDomainBlockStatsStruct</a> * <a href="#virDomainBlockStatsPtr">virDomainBlockStatsPtr</a>;
+typedef enum <a href="#virSchedParameterType">virSchedParameterType</a>;
 typedef struct _virConnect <a href="#virConnect">virConnect</a>;
 typedef struct _virVcpuInfo <a href="#virVcpuInfo">virVcpuInfo</a>;
 typedef struct _virDomainInfo <a href="#virDomainInfo">virDomainInfo</a>;
-typedef struct _virSchedParameter <a href="#virSchedParameter">virSchedParameter</a>;
+typedef struct _virDomainInterfaceStats <a href="#virDomainInterfaceStatsStruct">virDomainInterfaceStatsStruct</a>;
 typedef enum <a href="#virDomainState">virDomainState</a>;
 typedef struct _virDomain <a href="#virDomain">virDomain</a>;
-typedef struct _virDomainInterfaceStats * <a href="#virDomainInterfaceStatsPtr">virDomainInterfaceStatsPtr</a>;
-typedef enum <a href="#virSchedParameterType">virSchedParameterType</a>;
+typedef <a href="libvirt-libvirt.html#virDomainInterfaceStatsStruct">virDomainInterfaceStatsStruct</a> * <a href="#virDomainInterfaceStatsPtr">virDomainInterfaceStatsPtr</a>;
 typedef enum <a href="#virDomainRestart">virDomainRestart</a>;
+typedef <a href="libvirt-libvirt.html#virSchedParameter">virSchedParameter</a> * <a href="#virSchedParameterPtr">virSchedParameterPtr</a>;
 typedef <a href="libvirt-libvirt.html#virNodeInfo">virNodeInfo</a> * <a href="#virNodeInfoPtr">virNodeInfoPtr</a>;
 typedef <a href="libvirt-libvirt.html#virNetwork">virNetwork</a> * <a href="#virNetworkPtr">virNetworkPtr</a>;
 typedef <a href="libvirt-libvirt.html#virDomainInfo">virDomainInfo</a> * <a href="#virDomainInfoPtr">virDomainInfoPtr</a>;
 typedef <a href="libvirt-libvirt.html#virConnect">virConnect</a> * <a href="#virConnectPtr">virConnectPtr</a>;
-typedef <a href="libvirt-libvirt.html#virVcpuInfo">virVcpuInfo</a> * <a href="#virVcpuInfoPtr">virVcpuInfoPtr</a>;
-typedef <a href="libvirt-libvirt.html#virSchedParameter">virSchedParameter</a> * <a href="#virSchedParameterPtr">virSchedParameterPtr</a>;
+typedef struct _virSchedParameter <a href="#virSchedParameter">virSchedParameter</a>;
 typedef enum <a href="#virVcpuState">virVcpuState</a>;
+typedef <a href="libvirt-libvirt.html#virVcpuInfo">virVcpuInfo</a> * <a href="#virVcpuInfoPtr">virVcpuInfoPtr</a>;
 typedef <a href="libvirt-libvirt.html#virDomain">virDomain</a> * <a href="#virDomainPtr">virDomainPtr</a>;
 typedef enum <a href="#virDomainCreateFlags">virDomainCreateFlags</a>;
 int    <a href="#virDomainGetInfo">virDomainGetInfo</a>                (<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> domain, <br/>                                      <a href="libvirt-libvirt.html#virDomainInfoPtr">virDomainInfoPtr</a> info);
@@ -86,7 +88,6 @@ int   <a href="#virInitialize">virInitialize</a>                      (void);
 <a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a>   <a href="#virDomainLookupByName">virDomainLookupByName</a>      (<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>                                      const char * name);
 <a href="libvirt-libvirt.html#virNetworkPtr">virNetworkPtr</a> <a href="#virNetworkLookupByUUID">virNetworkLookupByUUID</a>    (<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>                                      const unsigned char * uuid);
 char * <a href="#virNetworkGetBridgeName">virNetworkGetBridgeName</a>          (<a href="libvirt-libvirt.html#virNetworkPtr">virNetworkPtr</a> network);
-char * <a href="#virNetworkGetXMLDesc">virNetworkGetXMLDesc</a>                (<a href="libvirt-libvirt.html#virNetworkPtr">virNetworkPtr</a> network, <br/>                                   int flags);
 int    <a href="#virDomainPinVcpu">virDomainPinVcpu</a>                (<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> domain, <br/>                                      unsigned int vcpu, <br/>                                        unsigned char * cpumap, <br/>                                   int maplen);
 int    <a href="#virDomainRestore">virDomainRestore</a>                (<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>                                      const char * from);
 const char *   <a href="#virConnectGetType">virConnectGetType</a>      (<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn);
@@ -117,8 +118,9 @@ int <a href="#virDomainFree">virDomainFree</a>                      (<a href="libvirt-libvirt.html#
 int    <a href="#virDomainSetAutostart">virDomainSetAutostart</a>              (<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> domain, <br/>                                      int autostart);
 int    <a href="#virDomainSuspend">virDomainSuspend</a>                (<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> domain);
 int    <a href="#virConnectGetMaxVcpus">virConnectGetMaxVcpus</a>              (<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>                                      const char * type);
-int    <a href="#virConnectNumOfDefinedDomains">virConnectNumOfDefinedDomains</a>      (<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn);
 <a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> <a href="#virNetworkGetConnect">virNetworkGetConnect</a>        (<a href="libvirt-libvirt.html#virNetworkPtr">virNetworkPtr</a> net);
+int    <a href="#virConnectNumOfDefinedDomains">virConnectNumOfDefinedDomains</a>      (<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn);
+<a href="libvirt-libvirt.html#virNetworkPtr">virNetworkPtr</a> <a href="#virNetworkCreateXML">virNetworkCreateXML</a>  (<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>                                      const char * xmlDesc);
 <a href="libvirt-libvirt.html#virNetworkPtr">virNetworkPtr</a> <a href="#virNetworkDefineXML">virNetworkDefineXML</a>  (<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>                                      const char * xml);
 int    <a href="#virNetworkCreate">virNetworkCreate</a>                (<a href="libvirt-libvirt.html#virNetworkPtr">virNetworkPtr</a> network);
 int    <a href="#virDomainSetSchedulerParameters">virDomainSetSchedulerParameters</a>  (<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> domain, <br/>                                      <a href="libvirt-libvirt.html#virSchedParameterPtr">virSchedParameterPtr</a> params, <br/>                                      int nparams);
@@ -129,7 +131,7 @@ int <a href="#virDomainSetVcpus">virDomainSetVcpus</a>              (<a href="libvirt-libvir
 <a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a>   <a href="#virDomainLookupByID">virDomainLookupByID</a>  (<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>                                      int id);
 int    <a href="#virNetworkGetUUIDString">virNetworkGetUUIDString</a>          (<a href="libvirt-libvirt.html#virNetworkPtr">virNetworkPtr</a> network, <br/>                                   char * buf);
 <a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a>   <a href="#virDomainMigrate">virDomainMigrate</a>        (<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> domain, <br/>                                      <a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> dconn, <br/>                                     unsigned long flags, <br/>                                      const char * dname, <br/>                                       const char * uri, <br/>                                         unsigned long bandwidth);
-<a href="libvirt-libvirt.html#virNetworkPtr">virNetworkPtr</a> <a href="#virNetworkCreateXML">virNetworkCreateXML</a>  (<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>                                      const char * xmlDesc);
+char * <a href="#virNetworkGetXMLDesc">virNetworkGetXMLDesc</a>                (<a href="libvirt-libvirt.html#virNetworkPtr">virNetworkPtr</a> network, <br/>                                   int flags);
 unsigned int   <a href="#virDomainGetID">virDomainGetID</a>            (<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> domain);
 int    <a href="#virDomainResume">virDomainResume</a>                  (<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> domain);
 <a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a>   <a href="#virDomainCreateLinux">virDomainCreateLinux</a>        (<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>                                      const char * xmlDesc, <br/>                                     unsigned int flags);
@@ -218,9 +220,17 @@ The content of this structure is not made public by the API.
 </pre><p/>
 </div>
         <hr/>
-        <div class="refsect2" lang="en"><h3><a name="virDomainBlockStatsPtr">Structure </a>virDomainBlockStatsPtr</h3><pre class="programlisting">struct _virDomainBlockStats * {
-The content of this structure is not made public by the API.
-} virDomainBlockStatsPtr;
+        <div class="refsect2" lang="en"><h3><a name="virDomainBlockStatsPtr">Typedef </a>virDomainBlockStatsPtr</h3><pre class="programlisting"><a href="libvirt-libvirt.html#virDomainBlockStatsStruct">virDomainBlockStatsStruct</a> * virDomainBlockStatsPtr;
+</pre><p>A pointer to a <a href="libvirt-libvirt.html#virDomainBlockStats">virDomainBlockStats</a> structure</p>
+</div>
+        <hr/>
+        <div class="refsect2" lang="en"><h3><a name="virDomainBlockStatsStruct">Structure </a>virDomainBlockStatsStruct</h3><pre class="programlisting">struct _virDomainBlockStats {
+    long long  rd_req
+    long long  rd_bytes
+    long long  wr_req
+    long long  wr_bytes
+    long long  errs    : In Xen this returns the mysterious 'oo_req'.
+} virDomainBlockStatsStruct;
 </pre><p/>
 </div>
         <hr/>
@@ -244,9 +254,20 @@ The content of this structure is not made public by the API.
 </pre><p>a <a href="libvirt-libvirt.html#virDomainInfoPtr">virDomainInfoPtr</a> is a pointer to a <a href="libvirt-libvirt.html#virDomainInfo">virDomainInfo</a> structure.</p>
 </div>
         <hr/>
-        <div class="refsect2" lang="en"><h3><a name="virDomainInterfaceStatsPtr">Structure </a>virDomainInterfaceStatsPtr</h3><pre class="programlisting">struct _virDomainInterfaceStats * {
-The content of this structure is not made public by the API.
-} virDomainInterfaceStatsPtr;
+        <div class="refsect2" lang="en"><h3><a name="virDomainInterfaceStatsPtr">Typedef </a>virDomainInterfaceStatsPtr</h3><pre class="programlisting"><a href="libvirt-libvirt.html#virDomainInterfaceStatsStruct">virDomainInterfaceStatsStruct</a> * virDomainInterfaceStatsPtr;
+</pre><p>A pointe to a <a href="libvirt-libvirt.html#virDomainInterfaceStats">virDomainInterfaceStats</a> structure</p>
+</div>
+        <hr/>
+        <div class="refsect2" lang="en"><h3><a name="virDomainInterfaceStatsStruct">Structure </a>virDomainInterfaceStatsStruct</h3><pre class="programlisting">struct _virDomainInterfaceStats {
+    long long  rx_bytes
+    long long  rx_packets
+    long long  rx_errs
+    long long  rx_drop
+    long long  tx_bytes
+    long long  tx_packets
+    long long  tx_errs
+    long long  tx_drop
+} virDomainInterfaceStatsStruct;
 </pre><p/>
 </div>
         <hr/>
@@ -357,7 +378,7 @@ The content of this structure is not made public by the API.
         <hr/>
         <div class="refsect2" lang="en"><h3><a name="virConnectGetCapabilities"/>virConnectGetCapabilities ()</h3><pre class="programlisting">char *   virConnectGetCapabilities       (<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn)<br/>
 </pre><p>Provides capabilities of the hypervisor / driver.</p>
-<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>conn</tt></i>:</span></td><td>pointer to the hypervisor connection</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>NULL in case of error, or a pointer to an opaque virCapabilities structure (virCapabilitiesPtr). The client must free the returned string after use.</td></tr></tbody></table></div></div>
+<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>conn</tt></i>:</span></td><td>pointer to the hypervisor connection</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>NULL in case of error, or an XML string defining the capabilities. The client must free the returned string after use.</td></tr></tbody></table></div></div>
         <hr/>
         <div class="refsect2" lang="en"><h3><a name="virConnectGetHostname"/>virConnectGetHostname ()</h3><pre class="programlisting">char *   virConnectGetHostname           (<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn)<br/>
 </pre><p>This returns the system hostname on which the hypervisor is running (the result of the gethostname(2) system call). If we are connected to a remote system, then this returns the hostname of the remote system.</p>

diff --git a/docs/html/libvirt-libvirt.html b/docs/html/libvirt-libvirt.html
index 4268ae0afe8e058e7b6fe9e9963f27f67c43a2ef..6e290ba8de2b402db4cf5180d11de0e30061ba0c 100644 (file)
--- a/docs/html/libvirt-libvirt.html
+++ b/docs/html/libvirt-libvirt.html
@@ -5,13 +5,13 @@ The content of this structure is not made public by the API.
 </pre><pre class="programlisting">Typedef <a href="libvirt-libvirt.html#virConnect">virConnect</a> * <a name="virConnectPtr" id="virConnectPtr">virConnectPtr</a>
 </pre><pre class="programlisting">Structure <a href="#virDomain">virDomain</a><br />struct _virDomain
 The content of this structure is not made public by the API.
-</pre><pre class="programlisting">Structure <a href="#virDomainBlockStatsPtr">virDomainBlockStatsPtr</a><br />struct _virDomainBlockStats *
-The content of this structure is not made public by the API.
+</pre><pre class="programlisting">Typedef <a href="libvirt-libvirt.html#virDomainBlockStatsStruct">virDomainBlockStatsStruct</a> * <a name="virDomainBlockStatsPtr" id="virDomainBlockStatsPtr">virDomainBlockStatsPtr</a>
+</pre><pre class="programlisting">Structure <a href="#virDomainBlockStatsStruct">virDomainBlockStatsStruct</a><br />struct _virDomainBlockStats
 </pre><pre class="programlisting">Enum <a href="#virDomainCreateFlags">virDomainCreateFlags</a>
 </pre><pre class="programlisting">Structure <a href="#virDomainInfo">virDomainInfo</a><br />struct _virDomainInfo
 </pre><pre class="programlisting">Typedef <a href="libvirt-libvirt.html#virDomainInfo">virDomainInfo</a> * <a name="virDomainInfoPtr" id="virDomainInfoPtr">virDomainInfoPtr</a>
-</pre><pre class="programlisting">Structure <a href="#virDomainInterfaceStatsPtr">virDomainInterfaceStatsPtr</a><br />struct _virDomainInterfaceStats *
-The content of this structure is not made public by the API.
+</pre><pre class="programlisting">Typedef <a href="libvirt-libvirt.html#virDomainInterfaceStatsStruct">virDomainInterfaceStatsStruct</a> * <a name="virDomainInterfaceStatsPtr" id="virDomainInterfaceStatsPtr">virDomainInterfaceStatsPtr</a>
+</pre><pre class="programlisting">Structure <a href="#virDomainInterfaceStatsStruct">virDomainInterfaceStatsStruct</a><br />struct _virDomainInterfaceStats
 </pre><pre class="programlisting">Enum <a href="#virDomainMigrateFlags">virDomainMigrateFlags</a>
 </pre><pre class="programlisting">Typedef <a href="libvirt-libvirt.html#virDomain">virDomain</a> * <a name="virDomainPtr" id="virDomainPtr">virDomainPtr</a>
 </pre><pre class="programlisting">Enum <a href="#virDomainRestart">virDomainRestart</a>
@@ -124,8 +124,14 @@ The content of this structure is not made public by the API.
       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.
     <h3><a name="virDomain" id="virDomain">Structure virDomain</a></h3><pre class="programlisting">Structure virDomain<br />struct _virDomain {
 The content of this structure is not made public by the API.
-}</pre><h3><a name="virDomainBlockStatsPtr" id="virDomainBlockStatsPtr">Structure virDomainBlockStatsPtr</a></h3><pre class="programlisting">Structure virDomainBlockStatsPtr<br />struct _virDomainBlockStats * {
-The content of this structure is not made public by the API.
+}</pre>
+      A pointer to a virDomainBlockStats structure
+    <h3><a name="virDomainBlockStatsStruct" id="virDomainBlockStatsStruct">Structure virDomainBlockStatsStruct</a></h3><pre class="programlisting">Structure virDomainBlockStatsStruct<br />struct _virDomainBlockStats {
+    long long  rd_req
+    long long  rd_bytes
+    long long  wr_req
+    long long  wr_bytes
+    long long  errs    : In Xen this returns the mysterious 'oo_
 }</pre><h3>Enum <a name="virDomainCreateFlags" id="virDomainCreateFlags">virDomainCreateFlags</a></h3><pre class="programlisting">Enum virDomainCreateFlags {
     <a name="VIR_DOMAIN_NONE" id="VIR_DOMAIN_NONE">VIR_DOMAIN_NONE</a> = 0
 }
@@ -137,8 +143,17 @@ The content of this structure is not made public by the API.
     unsigned long long cpuTime : the CPU time used in nanoseconds
 }</pre>
       a virDomainInfoPtr is a pointer to a virDomainInfo structure.
-    <h3><a name="virDomainInterfaceStatsPtr" id="virDomainInterfaceStatsPtr">Structure virDomainInterfaceStatsPtr</a></h3><pre class="programlisting">Structure virDomainInterfaceStatsPtr<br />struct _virDomainInterfaceStats * {
-The content of this structure is not made public by the API.
+    
+      A pointe to a virDomainInterfaceStats structure
+    <h3><a name="virDomainInterfaceStatsStruct" id="virDomainInterfaceStatsStruct">Structure virDomainInterfaceStatsStruct</a></h3><pre class="programlisting">Structure virDomainInterfaceStatsStruct<br />struct _virDomainInterfaceStats {
+    long long  rx_bytes
+    long long  rx_packets
+    long long  rx_errs
+    long long  rx_drop
+    long long  tx_bytes
+    long long  tx_packets
+    long long  tx_errs
+    long long  tx_drop
 }</pre><h3>Enum <a name="virDomainMigrateFlags" id="virDomainMigrateFlags">virDomainMigrateFlags</a></h3><pre class="programlisting">Enum virDomainMigrateFlags {
     <a name="VIR_MIGRATE_LIVE" id="VIR_MIGRATE_LIVE">VIR_MIGRATE_LIVE</a> = 1 : live migration
 }
@@ -201,7 +216,7 @@ The content of this structure is not made public by the API.
 </pre><p>This function closes the connection to the Hypervisor. This should not be called if further interaction with the Hypervisor are needed especially if there is running domain which need further monitoring by the application.</p>
 <div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>conn</tt></i>:</span></td><td>pointer to the hypervisor connection</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>0 in case of success or -1 in case of error.</td></tr></tbody></table></div><h3><a name="virConnectGetCapabilities" id="virConnectGetCapabilities"></a>Function: virConnectGetCapabilities</h3><pre class="programlisting">char *      virConnectGetCapabilities       (<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn)<br />
 </pre><p>Provides capabilities of the hypervisor / driver.</p>
-<div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>conn</tt></i>:</span></td><td>pointer to the hypervisor connection</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>NULL in case of error, or a pointer to an opaque virCapabilities structure (virCapabilitiesPtr). The client must free the returned string after use.</td></tr></tbody></table></div><h3><a name="virConnectGetHostname" id="virConnectGetHostname"></a>Function: virConnectGetHostname</h3><pre class="programlisting">char *  virConnectGetHostname           (<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn)<br />
+<div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>conn</tt></i>:</span></td><td>pointer to the hypervisor connection</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>NULL in case of error, or an XML string defining the capabilities. The client must free the returned string after use.</td></tr></tbody></table></div><h3><a name="virConnectGetHostname" id="virConnectGetHostname"></a>Function: virConnectGetHostname</h3><pre class="programlisting">char *        virConnectGetHostname           (<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn)<br />
 </pre><p>This returns the system hostname on which the hypervisor is running (the result of the gethostname(2) system call). If we are connected to a remote system, then this returns the hostname of the remote system.</p>
 <div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>conn</tt></i>:</span></td><td>pointer to a hypervisor connection</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the hostname which must be freed by the caller, or NULL if there was an error.</td></tr></tbody></table></div><h3><a name="virConnectGetMaxVcpus" id="virConnectGetMaxVcpus"></a>Function: virConnectGetMaxVcpus</h3><pre class="programlisting">int     virConnectGetMaxVcpus           (<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br />                                     const char * type)<br />
 </pre><p>Provides the maximum number of virtual CPUs supported for a guest VM of a specific type. The 'type' parameter here corresponds to the 'type' attribute in the &lt;domain&gt; element of the XML.</p>

diff --git a/docs/libvirt-api.xml b/docs/libvirt-api.xml
index e8f0f4a293ff50874fb043f6408d4b0b0e6ebc9e..04f082ee21835fa6c5749cc245274499727c78e5 100644 (file)
--- a/docs/libvirt-api.xml
+++ b/docs/libvirt-api.xml
@@ -38,26 +38,28 @@
      <exports symbol='VIR_DOMAIN_NONE' type='enum'/>
      <exports symbol='VIR_DOMAIN_NOSTATE' type='enum'/>
      <exports symbol='VIR_DOMAIN_RENAME_RESTART' type='enum'/>
+     <exports symbol='virDomainBlockStatsStruct' type='typedef'/>
      <exports symbol='virDomainMigrateFlags' type='typedef'/>
      <exports symbol='virNodeInfo' type='typedef'/>
      <exports symbol='virNetwork' type='typedef'/>
      <exports symbol='virDomainBlockStatsPtr' type='typedef'/>
+     <exports symbol='virSchedParameterType' type='typedef'/>
      <exports symbol='virConnect' type='typedef'/>
      <exports symbol='virVcpuInfo' type='typedef'/>
      <exports symbol='virDomainInfo' type='typedef'/>
-     <exports symbol='virSchedParameter' type='typedef'/>
+     <exports symbol='virDomainInterfaceStatsStruct' type='typedef'/>
      <exports symbol='virDomainState' type='typedef'/>
      <exports symbol='virDomain' type='typedef'/>
      <exports symbol='virDomainInterfaceStatsPtr' type='typedef'/>
-     <exports symbol='virSchedParameterType' type='typedef'/>
      <exports symbol='virDomainRestart' type='typedef'/>
+     <exports symbol='virSchedParameterPtr' type='typedef'/>
      <exports symbol='virNodeInfoPtr' type='typedef'/>
      <exports symbol='virNetworkPtr' type='typedef'/>
      <exports symbol='virDomainInfoPtr' type='typedef'/>
      <exports symbol='virConnectPtr' type='typedef'/>
-     <exports symbol='virVcpuInfoPtr' type='typedef'/>
-     <exports symbol='virSchedParameterPtr' type='typedef'/>
+     <exports symbol='virSchedParameter' type='typedef'/>
      <exports symbol='virVcpuState' type='typedef'/>
+     <exports symbol='virVcpuInfoPtr' type='typedef'/>
      <exports symbol='virDomainPtr' type='typedef'/>
      <exports symbol='virDomainCreateFlags' type='typedef'/>
      <exports symbol='_virDomainInfo' type='struct'/>
@@ -81,7 +83,6 @@
      <exports symbol='virDomainLookupByName' type='function'/>
      <exports symbol='virNetworkLookupByUUID' type='function'/>
      <exports symbol='virNetworkGetBridgeName' type='function'/>
-     <exports symbol='virNetworkGetXMLDesc' type='function'/>
      <exports symbol='virDomainPinVcpu' type='function'/>
      <exports symbol='virDomainRestore' type='function'/>
      <exports symbol='virConnectGetType' type='function'/>
@@ -112,8 +113,9 @@
      <exports symbol='virDomainSetAutostart' type='function'/>
      <exports symbol='virDomainSuspend' type='function'/>
      <exports symbol='virConnectGetMaxVcpus' type='function'/>
-     <exports symbol='virConnectNumOfDefinedDomains' type='function'/>
      <exports symbol='virNetworkGetConnect' type='function'/>
+     <exports symbol='virConnectNumOfDefinedDomains' type='function'/>
+     <exports symbol='virNetworkCreateXML' type='function'/>
      <exports symbol='virNetworkDefineXML' type='function'/>
      <exports symbol='virNetworkCreate' type='function'/>
      <exports symbol='virDomainSetSchedulerParameters' type='function'/>
@@ -124,7 +126,7 @@
      <exports symbol='virDomainLookupByID' type='function'/>
      <exports symbol='virNetworkGetUUIDString' type='function'/>
      <exports symbol='virDomainMigrate' type='function'/>
-     <exports symbol='virNetworkCreateXML' type='function'/>
+     <exports symbol='virNetworkGetXMLDesc' type='function'/>
      <exports symbol='virDomainGetID' type='function'/>
      <exports symbol='virDomainResume' type='function'/>
      <exports symbol='virDomainCreateLinux' type='function'/>
@@ -373,7 +375,16 @@
       <info>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.</info>
     </typedef>
     <struct name='virDomain' file='libvirt' type='struct _virDomain'/>
-    <struct name='virDomainBlockStatsPtr' file='libvirt' type='struct _virDomainBlockStats *'/>
+    <typedef name='virDomainBlockStatsPtr' file='libvirt' type='virDomainBlockStatsStruct *'>
+      <info>A pointer to a virDomainBlockStats structure</info>
+    </typedef>
+    <struct name='virDomainBlockStatsStruct' file='libvirt' type='struct _virDomainBlockStats'>
+      <field name='rd_req' type='long long' info=''/>
+      <field name='rd_bytes' type='long long' info=''/>
+      <field name='wr_req' type='long long' info=''/>
+      <field name='wr_bytes' type='long long' info=''/>
+      <field name='errs' type='long long' info=' In Xen this returns the mysterious &apos;oo_req&apos;.'/>
+    </struct>
     <typedef name='virDomainCreateFlags' file='libvirt' type='enum'/>
     <struct name='virDomainInfo' file='libvirt' type='struct _virDomainInfo'>
       <field name='state' type='unsigned char' info=' the running state, one of virDomainFlags'/>
@@ -385,7 +396,19 @@
     <typedef name='virDomainInfoPtr' file='libvirt' type='virDomainInfo *'>
       <info>a virDomainInfoPtr is a pointer to a virDomainInfo structure.</info>
     </typedef>
-    <struct name='virDomainInterfaceStatsPtr' file='libvirt' type='struct _virDomainInterfaceStats *'/>
+    <typedef name='virDomainInterfaceStatsPtr' file='libvirt' type='virDomainInterfaceStatsStruct *'>
+      <info>A pointe to a virDomainInterfaceStats structure</info>
+    </typedef>
+    <struct name='virDomainInterfaceStatsStruct' file='libvirt' type='struct _virDomainInterfaceStats'>
+      <field name='rx_bytes' type='long long' info=''/>
+      <field name='rx_packets' type='long long' info=''/>
+      <field name='rx_errs' type='long long' info=''/>
+      <field name='rx_drop' type='long long' info=''/>
+      <field name='tx_bytes' type='long long' info=''/>
+      <field name='tx_packets' type='long long' info=''/>
+      <field name='tx_errs' type='long long' info=''/>
+      <field name='tx_drop' type='long long' info=''/>
+    </struct>
     <typedef name='virDomainMigrateFlags' file='libvirt' type='enum'/>
     <typedef name='virDomainPtr' file='libvirt' type='virDomain *'>
       <info>a virDomainPtr is pointer to a virDomain private structure, this is the type used to reference a Xen domain in the API.</info>
@@ -473,7 +496,7 @@
     </function>
     <function name='virConnectGetCapabilities' file='libvirt' module='libvirt'>
       <info>Provides capabilities of the hypervisor / driver.</info>
-      <return type='char *' info='NULL in case of error, or a pointer to an opaque virCapabilities structure (virCapabilitiesPtr). The client must free the returned string after use.'/>
+      <return type='char *' info='NULL in case of error, or an XML string defining the capabilities. The client must free the returned string after use.'/>
       <arg name='conn' type='virConnectPtr' info='pointer to the hypervisor connection'/>
     </function>
     <function name='virConnectGetHostname' file='libvirt' module='libvirt'>

diff --git a/docs/libvirt-refs.xml b/docs/libvirt-refs.xml
index 8c625e77a2a31b54d028e348bdaeef29a6c78be0..7f77c047c6b185f5cfd97cb3d4aace66cddbe739 100644 (file)
--- a/docs/libvirt-refs.xml
+++ b/docs/libvirt-refs.xml
@@ -133,6 +133,7 @@
     <reference name='virDomainAttachDevice' href='html/libvirt-libvirt.html#virDomainAttachDevice'/>
     <reference name='virDomainBlockStats' href='html/libvirt-libvirt.html#virDomainBlockStats'/>
     <reference name='virDomainBlockStatsPtr' href='html/libvirt-libvirt.html#virDomainBlockStatsPtr'/>
+    <reference name='virDomainBlockStatsStruct' href='html/libvirt-libvirt.html#virDomainBlockStatsStruct'/>
     <reference name='virDomainCoreDump' href='html/libvirt-libvirt.html#virDomainCoreDump'/>
     <reference name='virDomainCreate' href='html/libvirt-libvirt.html#virDomainCreate'/>
     <reference name='virDomainCreateFlags' href='html/libvirt-libvirt.html#virDomainCreateFlags'/>
@@ -159,6 +160,7 @@
     <reference name='virDomainInfoPtr' href='html/libvirt-libvirt.html#virDomainInfoPtr'/>
     <reference name='virDomainInterfaceStats' href='html/libvirt-libvirt.html#virDomainInterfaceStats'/>
     <reference name='virDomainInterfaceStatsPtr' href='html/libvirt-libvirt.html#virDomainInterfaceStatsPtr'/>
+    <reference name='virDomainInterfaceStatsStruct' href='html/libvirt-libvirt.html#virDomainInterfaceStatsStruct'/>
     <reference name='virDomainLookupByID' href='html/libvirt-libvirt.html#virDomainLookupByID'/>
     <reference name='virDomainLookupByName' href='html/libvirt-libvirt.html#virDomainLookupByName'/>
     <reference name='virDomainLookupByUUID' href='html/libvirt-libvirt.html#virDomainLookupByUUID'/>
@@ -362,6 +364,7 @@
       <ref name='virDomainAttachDevice'/>
       <ref name='virDomainBlockStats'/>
       <ref name='virDomainBlockStatsPtr'/>
+      <ref name='virDomainBlockStatsStruct'/>
       <ref name='virDomainCoreDump'/>
       <ref name='virDomainCreate'/>
       <ref name='virDomainCreateFlags'/>
@@ -388,6 +391,7 @@
       <ref name='virDomainInfoPtr'/>
       <ref name='virDomainInterfaceStats'/>
       <ref name='virDomainInterfaceStatsPtr'/>
+      <ref name='virDomainInterfaceStatsStruct'/>
       <ref name='virDomainLookupByID'/>
       <ref name='virDomainLookupByName'/>
       <ref name='virDomainLookupByUUID'/>
@@ -714,6 +718,7 @@
       <ref name='virDomainAttachDevice'/>
       <ref name='virDomainBlockStats'/>
       <ref name='virDomainBlockStatsPtr'/>
+      <ref name='virDomainBlockStatsStruct'/>
       <ref name='virDomainCoreDump'/>
       <ref name='virDomainCreate'/>
       <ref name='virDomainCreateFlags'/>
@@ -740,6 +745,7 @@
       <ref name='virDomainInfoPtr'/>
       <ref name='virDomainInterfaceStats'/>
       <ref name='virDomainInterfaceStatsPtr'/>
+      <ref name='virDomainInterfaceStatsStruct'/>
       <ref name='virDomainLookupByID'/>
       <ref name='virDomainLookupByName'/>
       <ref name='virDomainLookupByUUID'/>
@@ -1297,6 +1303,7 @@
       </letter>
       <letter name='X'>
         <word name='XML'>
+          <ref name='virConnectGetCapabilities'/>
           <ref name='virConnectGetMaxVcpus'/>
           <ref name='virDomainAttachDevice'/>
           <ref name='virDomainCreateLinux'/>
@@ -1308,6 +1315,7 @@
           <ref name='virNetworkGetXMLDesc'/>
         </word>
         <word name='Xen'>
+          <ref name='_virDomainBlockStats'/>
           <ref name='virDomainCoreDump'/>
           <ref name='virDomainGetVcpus'/>
           <ref name='virDomainPinVcpu'/>
@@ -1846,6 +1854,9 @@
           <ref name='virNetworkCreate'/>
           <ref name='virNetworkUndefine'/>
         </word>
+        <word name='defining'>
+          <ref name='virConnectGetCapabilities'/>
+        </word>
         <word name='described'>
           <ref name='virDomainGetVcpus'/>
         </word>
@@ -2629,6 +2640,9 @@
           <ref name='virNetworkGetBridgeName'/>
           <ref name='virNetworkGetXMLDesc'/>
         </word>
+        <word name='mysterious'>
+          <ref name='_virDomainBlockStats'/>
+        </word>
       </letter>
     </chunk>
     <chunk name='chunk4'>
@@ -2735,8 +2749,8 @@
           <ref name='virConnectGetVersion'/>
           <ref name='virDomainGetInfo'/>
         </word>
-        <word name='opaque'>
-          <ref name='virConnectGetCapabilities'/>
+        <word name='oo_req'>
+          <ref name='_virDomainBlockStats'/>
         </word>
         <word name='operation'>
           <ref name='virDomainGetOSType'/>
@@ -3067,6 +3081,7 @@
           <ref name='VIR_CPU_MAPLEN'/>
           <ref name='VIR_CPU_USABLE'/>
           <ref name='VIR_GET_CPUMAP'/>
+          <ref name='_virDomainBlockStats'/>
           <ref name='virConnectGetHostname'/>
           <ref name='virConnectGetURI'/>
           <ref name='virConnectGetVersion'/>
@@ -3297,7 +3312,6 @@
           <ref name='virNetworkLookupByUUIDString'/>
         </word>
         <word name='structure'>
-          <ref name='virConnectGetCapabilities'/>
           <ref name='virDomainBlockStats'/>
           <ref name='virDomainDestroy'/>
           <ref name='virDomainFree'/>
@@ -3427,6 +3441,7 @@
           <ref name='virNetworkFree'/>
         </word>
         <word name='this'>
+          <ref name='_virDomainBlockStats'/>
           <ref name='_virError'/>
           <ref name='virConnectGetHostname'/>
           <ref name='virConnectGetURI'/>
@@ -3604,12 +3619,6 @@
           <ref name='virConnectGetVersion'/>
           <ref name='virGetVersion'/>
         </word>
-        <word name='virCapabilities'>
-          <ref name='virConnectGetCapabilities'/>
-        </word>
-        <word name='virCapabilitiesPtr'>
-          <ref name='virConnectGetCapabilities'/>
-        </word>
         <word name='virConnCopyLastError'>
           <ref name='virConnGetLastError'/>
         </word>

diff --git a/include/libvirt/libvirt.h b/include/libvirt/libvirt.h
index 553613129c53c0dc5e981c34fd153894fd2ef6a7..cacb258eb656920e92d7c6c0020e6ca9c7168e2c 100644 (file)
--- a/include/libvirt/libvirt.h
+++ b/include/libvirt/libvirt.h
@@ -199,29 +199,45 @@ int       virDomainSetSchedulerParameters (virDomainPtr domain,
                                         virSchedParameterPtr params,
                                         int nparams);
 
-/* Block device stats for virDomainBlockStats.
+/**
+ * virDomainBlockStats:
+ *
+ * Block device stats for virDomainBlockStats.
  *
  * Hypervisors may return a field set to ((long long)-1) which indicates
  * that the hypervisor does not support that statistic.
  *
  * NB. Here 'long long' means 64 bit integer.
  */
+typedef struct _virDomainBlockStats virDomainBlockStatsStruct;
+
 struct _virDomainBlockStats {
   long long rd_req;
   long long rd_bytes;
   long long wr_req;
   long long wr_bytes;
-  long long errs;   // In Xen this returns the mysterious 'oo_req'.
+  long long errs;   /* In Xen this returns the mysterious 'oo_req'. */
 };
-typedef struct _virDomainBlockStats *virDomainBlockStatsPtr;
 
-/* Network interface stats for virDomainInterfaceStats.
+/**
+ * virDomainBlockStatsPtr:
+ *
+ * A pointer to a virDomainBlockStats structure
+ */
+typedef virDomainBlockStatsStruct *virDomainBlockStatsPtr;
+
+/**
+ * virDomainInterfaceStats:
+ *
+ * Network interface stats for virDomainInterfaceStats.
  *
  * Hypervisors may return a field set to ((long long)-1) which indicates
  * that the hypervisor does not support that statistic.
  *
  * NB. Here 'long long' means 64 bit integer.
  */
+typedef struct _virDomainInterfaceStats virDomainInterfaceStatsStruct;
+
 struct _virDomainInterfaceStats {
   long long rx_bytes;
   long long rx_packets;
@@ -232,7 +248,14 @@ struct _virDomainInterfaceStats {
   long long tx_errs;
   long long tx_drop;
 };
-typedef struct _virDomainInterfaceStats *virDomainInterfaceStatsPtr;
+
+/**
+ * virDomainInterfaceStatsPtr:
+ *
+ * A pointe to a virDomainInterfaceStats structure
+ */
+typedef virDomainInterfaceStatsStruct *virDomainInterfaceStatsPtr;
+
 
 /* Domain migration flags. */
 typedef enum {

diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in
index 7a0df52d11b50e6c57310016b7f8d2f3fd4a21ac..0cbb5e7c2ee1be413d6bb7c388d168e86449ebe9 100644 (file)
--- a/include/libvirt/libvirt.h.in
+++ b/include/libvirt/libvirt.h.in
@@ -199,29 +199,45 @@ int       virDomainSetSchedulerParameters (virDomainPtr domain,
                                         virSchedParameterPtr params,
                                         int nparams);
 
-/* Block device stats for virDomainBlockStats.
+/**
+ * virDomainBlockStats:
+ *
+ * Block device stats for virDomainBlockStats.
  *
  * Hypervisors may return a field set to ((long long)-1) which indicates
  * that the hypervisor does not support that statistic.
  *
  * NB. Here 'long long' means 64 bit integer.
  */
+typedef struct _virDomainBlockStats virDomainBlockStatsStruct;
+
 struct _virDomainBlockStats {
   long long rd_req;
   long long rd_bytes;
   long long wr_req;
   long long wr_bytes;
-  long long errs;   // In Xen this returns the mysterious 'oo_req'.
+  long long errs;   /* In Xen this returns the mysterious 'oo_req'. */
 };
-typedef struct _virDomainBlockStats *virDomainBlockStatsPtr;
 
-/* Network interface stats for virDomainInterfaceStats.
+/**
+ * virDomainBlockStatsPtr:
+ *
+ * A pointer to a virDomainBlockStats structure
+ */
+typedef virDomainBlockStatsStruct *virDomainBlockStatsPtr;
+
+/**
+ * virDomainInterfaceStats:
+ *
+ * Network interface stats for virDomainInterfaceStats.
  *
  * Hypervisors may return a field set to ((long long)-1) which indicates
  * that the hypervisor does not support that statistic.
  *
  * NB. Here 'long long' means 64 bit integer.
  */
+typedef struct _virDomainInterfaceStats virDomainInterfaceStatsStruct;
+
 struct _virDomainInterfaceStats {
   long long rx_bytes;
   long long rx_packets;
@@ -232,7 +248,14 @@ struct _virDomainInterfaceStats {
   long long tx_errs;
   long long tx_drop;
 };
-typedef struct _virDomainInterfaceStats *virDomainInterfaceStatsPtr;
+
+/**
+ * virDomainInterfaceStatsPtr:
+ *
+ * A pointe to a virDomainInterfaceStats structure
+ */
+typedef virDomainInterfaceStatsStruct *virDomainInterfaceStatsPtr;
+
 
 /* Domain migration flags. */
 typedef enum {

diff --git a/src/libvirt.c b/src/libvirt.c
index daaa9f8f4bcd97b5ac32f45ab1a87120ea8efa86..8ad8ac26167b1cc594eed3be1c7f69553b4fd2ed 100644 (file)
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -1928,8 +1928,8 @@ virNodeGetInfo(virConnectPtr conn, virNodeInfoPtr info)
  *
  * Provides capabilities of the hypervisor / driver.
  *
- * Returns NULL in case of error, or a pointer to an opaque
- * virCapabilities structure (virCapabilitiesPtr).
+ * Returns NULL in case of error, or an XML string
+ * defining the capabilities.
  * The client must free the returned string after use.
  */
 char *