External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-05 05:45:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

virDomainDefineXML, and a few additional cleanups

Browse Source 
* include/libvirt/libvirt.h[.in] include/libvirt/virterror.h
  qemud/remote* src/driver.h src/libvirt.c src/libvirt_sym.version
  src/lxc_driver.c src/openvz_driver.c src/proxy_internal.c
  src/qemu_driver.c src/remote_internal.c src/test.c src/virsh.c
  src/xen_internal.c src/xen_unified.c src/xen_unified.h
  src/xend_internal.c src/xend_internal.h src/xm_internal.c
  src/xs_internal.c docs/*: cleanup virDomainCreateLinux into
  virDomainDefineXML, and a few additional cleanups
Daniel
This commit is contained in:
Daniel Veillard 2008-10-10 09:32:27 +00:00
parent 3d038d101f
commit f6803c960f
34 changed files with 232 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
Fri Oct 10 11:17:59 CEST 2008 Daniel Veillard <veillard@redhat.com>
* include/libvirt/libvirt.h[.in] include/libvirt/virterror.h
qemud/remote* src/driver.h src/libvirt.c src/libvirt_sym.version
src/lxc_driver.c src/openvz_driver.c src/proxy_internal.c
src/qemu_driver.c src/remote_internal.c src/test.c src/virsh.c
src/xen_internal.c src/xen_unified.c src/xen_unified.h
src/xend_internal.c src/xend_internal.h src/xm_internal.c
src/xs_internal.c docs/*: cleanup virDomainCreateLinux into
virDomainDefineXML, and a few additional cleanups
Fri Oct 10 10:33:29 CEST 2008 Daniel Veillard <veillard@redhat.com>
* src/domain_conf.c src/util.c: fix index creation for disks >

11
docs/devhelp/libvirt-libvirt.html
View File

@ -141,6 +141,7 @@ int <a href="#virDomainCreate">virDomainCreate</a> (<a href="libvirt-libvirt.h
int <a href="#virConnectListDomains">virConnectListDomains</a> (<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/> int * ids, <br/> int maxids);
int <a href="#virDomainCoreDump">virDomainCoreDump</a> (<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> domain, <br/> const char * to, <br/> int flags);
int <a href="#virDomainSetMemory">virDomainSetMemory</a> (<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> domain, <br/> unsigned long memory);
int <a href="#virStoragePoolCreate">virStoragePoolCreate</a> (<a href="libvirt-libvirt.html#virStoragePoolPtr">virStoragePoolPtr</a> pool, <br/> unsigned int flags);
int <a href="#virNodeGetInfo">virNodeGetInfo</a> (<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/> <a href="libvirt-libvirt.html#virNodeInfoPtr">virNodeInfoPtr</a> info);
int <a href="#virNetworkSetAutostart">virNetworkSetAutostart</a> (<a href="libvirt-libvirt.html#virNetworkPtr">virNetworkPtr</a> network, <br/> int autostart);
unsigned long <a href="#virDomainGetMaxMemory">virDomainGetMaxMemory</a> (<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> domain);
@ -212,7 +213,7 @@ int <a href="#virDomainGetUUIDString">virDomainGetUUIDString</a> (<a href="libv
<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> <a href="#virDomainGetConnect">virDomainGetConnect</a> (<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> dom);
int <a href="#virConnectNumOfDefinedStoragePools">virConnectNumOfDefinedStoragePools</a> (<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn);
<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> <a href="#virConnectOpen">virConnectOpen</a> (const char * name);
int <a href="#virStoragePoolCreate">virStoragePoolCreate</a> (<a href="libvirt-libvirt.html#virStoragePoolPtr">virStoragePoolPtr</a> pool, <br/> unsigned int flags);
<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> <a href="#virDomainCreateXML">virDomainCreateXML</a> (<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/> const char * xmlDesc, <br/> unsigned int flags);
int <a href="#virDomainSetVcpus">virDomainSetVcpus</a> (<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> domain, <br/> unsigned int nvcpus);
unsigned int <a href="#virDomainGetID">virDomainGetID</a> (<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> domain);
int <a href="#virDomainBlockPeek">virDomainBlockPeek</a> (<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> dom, <br/> const char * path, <br/> unsigned long long offset, <br/> size_t size, <br/> void * buffer, <br/> unsigned int flags);
@ -694,7 +695,11 @@ The content of this structure is not made public by the API.
<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>domain</tt></i>:</span></td><td>pointer to a defined domain</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>0 in case of success, -1 in case of error</td></tr></tbody></table></div></div>
<hr/>
<div class="refsect2" lang="en"><h3><a name="virDomainCreateLinux"/>virDomainCreateLinux ()</h3><pre class="programlisting"><a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> virDomainCreateLinux (<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/> const char * xmlDesc, <br/> unsigned int flags)<br/>
</pre><p>Launch a new Linux guest domain, based on an XML description similar to the one returned by virDomainGetXMLDesc() This function may requires privileged access to the hypervisor. The domain is not persistent, so its definition will disappear when it is destroyed, or if the host is restarted (see virDomainDefineXML() to define persistent domains).</p>
</pre><p>Deprecated after 0.4.6. Renamed to virDomainCreateXML() providing identical functionality. This existing name will left indefinitely for API compatability.</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>xmlDesc</tt></i>:</span></td><td>string containing an XML description of the domain</td></tr><tr><td><span class="term"><i><tt>flags</tt></i>:</span></td><td>callers should always pass 0</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>a new domain object or NULL in case of failure</td></tr></tbody></table></div></div>
<hr/>
<div class="refsect2" lang="en"><h3><a name="virDomainCreateXML"/>virDomainCreateXML ()</h3><pre class="programlisting"><a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> virDomainCreateXML (<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/> const char * xmlDesc, <br/> unsigned int flags)<br/>
</pre><p>Launch a new guest domain, based on an XML description similar to the one returned by virDomainGetXMLDesc() This function may requires privileged access to the hypervisor. The domain is not persistent, so its definition will disappear when it is destroyed, or if the host is restarted (see virDomainDefineXML() to define persistent domains).</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>xmlDesc</tt></i>:</span></td><td>string containing an XML description of the domain</td></tr><tr><td><span class="term"><i><tt>flags</tt></i>:</span></td><td>callers should always pass 0</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>a new domain object or NULL in case of failure</td></tr></tbody></table></div></div>
<hr/>
<div class="refsect2" lang="en"><h3><a name="virDomainDefineXML"/>virDomainDefineXML ()</h3><pre class="programlisting"><a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> virDomainDefineXML (<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/> const char * xml)<br/>
@ -766,7 +771,7 @@ The content of this structure is not made public by the API.
<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>domain</tt></i>:</span></td><td>pointer to domain object, or NULL for Domain0</td></tr><tr><td><span class="term"><i><tt>info</tt></i>:</span></td><td>pointer to an array of <a href="libvirt-libvirt.html#virVcpuInfo">virVcpuInfo</a> structures (OUT)</td></tr><tr><td><span class="term"><i><tt>maxinfo</tt></i>:</span></td><td>number of structures in info array</td></tr><tr><td><span class="term"><i><tt>cpumaps</tt></i>:</span></td><td>pointer to an bit map of real CPUs for all vcpus of this domain (in 8-bit bytes) (OUT) If cpumaps is NULL, then no cpumap information is returned by the API. It's assumed there is &lt;maxinfo&gt; cpumap in cpumaps array. The memory allocated to cpumaps must be (maxinfo * maplen) bytes (ie: calloc(maxinfo, maplen)). One cpumap inside cpumaps has the format described in virDomainPinVcpu() API.</td></tr><tr><td><span class="term"><i><tt>maplen</tt></i>:</span></td><td>number of bytes in one cpumap, from 1 up to size of CPU map in underlying virtualization system (Xen...).</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the number of info filled in case of success, -1 in case of failure.</td></tr></tbody></table></div></div>
<hr/>
<div class="refsect2" lang="en"><h3><a name="virDomainGetXMLDesc"/>virDomainGetXMLDesc ()</h3><pre class="programlisting">char * virDomainGetXMLDesc (<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> domain, <br/> int flags)<br/>
</pre><p>Provide an XML description of the domain. The description may be reused later to relaunch the domain with virDomainCreateLinux().</p>
</pre><p>Provide an XML description of the domain. The description may be reused later to relaunch the domain with virDomainCreateXML().</p>
<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>domain</tt></i>:</span></td><td>a domain object</td></tr><tr><td><span class="term"><i><tt>flags</tt></i>:</span></td><td>an OR'ed set of <a href="libvirt-libvirt.html#virDomainXMLFlags">virDomainXMLFlags</a></td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>a 0 terminated UTF-8 encoded XML instance, or NULL in case of error. the caller must free() the returned value.</td></tr></tbody></table></div></div>
<hr/>
<div class="refsect2" lang="en"><h3><a name="virDomainInterfaceStats"/>virDomainInterfaceStats ()</h3><pre class="programlisting">int virDomainInterfaceStats (<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> dom, <br/> const char * path, <br/> <a href="libvirt-libvirt.html#virDomainInterfaceStatsPtr">virDomainInterfaceStatsPtr</a> stats, <br/> size_t size)<br/>

6
docs/devhelp/libvirt-virterror.html
View File

@ -67,14 +67,14 @@ void <a href="#virConnResetLastError">virConnResetLastError</a> (<a href="libvi
int domain : What part of the library raised this error
char * message : human-readable informative error message
<a href="libvirt-virterror.html#virErrorLevel">virErrorLevel</a> level : how consequent is the error
<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn : connection if available, see note above
<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> dom : domain if available, see note above
<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn : connection if available, deprecated see note above
<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> dom : domain if available, deprecated see note above
char * str1 : extra string information
char * str2 : extra string information
char * str3 : extra string information
int int1 : extra number information
int int2 : extra number information
<a href="libvirt-libvirt.html#virNetworkPtr">virNetworkPtr</a> net : network if available, see note above
<a href="libvirt-libvirt.html#virNetworkPtr">virNetworkPtr</a> net : network if available, deprecated see note above
} virError;
</pre><p/>
</div>

6
docs/html/libvirt-libvirt.html
View File

@ -90,6 +90,7 @@ int <a href="#virDomainBlockStats">virDomainBlockStats</a> (<a href="libvirt-li
int <a href="#virDomainCoreDump">virDomainCoreDump</a> (<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> domain, <br /> const char * to, <br /> int flags)
int <a href="#virDomainCreate">virDomainCreate</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)
<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> <a href="#virDomainCreateXML">virDomainCreateXML</a> (<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br /> const char * xmlDesc, <br /> unsigned int flags)
<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> <a href="#virDomainDefineXML">virDomainDefineXML</a> (<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br /> const char * xml)
int <a href="#virDomainDestroy">virDomainDestroy</a> (<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> domain)
int <a href="#virDomainDetachDevice">virDomainDetachDevice</a> (<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> domain, <br /> const char * xml)
@ -288,7 +289,8 @@ char * <a href="#virStorageVolGetXMLDesc">virStorageVolGetXMLDesc</a> (<a href=
</pre><p>This function returns block device (disk) stats for block devices attached to the domain. The path parameter is the name of the block device. Get this by calling <a href="libvirt-libvirt.html#virDomainGetXMLDesc">virDomainGetXMLDesc</a> and finding the &lt;target dev='...'&gt; attribute within //domain/devices/disk. (For example, "xvda"). Domains may have more than one block device. To get stats for each you should make multiple calls to this function. Individual fields within the stats structure may be returned as -1, which indicates that the hypervisor does not support that particular statistic.</p><div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>dom</tt></i>:</span></td><td>pointer to the domain object</td></tr><tr><td><span class="term"><i><tt>path</tt></i>:</span></td><td>path to the block device</td></tr><tr><td><span class="term"><i><tt>stats</tt></i>:</span></td><td>block device stats (returned)</td></tr><tr><td><span class="term"><i><tt>size</tt></i>:</span></td><td>size of stats structure</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 failure.</td></tr></tbody></table></div><h3><a name="virDomainCoreDump" id="virDomainCoreDump"><code>virDomainCoreDump</code></a></h3><pre class="programlisting">int virDomainCoreDump (<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> domain, <br /> const char * to, <br /> int flags)<br />
</pre><p>This method will dump the core of a domain on a given file for analysis. Note that for remote Xen Daemon the file path will be interpreted in the remote host.</p><div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>domain</tt></i>:</span></td><td>a domain object</td></tr><tr><td><span class="term"><i><tt>to</tt></i>:</span></td><td>path for the core file</td></tr><tr><td><span class="term"><i><tt>flags</tt></i>:</span></td><td>extra flags, currently unused</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>0 in case of success and -1 in case of failure.</td></tr></tbody></table></div><h3><a name="virDomainCreate" id="virDomainCreate"><code>virDomainCreate</code></a></h3><pre class="programlisting">int virDomainCreate (<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> domain)<br />
</pre><p>launch a defined domain. If the call succeed the domain moves from the defined to the running domains pools.</p><div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>domain</tt></i>:</span></td><td>pointer to a defined domain</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>0 in case of success, -1 in case of error</td></tr></tbody></table></div><h3><a name="virDomainCreateLinux" id="virDomainCreateLinux"><code>virDomainCreateLinux</code></a></h3><pre class="programlisting"><a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> virDomainCreateLinux (<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br /> const char * xmlDesc, <br /> unsigned int flags)<br />
</pre><p>Launch a new Linux guest domain, based on an XML description similar to the one returned by virDomainGetXMLDesc() This function may requires privileged access to the hypervisor. The domain is not persistent, so its definition will disappear when it is destroyed, or if the host is restarted (see virDomainDefineXML() to define persistent domains).</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>xmlDesc</tt></i>:</span></td><td>string containing an XML description of the domain</td></tr><tr><td><span class="term"><i><tt>flags</tt></i>:</span></td><td>callers should always pass 0</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>a new domain object or NULL in case of failure</td></tr></tbody></table></div><h3><a name="virDomainDefineXML" id="virDomainDefineXML"><code>virDomainDefineXML</code></a></h3><pre class="programlisting"><a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> virDomainDefineXML (<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br /> const char * xml)<br />
</pre><p>Deprecated after 0.4.6. Renamed to virDomainCreateXML() providing identical functionality. This existing name will left indefinitely for API compatability.</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>xmlDesc</tt></i>:</span></td><td>string containing an XML description of the domain</td></tr><tr><td><span class="term"><i><tt>flags</tt></i>:</span></td><td>callers should always pass 0</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>a new domain object or NULL in case of failure</td></tr></tbody></table></div><h3><a name="virDomainCreateXML" id="virDomainCreateXML"><code>virDomainCreateXML</code></a></h3><pre class="programlisting"><a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> virDomainCreateXML (<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br /> const char * xmlDesc, <br /> unsigned int flags)<br />
</pre><p>Launch a new guest domain, based on an XML description similar to the one returned by virDomainGetXMLDesc() This function may requires privileged access to the hypervisor. The domain is not persistent, so its definition will disappear when it is destroyed, or if the host is restarted (see virDomainDefineXML() to define persistent domains).</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>xmlDesc</tt></i>:</span></td><td>string containing an XML description of the domain</td></tr><tr><td><span class="term"><i><tt>flags</tt></i>:</span></td><td>callers should always pass 0</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>a new domain object or NULL in case of failure</td></tr></tbody></table></div><h3><a name="virDomainDefineXML" id="virDomainDefineXML"><code>virDomainDefineXML</code></a></h3><pre class="programlisting"><a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> virDomainDefineXML (<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br /> const char * xml)<br />
</pre><p>Define a domain, but does not start it. This definition is persistent, until explicitly undefined with virDomainUndefine().</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>xml</tt></i>:</span></td><td>the XML description for the domain, preferably in UTF-8</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>NULL in case of error, a pointer to the domain otherwise</td></tr></tbody></table></div><h3><a name="virDomainDestroy" id="virDomainDestroy"><code>virDomainDestroy</code></a></h3><pre class="programlisting">int virDomainDestroy (<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> domain)<br />
</pre><p>Destroy the domain object. The running instance is shutdown if not down already and all resources used by it are given back to the hypervisor. This does not free the associated <a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> object. This function may require privileged access</p><div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>domain</tt></i>:</span></td><td>a domain object</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>0 in case of success and -1 in case of failure.</td></tr></tbody></table></div><h3><a name="virDomainDetachDevice" id="virDomainDetachDevice"><code>virDomainDetachDevice</code></a></h3><pre class="programlisting">int virDomainDetachDevice (<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> domain, <br /> const char * xml)<br />
</pre><p>Destroy a virtual device attachment to backend.</p><div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>domain</tt></i>:</span></td><td>pointer to domain object</td></tr><tr><td><span class="term"><i><tt>xml</tt></i>:</span></td><td>pointer to XML description of one device</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>0 in case of success, -1 in case of failure.</td></tr></tbody></table></div><h3><a name="virDomainFree" id="virDomainFree"><code>virDomainFree</code></a></h3><pre class="programlisting">int virDomainFree (<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> domain)<br />
@ -306,7 +308,7 @@ char * <a href="#virStorageVolGetXMLDesc">virStorageVolGetXMLDesc</a> (<a href=
</pre><p>Get the UUID for a domain</p><div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>domain</tt></i>:</span></td><td>a domain object</td></tr><tr><td><span class="term"><i><tt>uuid</tt></i>:</span></td><td>pointer to a <a href="libvirt-libvirt.html#VIR_UUID_BUFLEN">VIR_UUID_BUFLEN</a> bytes array</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>-1 in case of error, 0 in case of success</td></tr></tbody></table></div><h3><a name="virDomainGetUUIDString" id="virDomainGetUUIDString"><code>virDomainGetUUIDString</code></a></h3><pre class="programlisting">int virDomainGetUUIDString (<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> domain, <br /> char * buf)<br />
</pre><p>Get the UUID for a domain as string. For more information about UUID see RFC4122.</p><div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>domain</tt></i>:</span></td><td>a domain object</td></tr><tr><td><span class="term"><i><tt>buf</tt></i>:</span></td><td>pointer to a <a href="libvirt-libvirt.html#VIR_UUID_STRING_BUFLEN">VIR_UUID_STRING_BUFLEN</a> bytes array</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>-1 in case of error, 0 in case of success</td></tr></tbody></table></div><h3><a name="virDomainGetVcpus" id="virDomainGetVcpus"><code>virDomainGetVcpus</code></a></h3><pre class="programlisting">int virDomainGetVcpus (<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> domain, <br /> <a href="libvirt-libvirt.html#virVcpuInfoPtr">virVcpuInfoPtr</a> info, <br /> int maxinfo, <br /> unsigned char * cpumaps, <br /> int maplen)<br />
</pre><p>Extract information about virtual CPUs of domain, store it in info array and also in cpumaps if this pointer isn't NULL.</p><div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>domain</tt></i>:</span></td><td>pointer to domain object, or NULL for Domain0</td></tr><tr><td><span class="term"><i><tt>info</tt></i>:</span></td><td>pointer to an array of <a href="libvirt-libvirt.html#virVcpuInfo">virVcpuInfo</a> structures (OUT)</td></tr><tr><td><span class="term"><i><tt>maxinfo</tt></i>:</span></td><td>number of structures in info array</td></tr><tr><td><span class="term"><i><tt>cpumaps</tt></i>:</span></td><td>pointer to an bit map of real CPUs for all vcpus of this domain (in 8-bit bytes) (OUT) If cpumaps is NULL, then no cpumap information is returned by the API. It's assumed there is &lt;maxinfo&gt; cpumap in cpumaps array. The memory allocated to cpumaps must be (maxinfo * maplen) bytes (ie: calloc(maxinfo, maplen)). One cpumap inside cpumaps has the format described in virDomainPinVcpu() API.</td></tr><tr><td><span class="term"><i><tt>maplen</tt></i>:</span></td><td>number of bytes in one cpumap, from 1 up to size of CPU map in underlying virtualization system (Xen...).</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the number of info filled in case of success, -1 in case of failure.</td></tr></tbody></table></div><h3><a name="virDomainGetXMLDesc" id="virDomainGetXMLDesc"><code>virDomainGetXMLDesc</code></a></h3><pre class="programlisting">char * virDomainGetXMLDesc (<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> domain, <br /> int flags)<br />
</pre><p>Provide an XML description of the domain. The description may be reused later to relaunch the domain with virDomainCreateLinux().</p><div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>domain</tt></i>:</span></td><td>a domain object</td></tr><tr><td><span class="term"><i><tt>flags</tt></i>:</span></td><td>an OR'ed set of <a href="libvirt-libvirt.html#virDomainXMLFlags">virDomainXMLFlags</a></td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>a 0 terminated UTF-8 encoded XML instance, or NULL in case of error. the caller must free() the returned value.</td></tr></tbody></table></div><h3><a name="virDomainInterfaceStats" id="virDomainInterfaceStats"><code>virDomainInterfaceStats</code></a></h3><pre class="programlisting">int virDomainInterfaceStats (<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> dom, <br /> const char * path, <br /> <a href="libvirt-libvirt.html#virDomainInterfaceStatsPtr">virDomainInterfaceStatsPtr</a> stats, <br /> size_t size)<br />
</pre><p>Provide an XML description of the domain. The description may be reused later to relaunch the domain with virDomainCreateXML().</p><div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>domain</tt></i>:</span></td><td>a domain object</td></tr><tr><td><span class="term"><i><tt>flags</tt></i>:</span></td><td>an OR'ed set of <a href="libvirt-libvirt.html#virDomainXMLFlags">virDomainXMLFlags</a></td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>a 0 terminated UTF-8 encoded XML instance, or NULL in case of error. the caller must free() the returned value.</td></tr></tbody></table></div><h3><a name="virDomainInterfaceStats" id="virDomainInterfaceStats"><code>virDomainInterfaceStats</code></a></h3><pre class="programlisting">int virDomainInterfaceStats (<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> dom, <br /> const char * path, <br /> <a href="libvirt-libvirt.html#virDomainInterfaceStatsPtr">virDomainInterfaceStatsPtr</a> stats, <br /> size_t size)<br />
</pre><p>This function returns network interface stats for interfaces attached to the domain. The path parameter is the name of the network interface. Domains may have more than network interface. To get stats for each you should make multiple calls to this function. Individual fields within the stats structure may be returned as -1, which indicates that the hypervisor does not support that particular statistic.</p><div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>dom</tt></i>:</span></td><td>pointer to the domain object</td></tr><tr><td><span class="term"><i><tt>path</tt></i>:</span></td><td>path to the interface</td></tr><tr><td><span class="term"><i><tt>stats</tt></i>:</span></td><td>network interface stats (returned)</td></tr><tr><td><span class="term"><i><tt>size</tt></i>:</span></td><td>size of stats structure</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 failure.</td></tr></tbody></table></div><h3><a name="virDomainLookupByID" id="virDomainLookupByID"><code>virDomainLookupByID</code></a></h3><pre class="programlisting"><a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> virDomainLookupByID (<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br /> int id)<br />
</pre><p>Try to find a domain based on the hypervisor ID number Note that this won't work for inactive domains which have an ID of -1, in that case a lookup based on the Name or UUId need to be done instead.</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>id</tt></i>:</span></td><td>the domain ID number</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>a new domain object or NULL in case of failure. If the domain cannot be found, then <a href="libvirt-virterror.html#VIR_ERR_NO_DOMAIN">VIR_ERR_NO_DOMAIN</a> error is raised.</td></tr></tbody></table></div><h3><a name="virDomainLookupByName" id="virDomainLookupByName"><code>virDomainLookupByName</code></a></h3><pre class="programlisting"><a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> virDomainLookupByName (<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br /> const char * name)<br />
</pre><p>Try to lookup a domain on the given hypervisor based on its name.</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>name</tt></i>:</span></td><td>name for the domain</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>a new domain object or NULL in case of failure. If the domain cannot be found, then <a href="libvirt-virterror.html#VIR_ERR_NO_DOMAIN">VIR_ERR_NO_DOMAIN</a> error is raised.</td></tr></tbody></table></div><h3><a name="virDomainLookupByUUID" id="virDomainLookupByUUID"><code>virDomainLookupByUUID</code></a></h3><pre class="programlisting"><a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> virDomainLookupByUUID (<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br /> const unsigned char * uuid)<br />

2
docs/html/libvirt-virterror.html
View File

@ -22,7 +22,7 @@ void <a href="#virResetError">virResetError</a> (<a href="libvirt-virterror.ht
void <a href="#virResetLastError">virResetLastError</a> (void)
void <a href="#virSetErrorFunc">virSetErrorFunc</a> (void * userData, <br /> <a href="libvirt-virterror.html#virErrorFunc">virErrorFunc</a> handler)
</pre><h2>Description</h2><h3><a name="types" id="types">Types</a></h3><h3><a name="virError" id="virError"><code>virError</code></a></h3><div class="api"><pre>struct virError{
</pre><table><tr><td>int</td><td>code</td><td> : The error code, a <a href="libvirt-virterror.html#virErrorNumber">virErrorNumber</a></td></tr><tr><td>int</td><td>domain</td><td> : What part of the library raised this error</td></tr><tr><td>char *</td><td>message</td><td> : human-readable informative error message</td></tr><tr><td><a href="libvirt-virterror.html#virErrorLevel">virErrorLevel</a></td><td>level</td><td> : how consequent is the error</td></tr><tr><td><a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a></td><td>conn</td><td> : connection if available, see note above</td></tr><tr><td><a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a></td><td>dom</td><td> : domain if available, see note above</td></tr><tr><td>char *</td><td>str1</td><td> : extra string information</td></tr><tr><td>char *</td><td>str2</td><td> : extra string information</td></tr><tr><td>char *</td><td>str3</td><td> : extra string information</td></tr><tr><td>int</td><td>int1</td><td> : extra number information</td></tr><tr><td>int</td><td>int2</td><td> : extra number information</td></tr><tr><td><a href="libvirt-libvirt.html#virNetworkPtr">virNetworkPtr</a></td><td>net</td><td> : network if available, see note above</td></tr></table><pre>
</pre><table><tr><td>int</td><td>code</td><td> : The error code, a <a href="libvirt-virterror.html#virErrorNumber">virErrorNumber</a></td></tr><tr><td>int</td><td>domain</td><td> : What part of the library raised this error</td></tr><tr><td>char *</td><td>message</td><td> : human-readable informative error message</td></tr><tr><td><a href="libvirt-virterror.html#virErrorLevel">virErrorLevel</a></td><td>level</td><td> : how consequent is the error</td></tr><tr><td><a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a></td><td>conn</td><td> : connection if available, deprecated see note above</td></tr><tr><td><a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a></td><td>dom</td><td> : domain if available, deprecated see note above</td></tr><tr><td>char *</td><td>str1</td><td> : extra string information</td></tr><tr><td>char *</td><td>str2</td><td> : extra string information</td></tr><tr><td>char *</td><td>str3</td><td> : extra string information</td></tr><tr><td>int</td><td>int1</td><td> : extra number information</td></tr><tr><td>int</td><td>int2</td><td> : extra number information</td></tr><tr><td><a href="libvirt-libvirt.html#virNetworkPtr">virNetworkPtr</a></td><td>net</td><td> : network if available, deprecated see note above</td></tr></table><pre>
}
</pre></div><h3><a name="virErrorDomain" id="virErrorDomain"><code>virErrorDomain</code></a></h3><div class="api"><pre>enum virErrorDomain {
</pre><table><tr><td><a name="VIR_FROM_NONE" id="VIR_FROM_NONE">VIR_FROM_NONE</a></td><td> = </td><td>0</td></tr><tr><td><a name="VIR_FROM_XEN" id="VIR_FROM_XEN">VIR_FROM_XEN</a></td><td> = </td><td>1</td><td> : Error at Xen hypervisor layer</td></tr><tr><td><a name="VIR_FROM_XEND" id="VIR_FROM_XEND">VIR_FROM_XEND</a></td><td> = </td><td>2</td><td> : Error at connection with xend daemon</td></tr><tr><td><a name="VIR_FROM_XENSTORE" id="VIR_FROM_XENSTORE">VIR_FROM_XENSTORE</a></td><td> = </td><td>3</td><td> : Error at connection with xen store</td></tr><tr><td><a name="VIR_FROM_SEXPR" id="VIR_FROM_SEXPR">VIR_FROM_SEXPR</a></td><td> = </td><td>4</td><td> : Error in the S-Expression code</td></tr><tr><td><a name="VIR_FROM_XML" id="VIR_FROM_XML">VIR_FROM_XML</a></td><td> = </td><td>5</td><td> : Error in the XML code</td></tr><tr><td><a name="VIR_FROM_DOM" id="VIR_FROM_DOM">VIR_FROM_DOM</a></td><td> = </td><td>6</td><td> : Error when operating on a domain</td></tr><tr><td><a name="VIR_FROM_RPC" id="VIR_FROM_RPC">VIR_FROM_RPC</a></td><td> = </td><td>7</td><td> : Error in the XML-RPC code</td></tr><tr><td><a name="VIR_FROM_PROXY" id="VIR_FROM_PROXY">VIR_FROM_PROXY</a></td><td> = </td><td>8</td><td> : Error in the proxy code</td></tr><tr><td><a name="VIR_FROM_CONF" id="VIR_FROM_CONF">VIR_FROM_CONF</a></td><td> = </td><td>9</td><td> : Error in the configuration file handling</td></tr><tr><td><a name="VIR_FROM_QEMU" id="VIR_FROM_QEMU">VIR_FROM_QEMU</a></td><td> = </td><td>10</td><td> : Error at the QEMU daemon</td></tr><tr><td><a name="VIR_FROM_NET" id="VIR_FROM_NET">VIR_FROM_NET</a></td><td> = </td><td>11</td><td> : Error when operating on a network</td></tr><tr><td><a name="VIR_FROM_TEST" id="VIR_FROM_TEST">VIR_FROM_TEST</a></td><td> = </td><td>12</td><td> : Error from test driver</td></tr><tr><td><a name="VIR_FROM_REMOTE" id="VIR_FROM_REMOTE">VIR_FROM_REMOTE</a></td><td> = </td><td>13</td><td> : Error from remote driver</td></tr><tr><td><a name="VIR_FROM_OPENVZ" id="VIR_FROM_OPENVZ">VIR_FROM_OPENVZ</a></td><td> = </td><td>14</td><td> : Error from OpenVZ driver</td></tr><tr><td><a name="VIR_FROM_XENXM" id="VIR_FROM_XENXM">VIR_FROM_XENXM</a></td><td> = </td><td>15</td><td> : Error at Xen XM layer</td></tr><tr><td><a name="VIR_FROM_STATS_LINUX" id="VIR_FROM_STATS_LINUX">VIR_FROM_STATS_LINUX</a></td><td> = </td><td>16</td><td> : Error in the Linux Stats code</td></tr><tr><td><a name="VIR_FROM_LXC" id="VIR_FROM_LXC">VIR_FROM_LXC</a></td><td> = </td><td>17</td><td> : Error from Linux Container driver</td></tr><tr><td><a name="VIR_FROM_STORAGE" id="VIR_FROM_STORAGE">VIR_FROM_STORAGE</a></td><td> = </td><td>18</td><td> : Error from storage driver</td></tr><tr><td><a name="VIR_FROM_NETWORK" id="VIR_FROM_NETWORK">VIR_FROM_NETWORK</a></td><td> = </td><td>19</td><td> : Error from network config</td></tr><tr><td><a name="VIR_FROM_DOMAIN" id="VIR_FROM_DOMAIN">VIR_FROM_DOMAIN</a></td><td> = </td><td>20</td><td> : Error from domain config</td></tr></table><pre>}

22
docs/libvirt-api.xml
View File

@ -163,6 +163,7 @@
<exports symbol='virConnectListDomains' type='function'/>
<exports symbol='virDomainCoreDump' type='function'/>
<exports symbol='virDomainSetMemory' type='function'/>
<exports symbol='virStoragePoolCreate' type='function'/>
<exports symbol='virNodeGetInfo' type='function'/>
<exports symbol='virNetworkSetAutostart' type='function'/>
<exports symbol='virDomainGetMaxMemory' type='function'/>
@ -234,7 +235,7 @@
<exports symbol='virDomainGetConnect' type='function'/>
<exports symbol='virConnectNumOfDefinedStoragePools' type='function'/>
<exports symbol='virConnectOpen' type='function'/>
<exports symbol='virStoragePoolCreate' type='function'/>
<exports symbol='virDomainCreateXML' type='function'/>
<exports symbol='virDomainSetVcpus' type='function'/>
<exports symbol='virDomainGetID' type='function'/>
<exports symbol='virDomainBlockPeek' type='function'/>
@ -578,15 +579,17 @@
<field name='domain' type='int' info=' What part of the library raised this error'/>
<field name='message' type='char *' info=' human-readable informative error message'/>
<field name='level' type='virErrorLevel' info=' how consequent is the error'/>
<field name='conn' type='virConnectPtr' info=' connection if available,
<field name='conn' type='virConnectPtr' info=' connection if available, deprecated
see note above'/>
<field name='dom' type='virDomainPtr' info=' domain if available, deprecated
see note above'/>
<field name='dom' type='virDomainPtr' info=' domain if available, see note above'/>
<field name='str1' type='char *' info=' extra string information'/>
<field name='str2' type='char *' info=' extra string information'/>
<field name='str3' type='char *' info=' extra string information'/>
<field name='int1' type='int' info=' extra number information'/>
<field name='int2' type='int' info=' extra number information'/>
<field name='net' type='virNetworkPtr' info=' network if available, see note above'/>
<field name='net' type='virNetworkPtr' info=' network if available, deprecated
see note above'/>
</struct>
<typedef name='virErrorDomain' file='virterror' type='enum'/>
<typedef name='virErrorLevel' file='virterror' type='enum'/>
@ -863,7 +866,14 @@ see note above'/>
<arg name='domain' type='virDomainPtr' info='pointer to a defined domain'/>
</function>
<function name='virDomainCreateLinux' file='libvirt' module='libvirt'>
<info>Launch a new Linux guest domain, based on an XML description similar to the one returned by virDomainGetXMLDesc() This function may requires privileged access to the hypervisor. The domain is not persistent, so its definition will disappear when it is destroyed, or if the host is restarted (see virDomainDefineXML() to define persistent domains).</info>
<info>Deprecated after 0.4.6. Renamed to virDomainCreateXML() providing identical functionality. This existing name will left indefinitely for API compatability.</info>
<return type='virDomainPtr' info='a new domain object or NULL in case of failure'/>
<arg name='conn' type='virConnectPtr' info='pointer to the hypervisor connection'/>
<arg name='xmlDesc' type='const char *' info='string containing an XML description of the domain'/>
<arg name='flags' type='unsigned int' info='callers should always pass 0'/>
</function>
<function name='virDomainCreateXML' file='libvirt' module='libvirt'>
<info>Launch a new guest domain, based on an XML description similar to the one returned by virDomainGetXMLDesc() This function may requires privileged access to the hypervisor. The domain is not persistent, so its definition will disappear when it is destroyed, or if the host is restarted (see virDomainDefineXML() to define persistent domains).</info>
<return type='virDomainPtr' info='a new domain object or NULL in case of failure'/>
<arg name='conn' type='virConnectPtr' info='pointer to the hypervisor connection'/>
<arg name='xmlDesc' type='const char *' info='string containing an XML description of the domain'/>
@ -968,7 +978,7 @@ see note above'/>
<arg name='maplen' type='int' info='number of bytes in one cpumap, from 1 up to size of CPU map in underlying virtualization system (Xen...).'/>
</function>
<function name='virDomainGetXMLDesc' file='libvirt' module='libvirt'>
<info>Provide an XML description of the domain. The description may be reused later to relaunch the domain with virDomainCreateLinux().</info>
<info>Provide an XML description of the domain. The description may be reused later to relaunch the domain with virDomainCreateXML().</info>
<return type='char *' info='a 0 terminated UTF-8 encoded XML instance, or NULL in case of error. the caller must free() the returned value.'/>
<arg name='domain' type='virDomainPtr' info='a domain object'/>
<arg name='flags' type='int' info='an OR&apos;ed set of virDomainXMLFlags'/>

121
docs/libvirt-refs.xml
View File

@ -191,6 +191,7 @@
<reference name='virDomainCreate' href='html/libvirt-libvirt.html#virDomainCreate'/>
<reference name='virDomainCreateFlags' href='html/libvirt-libvirt.html#virDomainCreateFlags'/>
<reference name='virDomainCreateLinux' href='html/libvirt-libvirt.html#virDomainCreateLinux'/>
<reference name='virDomainCreateXML' href='html/libvirt-libvirt.html#virDomainCreateXML'/>
<reference name='virDomainDefineXML' href='html/libvirt-libvirt.html#virDomainDefineXML'/>
<reference name='virDomainDestroy' href='html/libvirt-libvirt.html#virDomainDestroy'/>
<reference name='virDomainDetachDevice' href='html/libvirt-libvirt.html#virDomainDetachDevice'/>
@ -527,6 +528,7 @@
<ref name='virDomainCreate'/>
<ref name='virDomainCreateFlags'/>
<ref name='virDomainCreateLinux'/>
<ref name='virDomainCreateXML'/>
<ref name='virDomainDefineXML'/>
<ref name='virDomainDestroy'/>
<ref name='virDomainDetachDevice'/>
@ -687,6 +689,7 @@
</type>
<type name='virDomainPtr'>
<ref name='virDomainCreateLinux'/>
<ref name='virDomainCreateXML'/>
<ref name='virDomainDefineXML'/>
<ref name='virDomainLookupByID'/>
<ref name='virDomainLookupByName'/>
@ -760,6 +763,7 @@
<ref name='virConnectFindStoragePoolSources'/>
<ref name='virDomainBlockPeek'/>
<ref name='virDomainCreateLinux'/>
<ref name='virDomainCreateXML'/>
<ref name='virDomainMemoryPeek'/>
<ref name='virDomainPinVcpu'/>
<ref name='virDomainReboot'/>
@ -823,6 +827,7 @@
<ref name='virConnectNumOfNetworks'/>
<ref name='virConnectNumOfStoragePools'/>
<ref name='virDomainCreateLinux'/>
<ref name='virDomainCreateXML'/>
<ref name='virDomainDefineXML'/>
<ref name='virDomainLookupByID'/>
<ref name='virDomainLookupByName'/>
@ -1086,6 +1091,7 @@
<ref name='virDomainCreate'/>
<ref name='virDomainCreateFlags'/>
<ref name='virDomainCreateLinux'/>
<ref name='virDomainCreateXML'/>
<ref name='virDomainDefineXML'/>
<ref name='virDomainDestroy'/>
<ref name='virDomainDetachDevice'/>
@ -1318,6 +1324,7 @@
<ref name='VIR_CPU_USABLE'/>
<ref name='VIR_UNUSE_CPU'/>
<ref name='VIR_USE_CPU'/>
<ref name='virDomainCreateLinux'/>
<ref name='virDomainGetVcpus'/>
</word>
<word name='APIs'>
@ -1436,6 +1443,9 @@
<word name='Depending'>
<ref name='virStorageVolGetPath'/>
</word>
<word name='Deprecated'>
<ref name='virDomainCreateLinux'/>
</word>
<word name='Destroy'>
<ref name='virDomainDestroy'/>
<ref name='virDomainDetachDevice'/>
@ -1570,13 +1580,12 @@
</letter>
<letter name='L'>
<word name='Launch'>
<ref name='virDomainCreateLinux'/>
<ref name='virDomainCreateXML'/>
</word>
<word name='Length'>
<ref name='_virConnectCredential'/>
</word>
<word name='Linux'>
<ref name='virDomainCreateLinux'/>
<ref name='virDomainMemoryPeek'/>
</word>
<word name='List'>
@ -1713,6 +1722,9 @@
<word name='Remaining'>
<ref name='_virStoragePoolInfo'/>
</word>
<word name='Renamed'>
<ref name='virDomainCreateLinux'/>
</word>
<word name='Request'>
<ref name='virStoragePoolRefresh'/>
</word>
@ -1903,6 +1915,7 @@
<ref name='virConnectGetMaxVcpus'/>
<ref name='virDomainAttachDevice'/>
<ref name='virDomainCreateLinux'/>
<ref name='virDomainCreateXML'/>
<ref name='virDomainDefineXML'/>
<ref name='virDomainDetachDevice'/>
<ref name='virDomainGetXMLDesc'/>
@ -1943,7 +1956,7 @@
<word name='access'>
<ref name='_virNodeInfo'/>
<ref name='virConnectGetVersion'/>
<ref name='virDomainCreateLinux'/>
<ref name='virDomainCreateXML'/>
<ref name='virDomainDestroy'/>
<ref name='virDomainPinVcpu'/>
<ref name='virDomainResume'/>
@ -1989,6 +2002,7 @@
</word>
<word name='after'>
<ref name='virConnectGetCapabilities'/>
<ref name='virDomainCreateLinux'/>
<ref name='virDomainReboot'/>
<ref name='virDomainSave'/>
<ref name='virDomainShutdown'/>
@ -2049,6 +2063,7 @@
<word name='always'>
<ref name='virDomainBlockPeek'/>
<ref name='virDomainCreateLinux'/>
<ref name='virDomainCreateXML'/>
</word>
<word name='amount'>
<ref name='virDomainGetMaxMemory'/>
@ -2207,7 +2222,7 @@
<ref name='virDomainMigrate'/>
</word>
<word name='based'>
<ref name='virDomainCreateLinux'/>
<ref name='virDomainCreateXML'/>
<ref name='virDomainLookupByID'/>
<ref name='virDomainLookupByName'/>
<ref name='virDomainLookupByUUID'/>
@ -2375,6 +2390,7 @@
</word>
<word name='callers'>
<ref name='virDomainCreateLinux'/>
<ref name='virDomainCreateXML'/>
</word>
<word name='calling'>
<ref name='virDomainBlockStats'/>
@ -2479,6 +2495,9 @@
<word name='communicating'>
<ref name='virStoragePoolRefresh'/>
</word>
<word name='compatability'>
<ref name='virDomainCreateLinux'/>
</word>
<word name='compiled'>
<ref name='virGetVersion'/>
</word>
@ -2526,6 +2545,7 @@
<word name='containing'>
<ref name='virConnectFindStoragePoolSources'/>
<ref name='virDomainCreateLinux'/>
<ref name='virDomainCreateXML'/>
</word>
<word name='contains'>
<ref name='virStoragePoolLookupByVolume'/>
@ -2647,7 +2667,7 @@
<ref name='virSetErrorFunc'/>
</word>
<word name='define'>
<ref name='virDomainCreateLinux'/>
<ref name='virDomainCreateXML'/>
</word>
<word name='defined'>
<ref name='virConnectListDefinedDomains'/>
@ -2661,13 +2681,16 @@
<ref name='virConnectGetCapabilities'/>
</word>
<word name='definition'>
<ref name='virDomainCreateLinux'/>
<ref name='virDomainCreateXML'/>
<ref name='virDomainDefineXML'/>
<ref name='virStoragePoolCreateXML'/>
</word>
<word name='defresult'>
<ref name='_virConnectCredential'/>
</word>
<word name='deprecated'>
<ref name='_virError'/>
</word>
<word name='described'>
<ref name='virDomainGetVcpus'/>
</word>
@ -2678,6 +2701,7 @@
<word name='description'>
<ref name='virDomainAttachDevice'/>
<ref name='virDomainCreateLinux'/>
<ref name='virDomainCreateXML'/>
<ref name='virDomainDefineXML'/>
<ref name='virDomainDetachDevice'/>
<ref name='virDomainGetXMLDesc'/>
@ -2695,7 +2719,7 @@
<ref name='virDomainMigrate'/>
</word>
<word name='destroyed'>
<ref name='virDomainCreateLinux'/>
<ref name='virDomainCreateXML'/>
<ref name='virStoragePoolCreateXML'/>
<ref name='virStoragePoolDestroy'/>
</word>
@ -2727,7 +2751,7 @@
<ref name='virDomainMigrate'/>
</word>
<word name='disappear'>
<ref name='virDomainCreateLinux'/>
<ref name='virDomainCreateXML'/>
<ref name='virStoragePoolCreateXML'/>
</word>
<word name='discover'>
@ -2784,7 +2808,7 @@
<ref name='virConnectNumOfDomains'/>
<ref name='virConnectOpenReadOnly'/>
<ref name='virDomainCreate'/>
<ref name='virDomainCreateLinux'/>
<ref name='virDomainCreateXML'/>
<ref name='virDomainLookupByID'/>
<ref name='virDomainMigrate'/>
</word>
@ -2865,6 +2889,9 @@
<word name='exist'>
<ref name='virStorageVolFree'/>
</word>
<word name='existing'>
<ref name='virDomainCreateLinux'/>
</word>
<word name='exists'>
<ref name='virDomainMigrate'/>
</word>
@ -3083,7 +3110,7 @@
<ref name='virConnectOpenReadOnly'/>
<ref name='virDomainBlockPeek'/>
<ref name='virDomainBlockStats'/>
<ref name='virDomainCreateLinux'/>
<ref name='virDomainCreateXML'/>
<ref name='virDomainDestroy'/>
<ref name='virDomainGetConnect'/>
<ref name='virDomainInterfaceStats'/>
@ -3104,6 +3131,9 @@
<word name='functionalities'>
<ref name='virConnectOpenReadOnly'/>
</word>
<word name='functionality'>
<ref name='virDomainCreateLinux'/>
</word>
<word name='further'>
<ref name='virConnectClose'/>
<ref name='virDomainSuspend'/>
@ -3176,7 +3206,7 @@
</word>
<word name='guest'>
<ref name='virConnectGetMaxVcpus'/>
<ref name='virDomainCreateLinux'/>
<ref name='virDomainCreateXML'/>
<ref name='virDomainGetMaxVcpus'/>
<ref name='virDomainReboot'/>
<ref name='virDomainShutdown'/>
@ -3222,7 +3252,7 @@
<word name='host'>
<ref name='VIR_NODEINFO_MAXCPUS'/>
<ref name='virDomainCoreDump'/>
<ref name='virDomainCreateLinux'/>
<ref name='virDomainCreateXML'/>
<ref name='virDomainGetAutostart'/>
<ref name='virDomainMigrate'/>
<ref name='virDomainSetAutostart'/>
@ -3267,6 +3297,9 @@
<word name='iSCSI'>
<ref name='virConnectFindStoragePoolSources'/>
</word>
<word name='identical'>
<ref name='virDomainCreateLinux'/>
</word>
<word name='ie:'>
<ref name='cpumap'/>
<ref name='virDomainGetVcpus'/>
@ -3308,6 +3341,9 @@
<ref name='virStoragePoolGetConnect'/>
<ref name='virStorageVolGetConnect'/>
</word>
<word name='indefinitely'>
<ref name='virDomainCreateLinux'/>
</word>
<word name='index'>
<ref name='virNodeGetCellsFreeMemory'/>
</word>
@ -3394,7 +3430,7 @@
<ref name='virDomainGetVcpus'/>
</word>
<word name='its'>
<ref name='virDomainCreateLinux'/>
<ref name='virDomainCreateXML'/>
<ref name='virDomainGetName'/>
<ref name='virDomainLookupByName'/>
<ref name='virDomainLookupByUUID'/>
@ -3496,6 +3532,9 @@
<ref name='virDomainMemoryPeek'/>
<ref name='virDomainPinVcpu'/>
</word>
<word name='left'>
<ref name='virDomainCreateLinux'/>
</word>
<word name='length'>
<ref name='VIR_CPU_MAPLEN'/>
<ref name='VIR_DOMAIN_SCHED_FIELD_LENGTH'/>
@ -3809,6 +3848,7 @@
<ref name='virConnectGetType'/>
<ref name='virConnectGetURI'/>
<ref name='virDomainBlockStats'/>
<ref name='virDomainCreateLinux'/>
<ref name='virDomainGetName'/>
<ref name='virDomainInterfaceStats'/>
<ref name='virDomainLookupByName'/>
@ -3862,6 +3902,7 @@
</word>
<word name='new'>
<ref name='virDomainCreateLinux'/>
<ref name='virDomainCreateXML'/>
<ref name='virDomainGetOSType'/>
<ref name='virDomainLookupByID'/>
<ref name='virDomainLookupByName'/>
@ -3939,7 +3980,7 @@
<ref name='maplen'/>
<ref name='virDomainAttachDevice'/>
<ref name='virDomainBlockStats'/>
<ref name='virDomainCreateLinux'/>
<ref name='virDomainCreateXML'/>
<ref name='virDomainDetachDevice'/>
<ref name='virDomainGetVcpus'/>
<ref name='virDomainMigrate'/>
@ -4056,6 +4097,7 @@
<ref name='virConnectFindStoragePoolSources'/>
<ref name='virDomainBlockPeek'/>
<ref name='virDomainCreateLinux'/>
<ref name='virDomainCreateXML'/>
<ref name='virStorageVolCreateXML'/>
<ref name='virStorageVolGetXMLDesc'/>
</word>
@ -4092,7 +4134,7 @@
<ref name='virDomainBlockPeek'/>
</word>
<word name='persistent'>
<ref name='virDomainCreateLinux'/>
<ref name='virDomainCreateXML'/>
<ref name='virDomainDefineXML'/>
<ref name='virStoragePoolCreateXML'/>
<ref name='virStoragePoolDefineXML'/>
@ -4149,7 +4191,7 @@
</word>
<word name='privileged'>
<ref name='virConnectGetVersion'/>
<ref name='virDomainCreateLinux'/>
<ref name='virDomainCreateXML'/>
<ref name='virDomainDestroy'/>
<ref name='virDomainPinVcpu'/>
<ref name='virDomainResume'/>
@ -4189,6 +4231,7 @@
<word name='providing'>
<ref name='LIBVIR_VERSION_NUMBER'/>
<ref name='VIR_DOMAIN_SCHED_FIELD_LENGTH'/>
<ref name='virDomainCreateLinux'/>
</word>
<word name='public'>
<ref name='virDomainGetName'/>
@ -4332,7 +4375,7 @@
<ref name='virConnectFindStoragePoolSources'/>
</word>
<word name='requires'>
<ref name='virDomainCreateLinux'/>
<ref name='virDomainCreateXML'/>
<ref name='virDomainPinVcpu'/>
<ref name='virDomainResume'/>
<ref name='virDomainSetMaxMemory'/>
@ -4364,7 +4407,7 @@
<ref name='virDomainReboot'/>
</word>
<word name='restarted'>
<ref name='virDomainCreateLinux'/>
<ref name='virDomainCreateXML'/>
<ref name='virDomainResume'/>
<ref name='virStoragePoolCreateXML'/>
<ref name='virStoragePoolDestroy'/>
@ -4397,7 +4440,7 @@
<ref name='virConnectGetCapabilities'/>
<ref name='virDomainBlockPeek'/>
<ref name='virDomainBlockStats'/>
<ref name='virDomainCreateLinux'/>
<ref name='virDomainCreateXML'/>
<ref name='virDomainGetAutostart'/>
<ref name='virDomainGetSchedulerParameters'/>
<ref name='virDomainGetSchedulerType'/>
@ -4489,7 +4532,7 @@
</word>
<word name='see'>
<ref name='_virError'/>
<ref name='virDomainCreateLinux'/>
<ref name='virDomainCreateXML'/>
<ref name='virDomainGetUUIDString'/>
<ref name='virDomainMemoryPeek'/>
<ref name='virDomainMigrate'/>
@ -4523,6 +4566,7 @@
<ref name='virDomainBlockPeek'/>
<ref name='virDomainBlockStats'/>
<ref name='virDomainCreateLinux'/>
<ref name='virDomainCreateXML'/>
<ref name='virDomainFree'/>
<ref name='virDomainGetSchedulerParameters'/>
<ref name='virDomainInterfaceStats'/>
@ -4549,7 +4593,7 @@
</word>
<word name='similar'>
<ref name='virConnectGetURI'/>
<ref name='virDomainCreateLinux'/>
<ref name='virDomainCreateXML'/>
<ref name='virNetworkCreateXML'/>
</word>
<word name='single'>
@ -4695,6 +4739,7 @@
<ref name='virConnectGetURI'/>
<ref name='virDomainBlockPeek'/>
<ref name='virDomainCreateLinux'/>
<ref name='virDomainCreateXML'/>
<ref name='virDomainGetName'/>
<ref name='virDomainGetOSType'/>
<ref name='virDomainGetSchedulerType'/>
@ -5111,11 +5156,12 @@
<word name='virCopyLastError'>
<ref name='virGetLastError'/>
</word>
<word name='virDomainCreateLinux'>
<word name='virDomainCreateXML'>
<ref name='virDomainCreateLinux'/>
<ref name='virDomainGetXMLDesc'/>
</word>
<word name='virDomainDefineXML'>
<ref name='virDomainCreateLinux'/>
<ref name='virDomainCreateXML'/>
</word>
<word name='virDomainGetSchedulerType'>
<ref name='virDomainGetSchedulerParameters'/>
@ -5135,7 +5181,7 @@
<word name='virDomainGetXMLDesc'>
<ref name='virDomainBlockPeek'/>
<ref name='virDomainBlockStats'/>
<ref name='virDomainCreateLinux'/>
<ref name='virDomainCreateXML'/>
</word>
<word name='virDomainInfo'>
<ref name='virDomainGetInfo'/>
@ -5280,7 +5326,7 @@
<ref name='virStorageVolGetKey'/>
</word>
<word name='when'>
<ref name='virDomainCreateLinux'/>
<ref name='virDomainCreateXML'/>
<ref name='virDomainGetAutostart'/>
<ref name='virDomainSetAutostart'/>
<ref name='virErrorFunc'/>
@ -5334,31 +5380,6 @@
<word name='while'>
<ref name='virGetVersion'/>
</word>
<word name='will'>
<ref name='virConnCopyLastError'/>
<ref name='virConnSetErrorFunc'/>
<ref name='virConnectGetURI'/>
<ref name='virConnectListDefinedStoragePools'/>
<ref name='virConnectListStoragePools'/>
<ref name='virConnectOpenAuth'/>
<ref name='virCopyLastError'/>
<ref name='virDomainCoreDump'/>
<ref name='virDomainCreateLinux'/>
<ref name='virDomainGetMaxVcpus'/>
<ref name='virDomainGetName'/>
<ref name='virDomainGetSchedulerParameters'/>
<ref name='virDomainMigrate'/>
<ref name='virDomainRestore'/>
<ref name='virDomainSave'/>
<ref name='virDomainSuspend'/>
<ref name='virGetVersion'/>
<ref name='virNetworkGetName'/>
<ref name='virNodeGetCellsFreeMemory'/>
<ref name='virSetErrorFunc'/>
<ref name='virStoragePoolCreateXML'/>
<ref name='virStoragePoolDestroy'/>
<ref name='virStorageVolGetKey'/>
</word>
<word name='within'>
<ref name='virDomainBlockPeek'/>
<ref name='virDomainBlockStats'/>

8
include/libvirt/libvirt.h
View File

@ -437,7 +437,7 @@ virConnectPtr virDomainGetConnect (virDomainPtr domain);
/*
* Domain creation and destruction
*/
virDomainPtr virDomainCreateLinux (virConnectPtr conn,
virDomainPtr virDomainCreateXML (virConnectPtr conn,
const char *xmlDesc,
unsigned int flags);
virDomainPtr virDomainLookupByName (virConnectPtr conn,
@ -987,6 +987,12 @@ char * virStorageVolGetXMLDesc (virStorageVolPtr pool,
char * virStorageVolGetPath (virStorageVolPtr vol);
/*
* Deprecated calls
*/
virDomainPtr virDomainCreateLinux (virConnectPtr conn,
const char *xmlDesc,
unsigned int flags);
#ifdef __cplusplus
}
#endif

8
include/libvirt/libvirt.h.in
View File

@ -437,7 +437,7 @@ virConnectPtr virDomainGetConnect (virDomainPtr domain);
/*
* Domain creation and destruction
*/
virDomainPtr virDomainCreateLinux (virConnectPtr conn,
virDomainPtr virDomainCreateXML (virConnectPtr conn,
const char *xmlDesc,
unsigned int flags);
virDomainPtr virDomainLookupByName (virConnectPtr conn,
@ -987,6 +987,12 @@ char * virStorageVolGetXMLDesc (virStorageVolPtr pool,
char * virStorageVolGetPath (virStorageVolPtr vol);
/*
* Deprecated calls
*/
virDomainPtr virDomainCreateLinux (virConnectPtr conn,
const char *xmlDesc,
unsigned int flags);
#ifdef __cplusplus
}
#endif

8
include/libvirt/virterror.h
View File

@ -78,15 +78,17 @@ struct _virError {
int domain; /* What part of the library raised this error */
char *message;/* human-readable informative error message */
virErrorLevel level;/* how consequent is the error */
virConnectPtr conn VIR_DEPRECATED; /* connection if available,
virConnectPtr conn VIR_DEPRECATED; /* connection if available, deprecated
see note above */
virDomainPtr dom VIR_DEPRECATED; /* domain if available, see note above */
virDomainPtr dom VIR_DEPRECATED; /* domain if available, deprecated
see note above */
char *str1; /* extra string information */
char *str2; /* extra string information */
char *str3; /* extra string information */
int int1; /* extra number information */
int int2; /* extra number information */
virNetworkPtr net VIR_DEPRECATED; /* network if available, see note above */
virNetworkPtr net VIR_DEPRECATED; /* network if available, deprecated
see note above */
};
/**

8
qemud/remote.c
View File

@ -1028,16 +1028,16 @@ remoteDispatchDomainCreate (struct qemud_server *server ATTRIBUTE_UNUSED,
}
static int
remoteDispatchDomainCreateLinux (struct qemud_server *server ATTRIBUTE_UNUSED,
remoteDispatchDomainCreateXml (struct qemud_server *server ATTRIBUTE_UNUSED,
struct qemud_client *client,
remote_message_header *req,
remote_domain_create_linux_args *args,
remote_domain_create_linux_ret *ret)
remote_domain_create_xml_args *args,
remote_domain_create_xml_ret *ret)
{
virDomainPtr dom;
CHECK_CONN(client);
dom = virDomainCreateLinux (client->conn, args->xml_desc, args->flags);
dom = virDomainCreateXML (client->conn, args->xml_desc, args->flags);
if (dom == NULL) return -1;
make_nonnull_domain (&ret->dom, dom);

4
qemud/remote_dispatch_localvars.h
View File

@ -49,8 +49,6 @@ remote_network_dump_xml_ret lv_remote_network_dump_xml_ret;
remote_domain_reboot_args lv_remote_domain_reboot_args;
remote_domain_set_memory_args lv_remote_domain_set_memory_args;
remote_storage_pool_destroy_args lv_remote_storage_pool_destroy_args;
remote_domain_create_linux_args lv_remote_domain_create_linux_args;
remote_domain_create_linux_ret lv_remote_domain_create_linux_ret;
remote_domain_set_scheduler_parameters_args lv_remote_domain_set_scheduler_parameters_args;
remote_auth_polkit_ret lv_remote_auth_polkit_ret;
remote_auth_sasl_start_args lv_remote_auth_sasl_start_args;
@ -103,6 +101,8 @@ remote_num_of_storage_pools_ret lv_remote_num_of_storage_pools_ret;
remote_domain_save_args lv_remote_domain_save_args;
remote_domain_migrate_prepare_args lv_remote_domain_migrate_prepare_args;
remote_domain_migrate_prepare_ret lv_remote_domain_migrate_prepare_ret;
remote_domain_create_xml_args lv_remote_domain_create_xml_args;
remote_domain_create_xml_ret lv_remote_domain_create_xml_ret;
remote_domain_undefine_args lv_remote_domain_undefine_args;
remote_node_get_cells_free_memory_args lv_remote_node_get_cells_free_memory_args;
remote_node_get_cells_free_memory_ret lv_remote_node_get_cells_free_memory_ret;

16
qemud/remote_dispatch_proc_switch.h
View File

@ -77,14 +77,14 @@ case REMOTE_PROC_DOMAIN_CREATE:
args = (char *) &lv_remote_domain_create_args;
memset (&lv_remote_domain_create_args, 0, sizeof lv_remote_domain_create_args);
break;
case REMOTE_PROC_DOMAIN_CREATE_LINUX:
fn = (dispatch_fn) remoteDispatchDomainCreateLinux;
args_filter = (xdrproc_t) xdr_remote_domain_create_linux_args;
args = (char *) &lv_remote_domain_create_linux_args;
memset (&lv_remote_domain_create_linux_args, 0, sizeof lv_remote_domain_create_linux_args);
ret_filter = (xdrproc_t) xdr_remote_domain_create_linux_ret;
ret = (char *) &lv_remote_domain_create_linux_ret;
memset (&lv_remote_domain_create_linux_ret, 0, sizeof lv_remote_domain_create_linux_ret);
case REMOTE_PROC_DOMAIN_CREATE_XML:
fn = (dispatch_fn) remoteDispatchDomainCreateXml;
args_filter = (xdrproc_t) xdr_remote_domain_create_xml_args;
args = (char *) &lv_remote_domain_create_xml_args;
memset (&lv_remote_domain_create_xml_args, 0, sizeof lv_remote_domain_create_xml_args);
ret_filter = (xdrproc_t) xdr_remote_domain_create_xml_ret;
ret = (char *) &lv_remote_domain_create_xml_ret;
memset (&lv_remote_domain_create_xml_ret, 0, sizeof lv_remote_domain_create_xml_ret);
break;
case REMOTE_PROC_DOMAIN_DEFINE_XML:
fn = (dispatch_fn) remoteDispatchDomainDefineXml;

2
qemud/remote_dispatch_prototypes.h
View File

@ -13,7 +13,7 @@ static int remoteDispatchDomainBlockPeek (struct qemud_server *server, struct qe
static int remoteDispatchDomainBlockStats (struct qemud_server *server, struct qemud_client *client, remote_message_header *req, remote_domain_block_stats_args *args, remote_domain_block_stats_ret *ret);
static int remoteDispatchDomainCoreDump (struct qemud_server *server, struct qemud_client *client, remote_message_header *req, remote_domain_core_dump_args *args, void *ret);
static int remoteDispatchDomainCreate (struct qemud_server *server, struct qemud_client *client, remote_message_header *req, remote_domain_create_args *args, void *ret);
static int remoteDispatchDomainCreateLinux (struct qemud_server *server, struct qemud_client *client, remote_message_header *req, remote_domain_create_linux_args *args, remote_domain_create_linux_ret *ret);
static int remoteDispatchDomainCreateXml (struct qemud_server *server, struct qemud_client *client, remote_message_header *req, remote_domain_create_xml_args *args, remote_domain_create_xml_ret *ret);
static int remoteDispatchDomainDefineXml (struct qemud_server *server, struct qemud_client *client, remote_message_header *req, remote_domain_define_xml_args *args, remote_domain_define_xml_ret *ret);
static int remoteDispatchDomainDestroy (struct qemud_server *server, struct qemud_client *client, remote_message_header *req, remote_domain_destroy_args *args, void *ret);
static int remoteDispatchDomainDetachDevice (struct qemud_server *server, struct qemud_client *client, remote_message_header *req, remote_domain_detach_device_args *args, void *ret);

4
qemud/remote_protocol.c
View File

@ -618,7 +618,7 @@ xdr_remote_num_of_domains_ret (XDR *xdrs, remote_num_of_domains_ret *objp)
}
bool_t
xdr_remote_domain_create_linux_args (XDR *xdrs, remote_domain_create_linux_args *objp)
xdr_remote_domain_create_xml_args (XDR *xdrs, remote_domain_create_xml_args *objp)
{
if (!xdr_remote_nonnull_string (xdrs, &objp->xml_desc))
@ -629,7 +629,7 @@ xdr_remote_domain_create_linux_args (XDR *xdrs, remote_domain_create_linux_args
}
bool_t
xdr_remote_domain_create_linux_ret (XDR *xdrs, remote_domain_create_linux_ret *objp)
xdr_remote_domain_create_xml_ret (XDR *xdrs, remote_domain_create_xml_ret *objp)
{
if (!xdr_remote_nonnull_domain (xdrs, &objp->dom))

18
qemud/remote_protocol.h
View File

@ -318,16 +318,16 @@ struct remote_num_of_domains_ret {
};
typedef struct remote_num_of_domains_ret remote_num_of_domains_ret;
struct remote_domain_create_linux_args {
struct remote_domain_create_xml_args {
remote_nonnull_string xml_desc;
int flags;
};
typedef struct remote_domain_create_linux_args remote_domain_create_linux_args;
typedef struct remote_domain_create_xml_args remote_domain_create_xml_args;
struct remote_domain_create_linux_ret {
struct remote_domain_create_xml_ret {
remote_nonnull_domain dom;
};
typedef struct remote_domain_create_linux_ret remote_domain_create_linux_ret;
typedef struct remote_domain_create_xml_ret remote_domain_create_xml_ret;
struct remote_domain_lookup_by_id_args {
int id;
@ -1094,7 +1094,7 @@ enum remote_procedure {
REMOTE_PROC_GET_CAPABILITIES = 7,
REMOTE_PROC_DOMAIN_ATTACH_DEVICE = 8,
REMOTE_PROC_DOMAIN_CREATE = 9,
REMOTE_PROC_DOMAIN_CREATE_LINUX = 10,
REMOTE_PROC_DOMAIN_CREATE_XML = 10,
REMOTE_PROC_DOMAIN_DEFINE_XML = 11,
REMOTE_PROC_DOMAIN_DESTROY = 12,
REMOTE_PROC_DOMAIN_DETACH_DEVICE = 13,
@ -1264,8 +1264,8 @@ extern bool_t xdr_remote_domain_memory_peek_ret (XDR *, remote_domain_memory_pe
extern bool_t xdr_remote_list_domains_args (XDR *, remote_list_domains_args*);
extern bool_t xdr_remote_list_domains_ret (XDR *, remote_list_domains_ret*);
extern bool_t xdr_remote_num_of_domains_ret (XDR *, remote_num_of_domains_ret*);
extern bool_t xdr_remote_domain_create_linux_args (XDR *, remote_domain_create_linux_args*);
extern bool_t xdr_remote_domain_create_linux_ret (XDR *, remote_domain_create_linux_ret*);
extern bool_t xdr_remote_domain_create_xml_args (XDR *, remote_domain_create_xml_args*);
extern bool_t xdr_remote_domain_create_xml_ret (XDR *, remote_domain_create_xml_ret*);
extern bool_t xdr_remote_domain_lookup_by_id_args (XDR *, remote_domain_lookup_by_id_args*);
extern bool_t xdr_remote_domain_lookup_by_id_ret (XDR *, remote_domain_lookup_by_id_ret*);
extern bool_t xdr_remote_domain_lookup_by_uuid_args (XDR *, remote_domain_lookup_by_uuid_args*);
@ -1445,8 +1445,8 @@ extern bool_t xdr_remote_domain_memory_peek_ret ();
extern bool_t xdr_remote_list_domains_args ();
extern bool_t xdr_remote_list_domains_ret ();
extern bool_t xdr_remote_num_of_domains_ret ();
extern bool_t xdr_remote_domain_create_linux_args ();
extern bool_t xdr_remote_domain_create_linux_ret ();
extern bool_t xdr_remote_domain_create_xml_args ();
extern bool_t xdr_remote_domain_create_xml_ret ();
extern bool_t xdr_remote_domain_lookup_by_id_args ();
extern bool_t xdr_remote_domain_lookup_by_id_ret ();
extern bool_t xdr_remote_domain_lookup_by_uuid_args ();

6
qemud/remote_protocol.x
View File

@ -371,12 +371,12 @@ struct remote_num_of_domains_ret {
int num;
};
struct remote_domain_create_linux_args {
struct remote_domain_create_xml_args {
remote_nonnull_string xml_desc;
int flags;
};
struct remote_domain_create_linux_ret {
struct remote_domain_create_xml_ret {
remote_nonnull_domain dom;
};
@ -981,7 +981,7 @@ enum remote_procedure {
REMOTE_PROC_GET_CAPABILITIES = 7,
REMOTE_PROC_DOMAIN_ATTACH_DEVICE = 8,
REMOTE_PROC_DOMAIN_CREATE = 9,
REMOTE_PROC_DOMAIN_CREATE_LINUX = 10,
REMOTE_PROC_DOMAIN_CREATE_XML = 10,
REMOTE_PROC_DOMAIN_DEFINE_XML = 11,
REMOTE_PROC_DOMAIN_DESTROY = 12,

4
src/driver.h
View File

@ -103,7 +103,7 @@ typedef int
typedef int
(*virDrvNumOfDomains) (virConnectPtr conn);
typedef virDomainPtr
(*virDrvDomainCreateLinux) (virConnectPtr conn,
(*virDrvDomainCreateXML) (virConnectPtr conn,
const char *xmlDesc,
unsigned int flags);
typedef virDomainPtr
@ -309,7 +309,7 @@ struct _virDriver {
virDrvGetCapabilities getCapabilities;
virDrvListDomains listDomains;
virDrvNumOfDomains numOfDomains;
virDrvDomainCreateLinux domainCreateLinux;
virDrvDomainCreateXML domainCreateXML;
virDrvDomainLookupByID domainLookupByID;
virDrvDomainLookupByUUID domainLookupByUUID;
virDrvDomainLookupByName domainLookupByName;

32
src/libvirt.c
View File

@ -1225,12 +1225,12 @@ virDomainGetConnect (virDomainPtr dom)
}
/**
* virDomainCreateLinux:
* virDomainCreateXML:
* @conn: pointer to the hypervisor connection
* @xmlDesc: string containing an XML description of the domain
* @flags: callers should always pass 0
*
* Launch a new Linux guest domain, based on an XML description similar
* Launch a new guest domain, based on an XML description similar
* to the one returned by virDomainGetXMLDesc()
* This function may requires privileged access to the hypervisor.
* The domain is not persistent, so its definition will disappear when it
@ -1240,8 +1240,8 @@ virDomainGetConnect (virDomainPtr dom)
* Returns a new domain object or NULL in case of failure
*/
virDomainPtr
virDomainCreateLinux(virConnectPtr conn, const char *xmlDesc,
unsigned int flags)
virDomainCreateXML(virConnectPtr conn, const char *xmlDesc,
unsigned int flags)
{
DEBUG("conn=%p, xmlDesc=%s, flags=%d", conn, xmlDesc, flags);
@ -1258,13 +1258,31 @@ virDomainCreateLinux(virConnectPtr conn, const char *xmlDesc,
return (NULL);
}
if (conn->driver->domainCreateLinux)
return conn->driver->domainCreateLinux (conn, xmlDesc, flags);
if (conn->driver->domainCreateXML)
return conn->driver->domainCreateXML (conn, xmlDesc, flags);
virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__);
return NULL;
}
/**
* virDomainCreateLinux:
* @conn: pointer to the hypervisor connection
* @xmlDesc: string containing an XML description of the domain
* @flags: callers should always pass 0
*
* Deprecated after 0.4.6.
* Renamed to virDomainCreateXML() providing identical functionality.
* This existing name will left indefinitely for API compatability.
*
* Returns a new domain object or NULL in case of failure
*/
virDomainPtr
virDomainCreateLinux(virConnectPtr conn, const char *xmlDesc,
unsigned int flags)
{
return(virDomainCreateXML(conn, xmlDesc, flags));
}
/**
* virDomainLookupByID:
@ -2078,7 +2096,7 @@ virDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info)
* @flags: an OR'ed set of virDomainXMLFlags
*
* Provide an XML description of the domain. The description may be reused
* later to relaunch the domain with virDomainCreateLinux().
* later to relaunch the domain with virDomainCreateXML().
*
* Returns a 0 terminated UTF-8 encoded XML instance, or NULL in case of error.
* the caller must free() the returned value.

1
src/libvirt_sym.version
View File

@ -16,6 +16,7 @@
virConnectNumOfDomains;
virDomainCreate;
virDomainCreateLinux;
virDomainCreateXML;
virDomainDefineXML;
virDomainDestroy;
virDomainFree;

5
src/lxc_driver.c
View File

@ -1145,7 +1145,8 @@ static int lxcVersion(virConnectPtr conn, unsigned long *version)
return 0;
}
static char *lxcGetSchedulerType(virDomainPtr domain ATTRIBUTE_UNUSED, int *nparams)
static char *lxcGetSchedulerType(virDomainPtr domain ATTRIBUTE_UNUSED,
int *nparams)
{
if (nparams)
*nparams = 1;
@ -1251,7 +1252,7 @@ static virDriver lxcDriver = {
NULL, /* getCapabilities */
lxcListDomains, /* listDomains */
lxcNumDomains, /* numOfDomains */
lxcDomainCreateAndStart, /* domainCreateLinux */
lxcDomainCreateAndStart, /* domainCreateXML */
lxcDomainLookupByID, /* domainLookupByID */
lxcDomainLookupByUUID, /* domainLookupByUUID */
lxcDomainLookupByName, /* domainLookupByName */

4
src/openvz_driver.c
View File

@ -491,7 +491,7 @@ openvzDomainDefineXML(virConnectPtr conn, const char *xml)
}
static virDomainPtr
openvzDomainCreateLinux(virConnectPtr conn, const char *xml,
openvzDomainCreateXML(virConnectPtr conn, const char *xml,
unsigned int flags ATTRIBUTE_UNUSED)
{
virDomainDefPtr vmdef = NULL;
@ -971,7 +971,7 @@ static virDriver openvzDriver = {
openvzGetCapabilities, /* getCapabilities */
openvzListDomains, /* listDomains */
openvzNumDomains, /* numOfDomains */
openvzDomainCreateLinux, /* domainCreateLinux */
openvzDomainCreateXML, /* domainCreateXML */
openvzDomainLookupByID, /* domainLookupByID */
openvzDomainLookupByUUID, /* domainLookupByUUID */
openvzDomainLookupByName, /* domainLookupByName */

2
src/proxy_internal.c
View File

@ -53,7 +53,7 @@ struct xenUnifiedDriver xenProxyDriver = {
xenProxyGetCapabilities, /* getCapabilities */
xenProxyListDomains, /* listDomains */
xenProxyNumOfDomains, /* numOfDomains */
NULL, /* domainCreateLinux */
NULL, /* domainCreateXML */
NULL, /* domainSuspend */
NULL, /* domainResume */
NULL, /* domainShutdown */

2
src/qemu_driver.c
View File

@ -4025,7 +4025,7 @@ static virDriver qemuDriver = {
qemudGetCapabilities, /* getCapabilities */
qemudListDomains, /* listDomains */
qemudNumDomains, /* numOfDomains */
qemudDomainCreate, /* domainCreateLinux */
qemudDomainCreate, /* domainCreateXML */
qemudDomainLookupByID, /* domainLookupByID */
qemudDomainLookupByUUID, /* domainLookupByUUID */
qemudDomainLookupByName, /* domainLookupByName */

16
src/remote_internal.c
View File

@ -1391,26 +1391,26 @@ remoteNumOfDomains (virConnectPtr conn)
}
static virDomainPtr
remoteDomainCreateLinux (virConnectPtr conn,
remoteDomainCreateXML (virConnectPtr conn,
const char *xmlDesc,
unsigned int flags)
{
virDomainPtr dom;
remote_domain_create_linux_args args;
remote_domain_create_linux_ret ret;
remote_domain_create_xml_args args;
remote_domain_create_xml_ret ret;
GET_PRIVATE (conn, NULL);
args.xml_desc = (char *) xmlDesc;
args.flags = flags;
memset (&ret, 0, sizeof ret);
if (call (conn, priv, 0, REMOTE_PROC_DOMAIN_CREATE_LINUX,
(xdrproc_t) xdr_remote_domain_create_linux_args, (char *) &args,
(xdrproc_t) xdr_remote_domain_create_linux_ret, (char *) &ret) == -1)
if (call (conn, priv, 0, REMOTE_PROC_DOMAIN_CREATE_XML,
(xdrproc_t) xdr_remote_domain_create_xml_args, (char *) &args,
(xdrproc_t) xdr_remote_domain_create_xml_ret, (char *) &ret) == -1)
return NULL;
dom = get_nonnull_domain (conn, ret.dom);
xdr_free ((xdrproc_t) &xdr_remote_domain_create_linux_ret, (char *) &ret);
xdr_free ((xdrproc_t) &xdr_remote_domain_create_xml_ret, (char *) &ret);
return dom;
}
@ -4829,7 +4829,7 @@ static virDriver driver = {
.getCapabilities = remoteGetCapabilities,
.listDomains = remoteListDomains,
.numOfDomains = remoteNumOfDomains,
.domainCreateLinux = remoteDomainCreateLinux,
.domainCreateXML = remoteDomainCreateXML,
.domainLookupByID = remoteDomainLookupByID,
.domainLookupByUUID = remoteDomainLookupByUUID,
.domainLookupByName = remoteDomainLookupByName,

4
src/test.c
View File

@ -656,7 +656,7 @@ static int testNumOfDomains(virConnectPtr conn)
}
static virDomainPtr
testDomainCreateLinux(virConnectPtr conn, const char *xml,
testDomainCreateXML(virConnectPtr conn, const char *xml,
unsigned int flags ATTRIBUTE_UNUSED)
{
virDomainPtr ret;
@ -1542,7 +1542,7 @@ static virDriver testDriver = {
testGetCapabilities, /* getCapabilities */
testListDomains, /* listDomains */
testNumOfDomains, /* numOfDomains */
testDomainCreateLinux, /* domainCreateLinux */
testDomainCreateXML, /* domainCreateXML */
testLookupDomainByID, /* domainLookupByID */
testLookupDomainByUUID, /* domainLookupByUUID */
testLookupDomainByName, /* domainLookupByName */

2
src/virsh.c
View File

@ -894,7 +894,7 @@ cmdCreate(vshControl *ctl, const vshCmd *cmd)
if (virFileReadAll(from, VIRSH_MAX_XML_FILE, &buffer) < 0)
return FALSE;
dom = virDomainCreateLinux(ctl->conn, buffer, 0);
dom = virDomainCreateXML(ctl->conn, buffer, 0);
free (buffer);
if (dom != NULL) {

10
src/xen_internal.c
View File

@ -70,7 +70,7 @@ typedef struct v1_hypercall_struct
#define XEN_V1_IOCTL_HYPERCALL_CMD \
_IOC(_IOC_NONE, 'P', 0, sizeof(v1_hypercall_t))
typedef v1_hypercall_t hypercall_t;
#elif define(__sun__)
#elif defined(__sun__)
typedef privcmd_hypercall_t hypercall_t;
#else
#error "unsupported platform"
@ -335,7 +335,7 @@ lock_pages(void *addr, size_t len)
{
#ifdef __linux__
return (mlock(addr, len));
#elif define(__sun)
#elif defined(__sun)
return (0);
#endif
}
@ -345,7 +345,7 @@ unlock_pages(void *addr, size_t len)
{
#ifdef __linux__
return (munlock(addr, len));
#elif define(__sun)
#elif defined(__sun)
return (0);
#endif
}
@ -661,7 +661,7 @@ typedef struct xen_op_v2_dom xen_op_v2_dom;
#define XEN_HYPERVISOR_SOCKET "/proc/xen/privcmd"
#define HYPERVISOR_CAPABILITIES "/sys/hypervisor/properties/capabilities"
#define CPUINFO "/proc/cpuinfo"
#elif define(__sun__)
#elif defined(__sun__)
#define XEN_HYPERVISOR_SOCKET "/dev/xen/privcmd"
#define HYPERVISOR_CAPABILITIES ""
#define CPUINFO "/dev/cpu/self/cpuid"
@ -684,7 +684,7 @@ struct xenUnifiedDriver xenHypervisorDriver = {
xenHypervisorGetCapabilities, /* getCapabilities */
xenHypervisorListDomains, /* listDomains */
xenHypervisorNumOfDomains, /* numOfDomains */
NULL, /* domainCreateLinux */
NULL, /* domainCreateXML */
xenHypervisorPauseDomain, /* domainSuspend */
xenHypervisorResumeDomain, /* domainResume */
NULL, /* domainShutdown */

10
src/xen_unified.c
View File

@ -495,16 +495,16 @@ xenUnifiedNumOfDomains (virConnectPtr conn)
}
static virDomainPtr
xenUnifiedDomainCreateLinux (virConnectPtr conn,
const char *xmlDesc, unsigned int flags)
xenUnifiedDomainCreateXML (virConnectPtr conn,
const char *xmlDesc, unsigned int flags)
{
GET_PRIVATE(conn);
int i;
virDomainPtr ret;
for (i = 0; i < XEN_UNIFIED_NR_DRIVERS; ++i)
if (priv->opened[i] && drivers[i]->domainCreateLinux) {
ret = drivers[i]->domainCreateLinux (conn, xmlDesc, flags);
if (priv->opened[i] && drivers[i]->domainCreateXML) {
ret = drivers[i]->domainCreateXML (conn, xmlDesc, flags);
if (ret) return ret;
}
@ -1303,7 +1303,7 @@ static virDriver xenUnifiedDriver = {
.getCapabilities = xenUnifiedGetCapabilities,
.listDomains = xenUnifiedListDomains,
.numOfDomains = xenUnifiedNumOfDomains,
.domainCreateLinux = xenUnifiedDomainCreateLinux,
.domainCreateXML = xenUnifiedDomainCreateXML,
.domainLookupByID = xenUnifiedDomainLookupByID,
.domainLookupByUUID = xenUnifiedDomainLookupByUUID,
.domainLookupByName = xenUnifiedDomainLookupByName,

2
src/xen_unified.h
View File

@ -50,7 +50,7 @@ struct xenUnifiedDriver {
virDrvGetCapabilities getCapabilities;
virDrvListDomains listDomains;
virDrvNumOfDomains numOfDomains;
virDrvDomainCreateLinux domainCreateLinux;
virDrvDomainCreateXML domainCreateXML;
virDrvDomainSuspend domainSuspend;
virDrvDomainResume domainResume;
virDrvDomainShutdown domainShutdown;

12
src/xend_internal.c
View File

@ -940,7 +940,7 @@ xenDaemonListDomainsOld(virConnectPtr xend)
#ifndef PROXY
/**
* xenDaemonDomainCreateLinux:
* xenDaemonDomainCreateXML:
* @xend: A xend instance
* @sexpr: An S-Expr description of the domain.
*
@ -954,7 +954,7 @@ xenDaemonListDomainsOld(virConnectPtr xend)
*/
int
xenDaemonDomainCreateLinux(virConnectPtr xend, const char *sexpr)
xenDaemonDomainCreateXML(virConnectPtr xend, const char *sexpr)
{
int ret, serrno;
char *ptr;
@ -3741,7 +3741,7 @@ xenDaemonLookupByUUID(virConnectPtr conn, const unsigned char *uuid)
}
/**
* xenDaemonCreateLinux:
* xenDaemonCreateXML:
* @conn: pointer to the hypervisor connection
* @xmlDesc: an XML description of the domain
* @flags: an optional set of virDomainFlags
@ -3753,7 +3753,7 @@ xenDaemonLookupByUUID(virConnectPtr conn, const unsigned char *uuid)
* Returns a new domain object or NULL in case of failure
*/
static virDomainPtr
xenDaemonCreateLinux(virConnectPtr conn, const char *xmlDesc,
xenDaemonCreateXML(virConnectPtr conn, const char *xmlDesc,
unsigned int flags ATTRIBUTE_UNUSED)
{
int ret;
@ -3776,7 +3776,7 @@ xenDaemonCreateLinux(virConnectPtr conn, const char *xmlDesc,
return (NULL);
}
ret = xenDaemonDomainCreateLinux(conn, sexpr);
ret = xenDaemonDomainCreateXML(conn, sexpr);
VIR_FREE(sexpr);
if (ret != 0) {
goto error;
@ -4761,7 +4761,7 @@ struct xenUnifiedDriver xenDaemonDriver = {
NULL, /* getCapabilities */
xenDaemonListDomains, /* listDomains */
xenDaemonNumOfDomains, /* numOfDomains */
xenDaemonCreateLinux, /* domainCreateLinux */
xenDaemonCreateXML, /* domainCreateXML */
xenDaemonDomainSuspend, /* domainSuspend */
xenDaemonDomainResume, /* domainResume */
xenDaemonDomainShutdown, /* domainShutdown */

2
src/xend_internal.h
View File

@ -53,7 +53,7 @@ xenDaemonOpen_unix(virConnectPtr conn, const char *path);
* domain will be paused after creation and must be unpaused with
* xenDaemonResumeDomain() to begin execution.
*/
int xenDaemonDomainCreateLinux(virConnectPtr xend, const char *sexpr);
int xenDaemonDomainCreateXML(virConnectPtr xend, const char *sexpr);
/**
* \brief Lookup the id of a domain

8
src/xm_internal.c
View File

@ -92,7 +92,7 @@ struct xenUnifiedDriver xenXMDriver = {
NULL, /* getCapabilities */
NULL, /* listDomains */
NULL, /* numOfDomains */
NULL, /* domainCreateLinux */
NULL, /* domainCreateXML */
NULL, /* domainSuspend */
NULL, /* domainResume */
NULL, /* domainShutdown */
@ -604,7 +604,7 @@ int xenXMDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info) {
#define MAX_VFB 1024
/*
* Turn a config record into a lump of XML describing the
* domain, suitable for later feeding for virDomainCreateLinux
* domain, suitable for later feeding for virDomainCreateXML
*/
virDomainDefPtr
xenXMDomainConfigParse(virConnectPtr conn, virConfPtr conf) {
@ -1237,7 +1237,7 @@ no_memory:
/*
* Turn a config record into a lump of XML describing the
* domain, suitable for later feeding for virDomainCreateLinux
* domain, suitable for later feeding for virDomainCreateXML
*/
char *xenXMDomainDumpXML(virDomainPtr domain, int flags) {
const char *filename;
@ -1602,7 +1602,7 @@ int xenXMDomainCreate(virDomainPtr domain) {
return (-1);
}
ret = xenDaemonDomainCreateLinux(domain->conn, sexpr);
ret = xenDaemonDomainCreateXML(domain->conn, sexpr);
VIR_FREE(sexpr);
if (ret != 0) {
return (-1);

4
src/xs_internal.c
View File

@ -34,7 +34,7 @@
#ifdef __linux__
#define XEN_HYPERVISOR_SOCKET "/proc/xen/privcmd"
#elif define(__sun__)
#elif defined(__sun__)
#define XEN_HYPERVISOR_SOCKET "/dev/xen/privcmd"
#else
#error "unsupported platform"
@ -53,7 +53,7 @@ struct xenUnifiedDriver xenStoreDriver = {
NULL, /* getCapabilities */
xenStoreListDomains, /* listDomains */
NULL, /* numOfDomains */
NULL, /* domainCreateLinux */
NULL, /* domainCreateXML */
NULL, /* domainSuspend */
NULL, /* domainResume */
xenStoreDomainShutdown, /* domainShutdown */