Skip to content

L
libvirt

openeuler / libvirt

通知 3
Star 0
Fork 0
L
libvirt
提交 8a1a2ac5 编写于 作者: D Daniel P. Berrange
浏览文件
操作

Fix Win32 portability problems with 'inteface' symbol clash

上级 43692df5
展开全部 隐藏空白更改
内联 并排
Showing with 288 addition and 252 deletion
ChangeLog
浏览文件 @ 8a1a2ac5
Fri May 29 15:26:30 BST 2009 Daniel P. Berrange <berrange@redhat.com>
Win32 portability fixes
* docs/libvirt-api.xml, docs/libvirt-refs.xml,
docs/devhelp/libvirt-libvirt.html, docs/devhelp/libvirt-virterror.html,
docs/html/libvirt-libvirt.html, docs/html/libvirt-virterror.html:
Regenerate docs from new API docs
* include/libvirt/libvirt.h, include/libvirt/libvirt.h.in,
qemud/remote.c, qemud/remote_protocol.c, qemud/remote_protocol.h,
qemud/remote_protocol.x, src/datatypes.c, src/datatypes.h,
src/driver.h, src/libvirt.c, src/remote_internal.c: Change
all variable and field names from 'interface' to 'iface' to
avoid clash with Win32 COM object name
* tests/testutils.c: Disable regex code if not avaialble
* qemud/Makefile.am: Fix BUILT_SOURCES on non-libvirtd builds
Fri May 29 16:25:32 CEST 2009 Daniel Veillard <veillard@redhat.com>
* src/lxc_container.c: fix a portability issue if PR_CAPBSET_DROP
......
docs/devhelp/libvirt-libvirt.html
浏览文件 @ 8a1a2ac5
此差异已折叠。
docs/devhelp/libvirt-virterror.html
浏览文件 @ 8a1a2ac5
......@@ -108,7 +108,8 @@ void <a href="#virConnResetLastError">virConnResetLastError</a> (<a href="libvi
<a name="VIR_FROM_XEN_INOTIFY">VIR_FROM_XEN_INOTIFY</a> = 23 /* Error from xen inotify layer */
<a name="VIR_FROM_SECURITY">VIR_FROM_SECURITY</a> = 24 /* Error from security framework */
<a name="VIR_FROM_VBOX">VIR_FROM_VBOX</a> = 25 /* Error from VirtualBox driver */
<a name="VIR_FROM_INTERFACE">VIR_FROM_INTERFACE</a> = 26 /* Error when operating on an interface */
<a name="VIR_FROM_INTERFACE">VIR_FROM_INTERFACE</a> = 26 /* Error when operating on an interface */
<a name="VIR_FROM_ONE">VIR_FROM_ONE</a> = 27 /* Error from OpenNebula driver */
};
</pre><p/>
</div>
......
docs/html/libvirt-libvirt.html
浏览文件 @ 8a1a2ac5
此差异已折叠。
docs/html/libvirt-virterror.html
浏览文件 @ 8a1a2ac5
......@@ -27,7 +27,7 @@ void <a href="#virSetErrorFunc">virSetErrorFunc</a> (void * userData, <br />
</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><tr><td><a name="VIR_FROM_UML" id="VIR_FROM_UML">VIR_FROM_UML</a></td><td> = </td><td>21</td><td> : Error at the UML driver</td></tr><tr><td><a name="VIR_FROM_NODEDEV" id="VIR_FROM_NODEDEV">VIR_FROM_NODEDEV</a></td><td> = </td><td>22</td><td> : Error from node device monitor</td></tr><tr><td><a name="VIR_FROM_XEN_INOTIFY" id="VIR_FROM_XEN_INOTIFY">VIR_FROM_XEN_INOTIFY</a></td><td> = </td><td>23</td><td> : Error from xen inotify layer</td></tr><tr><td><a name="VIR_FROM_SECURITY" id="VIR_FROM_SECURITY">VIR_FROM_SECURITY</a></td><td> = </td><td>24</td><td> : Error from security framework</td></tr><tr><td><a name="VIR_FROM_VBOX" id="VIR_FROM_VBOX">VIR_FROM_VBOX</a></td><td> = </td><td>25</td><td> : Error from VirtualBox driver</td></tr><tr><td><a name="VIR_FROM_INTERFACE" id="VIR_FROM_INTERFACE">VIR_FROM_INTERFACE</a></td><td> = </td><td>26</td><td> : Error when operating on an interface</td></tr></table><pre>}
</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><tr><td><a name="VIR_FROM_UML" id="VIR_FROM_UML">VIR_FROM_UML</a></td><td> = </td><td>21</td><td> : Error at the UML driver</td></tr><tr><td><a name="VIR_FROM_NODEDEV" id="VIR_FROM_NODEDEV">VIR_FROM_NODEDEV</a></td><td> = </td><td>22</td><td> : Error from node device monitor</td></tr><tr><td><a name="VIR_FROM_XEN_INOTIFY" id="VIR_FROM_XEN_INOTIFY">VIR_FROM_XEN_INOTIFY</a></td><td> = </td><td>23</td><td> : Error from xen inotify layer</td></tr><tr><td><a name="VIR_FROM_SECURITY" id="VIR_FROM_SECURITY">VIR_FROM_SECURITY</a></td><td> = </td><td>24</td><td> : Error from security framework</td></tr><tr><td><a name="VIR_FROM_VBOX" id="VIR_FROM_VBOX">VIR_FROM_VBOX</a></td><td> = </td><td>25</td><td> : Error from VirtualBox driver</td></tr><tr><td><a name="VIR_FROM_INTERFACE" id="VIR_FROM_INTERFACE">VIR_FROM_INTERFACE</a></td><td> = </td><td>26</td><td> : Error when operating on an interface</td></tr><tr><td><a name="VIR_FROM_ONE" id="VIR_FROM_ONE">VIR_FROM_ONE</a></td><td> = </td><td>27</td><td> : Error from OpenNebula driver</td></tr></table><pre>}
</pre></div><h3><a name="virErrorLevel" id="virErrorLevel"><code>virErrorLevel</code></a></h3><div class="api"><pre>enum virErrorLevel {
</pre><table><tr><td><a name="VIR_ERR_NONE" id="VIR_ERR_NONE">VIR_ERR_NONE</a></td><td> = </td><td>0</td></tr><tr><td><a name="VIR_ERR_WARNING" id="VIR_ERR_WARNING">VIR_ERR_WARNING</a></td><td> = </td><td>1</td><td> : A simple warning</td></tr><tr><td><a name="VIR_ERR_ERROR" id="VIR_ERR_ERROR">VIR_ERR_ERROR</a></td><td> = </td><td>2</td><td> : An error</td></tr></table><pre>}
</pre></div><h3><a name="virErrorNumber" id="virErrorNumber"><code>virErrorNumber</code></a></h3><div class="api"><pre>enum virErrorNumber {
......
docs/libvirt-api.xml
浏览文件 @ 8a1a2ac5
......@@ -346,6 +346,7 @@
<description>Provides the interfaces of the libvirt library to handle errors raised while using the library. </description>
<author>Daniel Veillard &lt;veillard@redhat.com&gt; </author>
<exports symbol='VIR_ERR_NO_XEN' type='enum'/>
<exports symbol='VIR_FROM_ONE' type='enum'/>
<exports symbol='VIR_FROM_NETWORK' type='enum'/>
<exports symbol='VIR_ERR_NO_NODE_DEVICE' type='enum'/>
<exports symbol='VIR_ERR_NO_MEMORY' type='enum'/>
......@@ -628,12 +629,13 @@
<enum name='VIR_FROM_CONF' file='virterror' value='9' type='virErrorDomain' info='Error in the configuration file handling'/>
<enum name='VIR_FROM_DOM' file='virterror' value='6' type='virErrorDomain' info='Error when operating on a domain'/>
<enum name='VIR_FROM_DOMAIN' file='virterror' value='20' type='virErrorDomain' info='Error from domain config'/>
<enum name='VIR_FROM_INTERFACE' file='virterror' value='26' type='virErrorDomain' info=' Error when operating on an interface'/>
<enum name='VIR_FROM_INTERFACE' file='virterror' value='26' type='virErrorDomain' info='Error when operating on an interface'/>
<enum name='VIR_FROM_LXC' file='virterror' value='17' type='virErrorDomain' info='Error from Linux Container driver'/>
<enum name='VIR_FROM_NET' file='virterror' value='11' type='virErrorDomain' info='Error when operating on a network'/>
<enum name='VIR_FROM_NETWORK' file='virterror' value='19' type='virErrorDomain' info='Error from network config'/>
<enum name='VIR_FROM_NODEDEV' file='virterror' value='22' type='virErrorDomain' info='Error from node device monitor'/>
<enum name='VIR_FROM_NONE' file='virterror' value='0' type='virErrorDomain'/>
<enum name='VIR_FROM_ONE' file='virterror' value='27' type='virErrorDomain' info=' Error from OpenNebula driver'/>
<enum name='VIR_FROM_OPENVZ' file='virterror' value='14' type='virErrorDomain' info='Error from OpenVZ driver'/>
<enum name='VIR_FROM_PROXY' file='virterror' value='8' type='virErrorDomain' info='Error in the proxy code'/>
<enum name='VIR_FROM_QEMU' file='virterror' value='10' type='virErrorDomain' info='Error at the QEMU daemon'/>
......@@ -1463,7 +1465,7 @@ see note above'/>
<function name='virInterfaceCreate' file='libvirt' module='libvirt'>
<info>Activate an interface (ie call &quot;ifup&quot;)</info>
<return type='int' info='0 in case of success, -1 in case of error'/>
<arg name='interface' type='virInterfacePtr' info='pointer to a defined interface'/>
<arg name='iface' type='virInterfacePtr' info='pointer to a defined interface'/>
<arg name='flags' type='unsigned int' info='and OR&apos;ed set of extraction flags, not used yet'/>
</function>
<function name='virInterfaceDefineXML' file='libvirt' module='libvirt'>
......@@ -1476,33 +1478,33 @@ see note above'/>
<function name='virInterfaceDestroy' file='libvirt' module='libvirt'>
<info>deactivate an interface (ie call &quot;ifdown&quot;) This does not remove the interface from the config, and does not free the associated virInterfacePtr object.</info>
<return type='int' info='0 in case of success and -1 in case of failure.'/>
<arg name='interface' type='virInterfacePtr' info='an interface object'/>
<arg name='iface' type='virInterfacePtr' info='an interface object'/>
<arg name='flags' type='unsigned int' info='and OR&apos;ed set of extraction flags, not used yet'/>
</function>
<function name='virInterfaceFree' file='libvirt' module='libvirt'>
<info>Free the interface object. The interface itself is unaltered. The data structure is freed and should not be used thereafter.</info>
<return type='int' info='0 in case of success and -1 in case of failure.'/>
<arg name='interface' type='virInterfacePtr' info='a interface object'/>
<arg name='iface' type='virInterfacePtr' info='a interface object'/>
</function>
<function name='virInterfaceGetConnect' file='libvirt' module='libvirt'>
<info>Provides the connection pointer associated with an interface. The reference counter on the connection is not increased by this call. WARNING: When writing libvirt bindings in other languages, do not use this function. Instead, store the connection and the interface object together.</info>
<return type='virConnectPtr' info='the virConnectPtr or NULL in case of failure.'/>
<arg name='interface' type='virInterfacePtr' info=''/>
<arg name='iface' type='virInterfacePtr' info=''/>
</function>
<function name='virInterfaceGetMACString' file='libvirt' module='libvirt'>
<info>Get the MAC for a interface as string. For more information about MAC see RFC4122.</info>
<return type='const char *' info='a pointer to the MAC address (in null-terminated ASCII format) or NULL, the string need not be deallocated its lifetime will be the same as the interface object.'/>
<arg name='interface' type='virInterfacePtr' info='a interface object'/>
<arg name='iface' type='virInterfacePtr' info='a interface object'/>
</function>
<function name='virInterfaceGetName' file='libvirt' module='libvirt'>
<info>Get the public name for that interface</info>
<return type='const char *' info='a pointer to the name or NULL, the string need not be deallocated its lifetime will be the same as the interface object.'/>
<arg name='interface' type='virInterfacePtr' info='a interface object'/>
<arg name='iface' type='virInterfacePtr' info='a interface object'/>
</function>
<function name='virInterfaceGetXMLDesc' file='libvirt' module='libvirt'>
<info>Provide an XML description of the interface. The description may be reused later to recreate the interface with virInterfaceCreateXML().</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='interface' type='virInterfacePtr' info='a interface object'/>
<arg name='iface' type='virInterfacePtr' info='a interface object'/>
<arg name='flags' type='unsigned int' info='and OR&apos;ed set of extraction flags, not used yet'/>
</function>
<function name='virInterfaceLookupByMACString' file='libvirt' module='libvirt'>
......@@ -1520,12 +1522,12 @@ see note above'/>
<function name='virInterfaceRef' file='libvirt' module='libvirt'>
<info>Increment the reference count on the interface. For each additional call to this method, there shall be a corresponding call to virInterfaceFree to release the reference count, once the caller no longer needs the reference to this object. This method is typically useful for applications where multiple threads are using a connection, and it is required that the connection remain open until all threads have finished using it. ie, each new thread using a interface would increment the reference count.</info>
<return type='int' info='0 in case of success, -1 in case of failure.'/>
<arg name='interface' type='virInterfacePtr' info='the interface to hold a reference on'/>
<arg name='iface' type='virInterfacePtr' info='the interface to hold a reference on'/>
</function>
<function name='virInterfaceUndefine' file='libvirt' module='libvirt'>
<info>Undefine an interface, ie remove it from the config. This does not free the associated virInterfacePtr object.</info>
<return type='int' info='0 in case of success, -1 in case of error'/>
<arg name='interface' type='virInterfacePtr' info='pointer to a defined interface'/>
<arg name='iface' type='virInterfacePtr' info='pointer to a defined interface'/>
</function>
<function name='virNetworkCreate' file='libvirt' module='libvirt'>
<info>Create and start a defined network. If the call succeed the network moves from the defined to the running networks pools.</info>
......
docs/libvirt-refs.xml
浏览文件 @ 8a1a2ac5
......@@ -125,6 +125,7 @@
<reference name='VIR_FROM_NETWORK' href='html/libvirt-virterror.html#VIR_FROM_NETWORK'/>
<reference name='VIR_FROM_NODEDEV' href='html/libvirt-virterror.html#VIR_FROM_NODEDEV'/>
<reference name='VIR_FROM_NONE' href='html/libvirt-virterror.html#VIR_FROM_NONE'/>
<reference name='VIR_FROM_ONE' href='html/libvirt-virterror.html#VIR_FROM_ONE'/>
<reference name='VIR_FROM_OPENVZ' href='html/libvirt-virterror.html#VIR_FROM_OPENVZ'/>
<reference name='VIR_FROM_PROXY' href='html/libvirt-virterror.html#VIR_FROM_PROXY'/>
<reference name='VIR_FROM_QEMU' href='html/libvirt-virterror.html#VIR_FROM_QEMU'/>
......@@ -573,6 +574,7 @@
<ref name='VIR_FROM_NETWORK'/>
<ref name='VIR_FROM_NODEDEV'/>
<ref name='VIR_FROM_NONE'/>
<ref name='VIR_FROM_ONE'/>
<ref name='VIR_FROM_OPENVZ'/>
<ref name='VIR_FROM_PROXY'/>
<ref name='VIR_FROM_QEMU'/>
......@@ -1738,6 +1740,7 @@
<ref name='VIR_FROM_NETWORK'/>
<ref name='VIR_FROM_NODEDEV'/>
<ref name='VIR_FROM_NONE'/>
<ref name='VIR_FROM_ONE'/>
<ref name='VIR_FROM_OPENVZ'/>
<ref name='VIR_FROM_PROXY'/>
<ref name='VIR_FROM_QEMU'/>
......
include/libvirt/libvirt.h
浏览文件 @ 8a1a2ac5
......@@ -883,7 +883,7 @@ typedef struct _virInterface virInterface;
*/
typedef virInterface *virInterfacePtr;
virConnectPtr virInterfaceGetConnect (virInterfacePtr interface);
virConnectPtr virInterfaceGetConnect (virInterfacePtr iface);
int virConnectNumOfInterfaces (virConnectPtr conn);
int virConnectListInterfaces (virConnectPtr conn,
......@@ -895,25 +895,25 @@ virInterfacePtr virInterfaceLookupByName (virConnectPtr conn,
virInterfacePtr virInterfaceLookupByMACString (virConnectPtr conn,
const char *mac);
const char* virInterfaceGetName (virInterfacePtr interface);
const char* virInterfaceGetMACString (virInterfacePtr interface);
const char* virInterfaceGetName (virInterfacePtr iface);
const char* virInterfaceGetMACString (virInterfacePtr iface);
char * virInterfaceGetXMLDesc (virInterfacePtr interface,
char * virInterfaceGetXMLDesc (virInterfacePtr iface,
unsigned int flags);
virInterfacePtr virInterfaceDefineXML (virConnectPtr conn,
const char *xmlDesc,
unsigned int flags);
int virInterfaceUndefine (virInterfacePtr interface);
int virInterfaceUndefine (virInterfacePtr iface);
int virInterfaceCreate (virInterfacePtr interface,
int virInterfaceCreate (virInterfacePtr iface,
unsigned int flags);
int virInterfaceDestroy (virInterfacePtr interface,
int virInterfaceDestroy (virInterfacePtr iface,
unsigned int flags);
int virInterfaceRef (virInterfacePtr interface);
int virInterfaceFree (virInterfacePtr interface);
int virInterfaceRef (virInterfacePtr iface);
int virInterfaceFree (virInterfacePtr iface);
/**
* virStoragePool:
......
include/libvirt/libvirt.h.in
浏览文件 @ 8a1a2ac5
......@@ -883,7 +883,7 @@ typedef struct _virInterface virInterface;
*/
typedef virInterface *virInterfacePtr;
virConnectPtr virInterfaceGetConnect (virInterfacePtr interface);
virConnectPtr virInterfaceGetConnect (virInterfacePtr iface);
int virConnectNumOfInterfaces (virConnectPtr conn);
int virConnectListInterfaces (virConnectPtr conn,
......@@ -895,25 +895,25 @@ virInterfacePtr virInterfaceLookupByName (virConnectPtr conn,
virInterfacePtr virInterfaceLookupByMACString (virConnectPtr conn,
const char *mac);
const char* virInterfaceGetName (virInterfacePtr interface);
const char* virInterfaceGetMACString (virInterfacePtr interface);
const char* virInterfaceGetName (virInterfacePtr iface);
const char* virInterfaceGetMACString (virInterfacePtr iface);
char * virInterfaceGetXMLDesc (virInterfacePtr interface,
char * virInterfaceGetXMLDesc (virInterfacePtr iface,
unsigned int flags);
virInterfacePtr virInterfaceDefineXML (virConnectPtr conn,
const char *xmlDesc,
unsigned int flags);
int virInterfaceUndefine (virInterfacePtr interface);
int virInterfaceUndefine (virInterfacePtr iface);
int virInterfaceCreate (virInterfacePtr interface,
int virInterfaceCreate (virInterfacePtr iface,
unsigned int flags);
int virInterfaceDestroy (virInterfacePtr interface,
int virInterfaceDestroy (virInterfacePtr iface,
unsigned int flags);
int virInterfaceRef (virInterfacePtr interface);
int virInterfaceFree (virInterfacePtr interface);
int virInterfaceRef (virInterfacePtr iface);
int virInterfaceFree (virInterfacePtr iface);
/**
* virStoragePool:
......
qemud/Makefile.am
浏览文件 @ 8a1a2ac5
......@@ -31,7 +31,7 @@ EXTRA_DIST = \
$(AVAHI_SOURCES) \
$(DAEMON_SOURCES)
BUILT_SOURCES = libvirtd.init libvirtd.logrotate
BUILT_SOURCES =
if HAVE_RPCGEN
#
......@@ -218,6 +218,8 @@ remote_dispatch_args.h: $(srcdir)/remote_generate_stubs.pl remote_protocol.x
remote_dispatch_ret.h: $(srcdir)/remote_generate_stubs.pl remote_protocol.x
perl -w $(srcdir)/remote_generate_stubs.pl -r $(srcdir)/remote_protocol.x > $@
BUILT_SOURCES += libvirtd.logrotate
libvirtd.logrotate: libvirtd.logrotate.in
sed \
-e s!\@localstatedir\@!@localstatedir@!g \
......@@ -242,6 +244,8 @@ uninstall-init:
rm -f $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirtd \
$(DESTDIR)$(sysconfdir)/sysconfig/libvirtd
BUILT_SOURCES += libvirtd.init
libvirtd.init: libvirtd.init.in
sed \
-e s!\@localstatedir\@!@localstatedir@!g \
......
qemud/remote.c
浏览文件 @ 8a1a2ac5
......@@ -2664,16 +2664,16 @@ remoteDispatchInterfaceLookupByName (struct qemud_server *server ATTRIBUTE_UNUSE
remote_interface_lookup_by_name_args *args,
remote_interface_lookup_by_name_ret *ret)
{
virInterfacePtr interface;
virInterfacePtr iface;
interface = virInterfaceLookupByName (conn, args->name);
if (interface == NULL) {
iface = virInterfaceLookupByName (conn, args->name);
if (iface == NULL) {
remoteDispatchConnError(rerr, conn);
return -1;
}
make_nonnull_interface (&ret->interface, interface);
virInterfaceFree(interface);
make_nonnull_interface (&ret->iface, iface);
virInterfaceFree(iface);
return 0;
}
......@@ -2685,16 +2685,16 @@ remoteDispatchInterfaceLookupByMacString (struct qemud_server *server ATTRIBUTE_
remote_interface_lookup_by_mac_string_args *args,
remote_interface_lookup_by_mac_string_ret *ret)
{
virInterfacePtr interface;
virInterfacePtr iface;
interface = virInterfaceLookupByMACString (conn, args->mac);
if (interface == NULL) {
iface = virInterfaceLookupByMACString (conn, args->mac);
if (iface == NULL) {
remoteDispatchConnError(rerr, conn);
return -1;
}
make_nonnull_interface (&ret->interface, interface);
virInterfaceFree(interface);
make_nonnull_interface (&ret->iface, iface);
virInterfaceFree(iface);
return 0;
}
......@@ -2706,22 +2706,22 @@ remoteDispatchInterfaceGetXmlDesc (struct qemud_server *server ATTRIBUTE_UNUSED,
remote_interface_get_xml_desc_args *args,
remote_interface_get_xml_desc_ret *ret)
{
virInterfacePtr interface;
virInterfacePtr iface;
interface = get_nonnull_interface (conn, args->interface);
if (interface == NULL) {
iface = get_nonnull_interface (conn, args->iface);
if (iface == NULL) {
remoteDispatchConnError(rerr, conn);
return -1;
}
/* remoteDispatchClientRequest will free this. */
ret->xml = virInterfaceGetXMLDesc (interface, args->flags);
ret->xml = virInterfaceGetXMLDesc (iface, args->flags);
if (!ret->xml) {
virInterfaceFree(interface);
virInterfaceFree(iface);
remoteDispatchConnError(rerr, conn);
return -1;
}
virInterfaceFree(interface);
virInterfaceFree(iface);
return 0;
}
......@@ -2733,16 +2733,16 @@ remoteDispatchInterfaceDefineXml (struct qemud_server *server ATTRIBUTE_UNUSED,
remote_interface_define_xml_args *args,
remote_interface_define_xml_ret *ret)
{
virInterfacePtr interface;
virInterfacePtr iface;
interface = virInterfaceDefineXML (conn, args->xml, args->flags);
if (interface == NULL) {
iface = virInterfaceDefineXML (conn, args->xml, args->flags);
if (iface == NULL) {
remoteDispatchConnError(rerr, conn);
return -1;
}
make_nonnull_interface (&ret->interface, interface);
virInterfaceFree(interface);
make_nonnull_interface (&ret->iface, iface);
virInterfaceFree(iface);
return 0;
}
......@@ -2754,20 +2754,20 @@ remoteDispatchInterfaceUndefine (struct qemud_server *server ATTRIBUTE_UNUSED,
remote_interface_undefine_args *args,
void *ret ATTRIBUTE_UNUSED)
{
virInterfacePtr interface;
virInterfacePtr iface;
interface = get_nonnull_interface (conn, args->interface);
if (interface == NULL) {
iface = get_nonnull_interface (conn, args->iface);
if (iface == NULL) {
remoteDispatchConnError(rerr, conn);
return -1;
}
if (virInterfaceUndefine (interface) == -1) {
virInterfaceFree(interface);
if (virInterfaceUndefine (iface) == -1) {
virInterfaceFree(iface);
remoteDispatchConnError(rerr, conn);
return -1;
}
virInterfaceFree(interface);
virInterfaceFree(iface);
return 0;
}
......@@ -2779,20 +2779,20 @@ remoteDispatchInterfaceCreate (struct qemud_server *server ATTRIBUTE_UNUSED,
remote_interface_create_args *args,
void *ret ATTRIBUTE_UNUSED)
{
virInterfacePtr interface;
virInterfacePtr iface;
interface = get_nonnull_interface (conn, args->interface);
if (interface == NULL) {
iface = get_nonnull_interface (conn, args->iface);
if (iface == NULL) {
remoteDispatchConnError(rerr, conn);
return -1;
}
if (virInterfaceCreate (interface, args->flags) == -1) {
virInterfaceFree(interface);
if (virInterfaceCreate (iface, args->flags) == -1) {
virInterfaceFree(iface);
remoteDispatchConnError(rerr, conn);
return -1;
}
virInterfaceFree(interface);
virInterfaceFree(iface);
return 0;
}
......@@ -2804,20 +2804,20 @@ remoteDispatchInterfaceDestroy (struct qemud_server *server ATTRIBUTE_UNUSED,
remote_interface_destroy_args *args,
void *ret ATTRIBUTE_UNUSED)
{
virInterfacePtr interface;
virInterfacePtr iface;
interface = get_nonnull_interface (conn, args->interface);
if (interface == NULL) {
iface = get_nonnull_interface (conn, args->iface);
if (iface == NULL) {
remoteDispatchConnError(rerr, conn);
return -1;
}
if (virInterfaceDestroy (interface, args->flags) == -1) {
virInterfaceFree(interface);
if (virInterfaceDestroy (iface, args->flags) == -1) {
virInterfaceFree(iface);
remoteDispatchConnError(rerr, conn);
return -1;
}
virInterfaceFree(interface);
virInterfaceFree(iface);
return 0;
}
......@@ -4823,9 +4823,9 @@ get_nonnull_network (virConnectPtr conn, remote_nonnull_network network)
}
static virInterfacePtr
get_nonnull_interface (virConnectPtr conn, remote_nonnull_interface interface)
get_nonnull_interface (virConnectPtr conn, remote_nonnull_interface iface)
{
return virGetInterface (conn, interface.name, interface.mac);
return virGetInterface (conn, iface.name, iface.mac);
}
static virStoragePoolPtr
......
qemud/remote_protocol.c
浏览文件 @ 8a1a2ac5
......@@ -1530,7 +1530,7 @@ bool_t
xdr_remote_interface_lookup_by_name_ret (XDR *xdrs, remote_interface_lookup_by_name_ret *objp)
{
if (!xdr_remote_nonnull_interface (xdrs, &objp->interface))
if (!xdr_remote_nonnull_interface (xdrs, &objp->iface))
return FALSE;
return TRUE;
}
......@@ -1548,7 +1548,7 @@ bool_t
xdr_remote_interface_lookup_by_mac_string_ret (XDR *xdrs, remote_interface_lookup_by_mac_string_ret *objp)
{
if (!xdr_remote_nonnull_interface (xdrs, &objp->interface))
if (!xdr_remote_nonnull_interface (xdrs, &objp->iface))
return FALSE;
return TRUE;
}
......@@ -1557,7 +1557,7 @@ bool_t
xdr_remote_interface_get_xml_desc_args (XDR *xdrs, remote_interface_get_xml_desc_args *objp)
{
if (!xdr_remote_nonnull_interface (xdrs, &objp->interface))
if (!xdr_remote_nonnull_interface (xdrs, &objp->iface))
return FALSE;
if (!xdr_u_int (xdrs, &objp->flags))
return FALSE;
......@@ -1588,7 +1588,7 @@ bool_t
xdr_remote_interface_define_xml_ret (XDR *xdrs, remote_interface_define_xml_ret *objp)
{
if (!xdr_remote_nonnull_interface (xdrs, &objp->interface))
if (!xdr_remote_nonnull_interface (xdrs, &objp->iface))
return FALSE;
return TRUE;
}
......@@ -1597,7 +1597,7 @@ bool_t
xdr_remote_interface_undefine_args (XDR *xdrs, remote_interface_undefine_args *objp)
{
if (!xdr_remote_nonnull_interface (xdrs, &objp->interface))
if (!xdr_remote_nonnull_interface (xdrs, &objp->iface))
return FALSE;
return TRUE;
}
......@@ -1606,7 +1606,7 @@ bool_t
xdr_remote_interface_create_args (XDR *xdrs, remote_interface_create_args *objp)
{
if (!xdr_remote_nonnull_interface (xdrs, &objp->interface))
if (!xdr_remote_nonnull_interface (xdrs, &objp->iface))
return FALSE;
if (!xdr_u_int (xdrs, &objp->flags))
return FALSE;
......@@ -1617,7 +1617,7 @@ bool_t
xdr_remote_interface_destroy_args (XDR *xdrs, remote_interface_destroy_args *objp)
{
if (!xdr_remote_nonnull_interface (xdrs, &objp->interface))
if (!xdr_remote_nonnull_interface (xdrs, &objp->iface))
return FALSE;
if (!xdr_u_int (xdrs, &objp->flags))
return FALSE;
......
qemud/remote_protocol.h
浏览文件 @ 8a1a2ac5
......@@ -853,7 +853,7 @@ struct remote_interface_lookup_by_name_args {
typedef struct remote_interface_lookup_by_name_args remote_interface_lookup_by_name_args;
struct remote_interface_lookup_by_name_ret {
remote_nonnull_interface interface;
remote_nonnull_interface iface;
};
typedef struct remote_interface_lookup_by_name_ret remote_interface_lookup_by_name_ret;
......@@ -863,12 +863,12 @@ struct remote_interface_lookup_by_mac_string_args {
typedef struct remote_interface_lookup_by_mac_string_args remote_interface_lookup_by_mac_string_args;
struct remote_interface_lookup_by_mac_string_ret {
remote_nonnull_interface interface;
remote_nonnull_interface iface;
};
typedef struct remote_interface_lookup_by_mac_string_ret remote_interface_lookup_by_mac_string_ret;
struct remote_interface_get_xml_desc_args {
remote_nonnull_interface interface;
remote_nonnull_interface iface;
u_int flags;
};
typedef struct remote_interface_get_xml_desc_args remote_interface_get_xml_desc_args;
......@@ -885,23 +885,23 @@ struct remote_interface_define_xml_args {
typedef struct remote_interface_define_xml_args remote_interface_define_xml_args;
struct remote_interface_define_xml_ret {
remote_nonnull_interface interface;
remote_nonnull_interface iface;
};
typedef struct remote_interface_define_xml_ret remote_interface_define_xml_ret;
struct remote_interface_undefine_args {
remote_nonnull_interface interface;
remote_nonnull_interface iface;
};
typedef struct remote_interface_undefine_args remote_interface_undefine_args;
struct remote_interface_create_args {
remote_nonnull_interface interface;
remote_nonnull_interface iface;
u_int flags;
};
typedef struct remote_interface_create_args remote_interface_create_args;
struct remote_interface_destroy_args {
remote_nonnull_interface interface;
remote_nonnull_interface iface;
u_int flags;
};
typedef struct remote_interface_destroy_args remote_interface_destroy_args;
......
qemud/remote_protocol.x
浏览文件 @ 8a1a2ac5
......@@ -798,7 +798,7 @@ struct remote_interface_lookup_by_name_args {
};
struct remote_interface_lookup_by_name_ret {
remote_nonnull_interface interface;
remote_nonnull_interface iface;
};
struct remote_interface_lookup_by_mac_string_args {
......@@ -806,11 +806,11 @@ struct remote_interface_lookup_by_mac_string_args {
};
struct remote_interface_lookup_by_mac_string_ret {
remote_nonnull_interface interface;
remote_nonnull_interface iface;
};
struct remote_interface_get_xml_desc_args {
remote_nonnull_interface interface;
remote_nonnull_interface iface;
unsigned int flags;
};
......@@ -824,20 +824,20 @@ struct remote_interface_define_xml_args {
};
struct remote_interface_define_xml_ret {
remote_nonnull_interface interface;
remote_nonnull_interface iface;
};
struct remote_interface_undefine_args {
remote_nonnull_interface interface;
remote_nonnull_interface iface;
};
struct remote_interface_create_args {
remote_nonnull_interface interface;
remote_nonnull_interface iface;
unsigned int flags;
};
struct remote_interface_destroy_args {
remote_nonnull_interface interface;
remote_nonnull_interface iface;
unsigned int flags;
};
......
src/datatypes.c
浏览文件 @ 8a1a2ac5
......@@ -75,9 +75,9 @@ virNetworkFreeName(virNetworkPtr network, const char *name ATTRIBUTE_UNUSED)
* Returns 0 in case of success and -1 in case of failure.
*/
static int
virInterfaceFreeName(virInterfacePtr interface, const char *name ATTRIBUTE_UNUSED)
virInterfaceFreeName(virInterfacePtr iface, const char *name ATTRIBUTE_UNUSED)
{
return (virUnrefInterface(interface));
return (virUnrefInterface(iface));
}
/**
......@@ -589,19 +589,19 @@ virGetInterface(virConnectPtr conn, const char *name, const char *mac) {
* which may also be released if its ref count hits zero.
*/
static void
virReleaseInterface(virInterfacePtr interface) {
virConnectPtr conn = interface->conn;
DEBUG("release interface %p %s", interface, interface->name);
virReleaseInterface(virInterfacePtr iface) {
virConnectPtr conn = iface->conn;
DEBUG("release interface %p %s", iface, iface->name);
/* TODO search by MAC first as they are better differenciators */
if (virHashRemoveEntry(conn->interfaces, interface->name, NULL) < 0)
if (virHashRemoveEntry(conn->interfaces, iface->name, NULL) < 0)
virLibConnError(conn, VIR_ERR_INTERNAL_ERROR,
_("interface missing from connection hash table"));
interface->magic = -1;
VIR_FREE(interface->name);
VIR_FREE(interface->mac);
VIR_FREE(interface);
iface->magic = -1;
VIR_FREE(iface->name);
VIR_FREE(iface->mac);
VIR_FREE(iface);
DEBUG("unref connection %p %d", conn, conn->refs);
conn->refs--;
......@@ -625,24 +625,24 @@ virReleaseInterface(virInterfacePtr interface) {
* Returns the reference count or -1 in case of failure.
*/
int
virUnrefInterface(virInterfacePtr interface) {
virUnrefInterface(virInterfacePtr iface) {
int refs;
if (!VIR_IS_CONNECTED_INTERFACE(interface)) {
if (!VIR_IS_CONNECTED_INTERFACE(iface)) {
virLibConnError(NULL, VIR_ERR_INVALID_ARG, __FUNCTION__);
return(-1);
}
virMutexLock(&interface->conn->lock);
DEBUG("unref interface %p %s %d", interface, interface->name, interface->refs);
interface->refs--;
refs = interface->refs;
virMutexLock(&iface->conn->lock);
DEBUG("unref interface %p %s %d", iface, iface->name, iface->refs);
iface->refs--;
refs = iface->refs;
if (refs == 0) {
virReleaseInterface(interface);
virReleaseInterface(iface);
/* Already unlocked mutex */
return (0);
}
virMutexUnlock(&interface->conn->lock);
virMutexUnlock(&iface->conn->lock);
return (refs);
}
......
src/datatypes.h
浏览文件 @ 8a1a2ac5
......@@ -254,7 +254,7 @@ int virUnrefNetwork(virNetworkPtr network);
virInterfacePtr virGetInterface(virConnectPtr conn,
const char *name,
const char *mac);
int virUnrefInterface(virInterfacePtr interface);
int virUnrefInterface(virInterfacePtr iface);
virStoragePoolPtr virGetStoragePool(virConnectPtr conn,
const char *name,
......
src/driver.h
浏览文件 @ 8a1a2ac5
......@@ -516,7 +516,7 @@ typedef virInterfacePtr
const char *mac);
typedef char *
(*virDrvInterfaceGetXMLDesc) (virInterfacePtr interface,
(*virDrvInterfaceGetXMLDesc) (virInterfacePtr iface,
unsigned int flags);
typedef virInterfacePtr
......@@ -524,12 +524,12 @@ typedef virInterfacePtr
const char *xmlDesc,
unsigned int flags);
typedef int
(*virDrvInterfaceUndefine) (virInterfacePtr interface);
(*virDrvInterfaceUndefine) (virInterfacePtr iface);
typedef int
(*virDrvInterfaceCreate) (virInterfacePtr interface,
(*virDrvInterfaceCreate) (virInterfacePtr iface,
unsigned int flags);
typedef int
(*virDrvInterfaceDestroy) (virInterfacePtr interface,
(*virDrvInterfaceDestroy) (virInterfacePtr iface,
unsigned int flags);
typedef struct _virInterfaceDriver virInterfaceDriver;
......
src/libvirt.c
浏览文件 @ 8a1a2ac5
......@@ -472,7 +472,7 @@ virLibNetworkError(virNetworkPtr network, virErrorNumber error,
* Handle an error at the connection level
*/
static void
virLibInterfaceError(virInterfacePtr interface, virErrorNumber error,
virLibInterfaceError(virInterfacePtr iface, virErrorNumber error,
const char *info)
{
virConnectPtr conn = NULL;
......@@ -483,7 +483,7 @@ virLibInterfaceError(virInterfacePtr interface, virErrorNumber error,
errmsg = virErrorMsg(error, info);
if (error != VIR_ERR_INVALID_INTERFACE) {
conn = interface->conn;
conn = iface->conn;
}
virRaiseError(conn, NULL, NULL, VIR_FROM_INTERFACE, error, VIR_ERR_ERROR,
errmsg, info, NULL, 0, 0, errmsg, info);
......@@ -5485,17 +5485,17 @@ error:
* Returns the virConnectPtr or NULL in case of failure.
*/
virConnectPtr
virInterfaceGetConnect (virInterfacePtr interface)
virInterfaceGetConnect (virInterfacePtr iface)
{
DEBUG("interface=%p", interface);
DEBUG("iface=%p", iface);
virResetLastError();
if (!VIR_IS_CONNECTED_INTERFACE (interface)) {
if (!VIR_IS_CONNECTED_INTERFACE (iface)) {
virLibInterfaceError (NULL, VIR_ERR_INVALID_INTERFACE, __FUNCTION__);
return NULL;
}
return interface->conn;
return iface->conn;
}
/**
......@@ -5663,7 +5663,7 @@ error:
/**
* virInterfaceGetName:
* @interface: a interface object
* @iface: a interface object
*
* Get the public name for that interface
*
......@@ -5671,22 +5671,22 @@ error:
* its lifetime will be the same as the interface object.
*/
const char *
virInterfaceGetName(virInterfacePtr interface)
virInterfaceGetName(virInterfacePtr iface)
{
DEBUG("interface=%p", interface);
DEBUG("iface=%p", iface);
virResetLastError();
if (!VIR_IS_INTERFACE(interface)) {
if (!VIR_IS_INTERFACE(iface)) {
virLibInterfaceError(NULL, VIR_ERR_INVALID_INTERFACE, __FUNCTION__);
return (NULL);
}
return (interface->name);
return (iface->name);
}
/**
* virInterfaceGetMACString:
* @interface: a interface object
* @iface: a interface object
*
* Get the MAC for a interface as string. For more information about
* MAC see RFC4122.
......@@ -5696,22 +5696,22 @@ virInterfaceGetName(virInterfacePtr interface)
* will be the same as the interface object.
*/
const char *
virInterfaceGetMACString(virInterfacePtr interface)
virInterfaceGetMACString(virInterfacePtr iface)
{
DEBUG("interface=%p", interface);
DEBUG("iface=%p", iface);
virResetLastError();
if (!VIR_IS_INTERFACE(interface)) {
if (!VIR_IS_INTERFACE(iface)) {
virLibInterfaceError(NULL, VIR_ERR_INVALID_INTERFACE, __FUNCTION__);
return (NULL);
}
return (interface->mac);
return (iface->mac);
}
/**
* virInterfaceGetXMLDesc:
* @interface: a interface object
* @iface: a interface object
* @flags: and OR'ed set of extraction flags, not used yet
*
* Provide an XML description of the interface. The description may be reused
......@@ -5721,27 +5721,27 @@ virInterfaceGetMACString(virInterfacePtr interface)
* the caller must free() the returned value.
*/
char *
virInterfaceGetXMLDesc(virInterfacePtr interface, unsigned int flags)
virInterfaceGetXMLDesc(virInterfacePtr iface, unsigned int flags)
{
virConnectPtr conn;
DEBUG("interface=%p, flags=%d", interface, flags);
DEBUG("iface=%p, flags=%d", iface, flags);
virResetLastError();
if (!VIR_IS_CONNECTED_INTERFACE(interface)) {
if (!VIR_IS_CONNECTED_INTERFACE(iface)) {
virLibInterfaceError(NULL, VIR_ERR_INVALID_INTERFACE, __FUNCTION__);
return (NULL);
}
if (flags != 0) {
virLibInterfaceError(interface, VIR_ERR_INVALID_ARG, __FUNCTION__);
virLibInterfaceError(iface, VIR_ERR_INVALID_ARG, __FUNCTION__);
goto error;
}
conn = interface->conn;
conn = iface->conn;
if (conn->interfaceDriver && conn->interfaceDriver->interfaceGetXMLDesc) {
char *ret;
ret = conn->interfaceDriver->interfaceGetXMLDesc (interface, flags);
ret = conn->interfaceDriver->interfaceGetXMLDesc (iface, flags);
if (!ret)
goto error;
return ret;
......@@ -5751,7 +5751,7 @@ virInterfaceGetXMLDesc(virInterfacePtr interface, unsigned int flags)
error:
/* Copy to connection error object for back compatability */
virSetConnError(interface->conn);
virSetConnError(iface->conn);
return NULL;
}
......@@ -5803,7 +5803,7 @@ error:
/**
* virInterfaceUndefine:
* @interface: pointer to a defined interface
* @iface: pointer to a defined interface
*
* Undefine an interface, ie remove it from the config.
* This does not free the associated virInterfacePtr object.
......@@ -5811,25 +5811,25 @@ error:
* Returns 0 in case of success, -1 in case of error
*/
int
virInterfaceUndefine(virInterfacePtr interface) {
virInterfaceUndefine(virInterfacePtr iface) {
virConnectPtr conn;
DEBUG("interface=%p", interface);
DEBUG("iface=%p", iface);
virResetLastError();
if (!VIR_IS_CONNECTED_INTERFACE(interface)) {
if (!VIR_IS_CONNECTED_INTERFACE(iface)) {
virLibInterfaceError(NULL, VIR_ERR_INVALID_INTERFACE, __FUNCTION__);
return (-1);
}
conn = interface->conn;
conn = iface->conn;
if (conn->flags & VIR_CONNECT_RO) {
virLibInterfaceError(interface, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
virLibInterfaceError(iface, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
goto error;
}
if (conn->interfaceDriver && conn->interfaceDriver->interfaceUndefine) {
int ret;
ret = conn->interfaceDriver->interfaceUndefine (interface);
ret = conn->interfaceDriver->interfaceUndefine (iface);
if (ret < 0)
goto error;
return ret;
......@@ -5839,13 +5839,13 @@ virInterfaceUndefine(virInterfacePtr interface) {
error:
/* Copy to connection error object for back compatability */
virSetConnError(interface->conn);
virSetConnError(iface->conn);
return -1;
}
/**
* virInterfaceCreate:
* @interface: pointer to a defined interface
* @iface: pointer to a defined interface
* @flags: and OR'ed set of extraction flags, not used yet
*
* Activate an interface (ie call "ifup")
......@@ -5853,26 +5853,26 @@ error:
* Returns 0 in case of success, -1 in case of error
*/
int
virInterfaceCreate(virInterfacePtr interface, unsigned int flags)
virInterfaceCreate(virInterfacePtr iface, unsigned int flags)
{
virConnectPtr conn;
DEBUG("interface=%p, flags=%d", interface, flags);
DEBUG("iface=%p, flags=%d", iface, flags);
virResetLastError();
if (!VIR_IS_CONNECTED_INTERFACE(interface)) {
if (!VIR_IS_CONNECTED_INTERFACE(iface)) {
virLibInterfaceError(NULL, VIR_ERR_INVALID_INTERFACE, __FUNCTION__);
return (-1);
}
conn = interface->conn;
conn = iface->conn;
if (conn->flags & VIR_CONNECT_RO) {
virLibInterfaceError(interface, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
virLibInterfaceError(iface, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
goto error;
}
if (conn->interfaceDriver && conn->interfaceDriver->interfaceCreate) {
int ret;
ret = conn->interfaceDriver->interfaceCreate (interface, flags);
ret = conn->interfaceDriver->interfaceCreate (iface, flags);
if (ret < 0)
goto error;
return ret;
......@@ -5882,13 +5882,13 @@ virInterfaceCreate(virInterfacePtr interface, unsigned int flags)
error:
/* Copy to connection error object for back compatability */
virSetConnError(interface->conn);
virSetConnError(iface->conn);
return -1;
}
/**
* virInterfaceDestroy:
* @interface: an interface object
* @iface: an interface object
* @flags: and OR'ed set of extraction flags, not used yet
*
* deactivate an interface (ie call "ifdown")
......@@ -5898,27 +5898,27 @@ error:
* Returns 0 in case of success and -1 in case of failure.
*/
int
virInterfaceDestroy(virInterfacePtr interface, unsigned int flags)
virInterfaceDestroy(virInterfacePtr iface, unsigned int flags)
{
virConnectPtr conn;
DEBUG("interface=%p, flags=%d", interface, flags);
DEBUG("iface=%p, flags=%d", iface, flags);
virResetLastError();
if (!VIR_IS_CONNECTED_INTERFACE(interface)) {
if (!VIR_IS_CONNECTED_INTERFACE(iface)) {
virLibInterfaceError(NULL, VIR_ERR_INVALID_INTERFACE, __FUNCTION__);
return (-1);
}
conn = interface->conn;
conn = iface->conn;
if (conn->flags & VIR_CONNECT_RO) {
virLibInterfaceError(interface, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
virLibInterfaceError(iface, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
goto error;
}
if (conn->interfaceDriver && conn->interfaceDriver->interfaceDestroy) {
int ret;
ret = conn->interfaceDriver->interfaceDestroy (interface, flags);
ret = conn->interfaceDriver->interfaceDestroy (iface, flags);
if (ret < 0)
goto error;
return ret;
......@@ -5928,13 +5928,13 @@ virInterfaceDestroy(virInterfacePtr interface, unsigned int flags)
error:
/* Copy to connection error object for back compatability */
virSetConnError(interface->conn);
virSetConnError(iface->conn);
return -1;
}
/**
* virInterfaceRef:
* @interface: the interface to hold a reference on
* @iface: the interface to hold a reference on
*
* Increment the reference count on the interface. For each
* additional call to this method, there shall be a corresponding
......@@ -5950,22 +5950,22 @@ error:
* Returns 0 in case of success, -1 in case of failure.
*/
int
virInterfaceRef(virInterfacePtr interface)
virInterfaceRef(virInterfacePtr iface)
{
if ((!VIR_IS_CONNECTED_INTERFACE(interface))) {
if ((!VIR_IS_CONNECTED_INTERFACE(iface))) {
virLibConnError(NULL, VIR_ERR_INVALID_ARG, __FUNCTION__);
return(-1);
}
virMutexLock(&interface->conn->lock);
DEBUG("interface=%p refs=%d", interface, interface->refs);
interface->refs++;
virMutexUnlock(&interface->conn->lock);
virMutexLock(&iface->conn->lock);
DEBUG("iface=%p refs=%d", iface, iface->refs);
iface->refs++;
virMutexUnlock(&iface->conn->lock);
return 0;
}
/**
* virInterfaceFree:
* @interface: a interface object
* @iface: a interface object
*
* Free the interface object. The interface itself is unaltered.
* The data structure is freed and should not be used thereafter.
......@@ -5973,17 +5973,17 @@ virInterfaceRef(virInterfacePtr interface)
* Returns 0 in case of success and -1 in case of failure.
*/
int
virInterfaceFree(virInterfacePtr interface)
virInterfaceFree(virInterfacePtr iface)
{
DEBUG("interface=%p", interface);
DEBUG("iface=%p", iface);
virResetLastError();
if (!VIR_IS_CONNECTED_INTERFACE(interface)) {
if (!VIR_IS_CONNECTED_INTERFACE(iface)) {
virLibInterfaceError(NULL, VIR_ERR_INVALID_INTERFACE, __FUNCTION__);
return (-1);
}
if (virUnrefInterface(interface) < 0)
if (virUnrefInterface(iface) < 0)
return (-1);
return(0);
}
......
src/remote_internal.c
浏览文件 @ 8a1a2ac5
......@@ -212,7 +212,7 @@ static void errorf (virConnectPtr conn, virErrorNumber code,
static void server_error (virConnectPtr conn, remote_error *err);
static virDomainPtr get_nonnull_domain (virConnectPtr conn, remote_nonnull_domain domain);
static virNetworkPtr get_nonnull_network (virConnectPtr conn, remote_nonnull_network network);
static virInterfacePtr get_nonnull_interface (virConnectPtr conn, remote_nonnull_interface interface);
static virInterfacePtr get_nonnull_interface (virConnectPtr conn, remote_nonnull_interface iface);
static virStoragePoolPtr get_nonnull_storage_pool (virConnectPtr conn, remote_nonnull_storage_pool pool);
static virStorageVolPtr get_nonnull_storage_vol (virConnectPtr conn, remote_nonnull_storage_vol vol);
static virNodeDevicePtr get_nonnull_node_device (virConnectPtr conn, remote_nonnull_node_device dev);
......@@ -3876,7 +3876,7 @@ static virInterfacePtr
remoteInterfaceLookupByName (virConnectPtr conn,
const char *name)
{
virInterfacePtr interface = NULL;
virInterfacePtr iface = NULL;
remote_interface_lookup_by_name_args args;
remote_interface_lookup_by_name_ret ret;
struct private_data *priv = conn->interfacePrivateData;
......@@ -3891,19 +3891,19 @@ remoteInterfaceLookupByName (virConnectPtr conn,
(xdrproc_t) xdr_remote_interface_lookup_by_name_ret, (char *) &ret) == -1)
goto done;
interface = get_nonnull_interface (conn, ret.interface);
iface = get_nonnull_interface (conn, ret.iface);
xdr_free ((xdrproc_t) &xdr_remote_interface_lookup_by_name_ret, (char *) &ret);
done:
remoteDriverUnlock(priv);
return interface;
return iface;
}
static virInterfacePtr
remoteInterfaceLookupByMACString (virConnectPtr conn,
const char *mac)
{
virInterfacePtr interface = NULL;
virInterfacePtr iface = NULL;
remote_interface_lookup_by_mac_string_args args;
remote_interface_lookup_by_mac_string_ret ret;
struct private_data *priv = conn->interfacePrivateData;
......@@ -3918,30 +3918,30 @@ remoteInterfaceLookupByMACString (virConnectPtr conn,
(xdrproc_t) xdr_remote_interface_lookup_by_mac_string_ret, (char *) &ret) == -1)
goto done;
interface = get_nonnull_interface (conn, ret.interface);
iface = get_nonnull_interface (conn, ret.iface);
xdr_free ((xdrproc_t) &xdr_remote_interface_lookup_by_mac_string_ret, (char *) &ret);
done:
remoteDriverUnlock(priv);
return interface;
return iface;
}
static char *
remoteInterfaceGetXMLDesc (virInterfacePtr interface,
remoteInterfaceGetXMLDesc (virInterfacePtr iface,
unsigned int flags)
{
char *rv = NULL;
remote_interface_get_xml_desc_args args;
remote_interface_get_xml_desc_ret ret;
struct private_data *priv = interface->conn->interfacePrivateData;
struct private_data *priv = iface->conn->interfacePrivateData;
remoteDriverLock(priv);
make_nonnull_interface (&args.interface, interface);
make_nonnull_interface (&args.iface, iface);
args.flags = flags;
memset (&ret, 0, sizeof ret);
if (call (interface->conn, priv, 0, REMOTE_PROC_INTERFACE_GET_XML_DESC,
if (call (iface->conn, priv, 0, REMOTE_PROC_INTERFACE_GET_XML_DESC,
(xdrproc_t) xdr_remote_interface_get_xml_desc_args, (char *) &args,
(xdrproc_t) xdr_remote_interface_get_xml_desc_ret, (char *) &ret) == -1)
goto done;
......@@ -3959,7 +3959,7 @@ remoteInterfaceDefineXML (virConnectPtr conn,
const char *xmlDesc,
unsigned int flags)
{
virInterfacePtr interface = NULL;
virInterfacePtr iface = NULL;
remote_interface_define_xml_args args;
remote_interface_define_xml_ret ret;
struct private_data *priv = conn->interfacePrivateData;
......@@ -3975,26 +3975,26 @@ remoteInterfaceDefineXML (virConnectPtr conn,
(xdrproc_t) xdr_remote_interface_define_xml_ret, (char *) &ret) == -1)
goto done;
interface = get_nonnull_interface (conn, ret.interface);
iface = get_nonnull_interface (conn, ret.iface);
xdr_free ((xdrproc_t) &xdr_remote_interface_define_xml_ret, (char *) &ret);
done:
remoteDriverUnlock(priv);
return interface;
return iface;
}
static int
remoteInterfaceUndefine (virInterfacePtr interface)
remoteInterfaceUndefine (virInterfacePtr iface)
{
int rv = -1;
remote_interface_undefine_args args;
struct private_data *priv = interface->conn->interfacePrivateData;
struct private_data *priv = iface->conn->interfacePrivateData;
remoteDriverLock(priv);
make_nonnull_interface (&args.interface, interface);
make_nonnull_interface (&args.iface, iface);
if (call (interface->conn, priv, 0, REMOTE_PROC_INTERFACE_UNDEFINE,
if (call (iface->conn, priv, 0, REMOTE_PROC_INTERFACE_UNDEFINE,
(xdrproc_t) xdr_remote_interface_undefine_args, (char *) &args,
(xdrproc_t) xdr_void, (char *) NULL) == -1)
goto done;
......@@ -4007,19 +4007,19 @@ done:
}
static int
remoteInterfaceCreate (virInterfacePtr interface,
remoteInterfaceCreate (virInterfacePtr iface,
unsigned int flags)
{
int rv = -1;
remote_interface_create_args args;
struct private_data *priv = interface->conn->interfacePrivateData;
struct private_data *priv = iface->conn->interfacePrivateData;
remoteDriverLock(priv);
make_nonnull_interface (&args.interface, interface);
make_nonnull_interface (&args.iface, iface);
args.flags = flags;
if (call (interface->conn, priv, 0, REMOTE_PROC_INTERFACE_CREATE,
if (call (iface->conn, priv, 0, REMOTE_PROC_INTERFACE_CREATE,
(xdrproc_t) xdr_remote_interface_create_args, (char *) &args,
(xdrproc_t) xdr_void, (char *) NULL) == -1)
goto done;
......@@ -4032,19 +4032,19 @@ done:
}
static int
remoteInterfaceDestroy (virInterfacePtr interface,
remoteInterfaceDestroy (virInterfacePtr iface,
unsigned int flags)
{
int rv = -1;
remote_interface_destroy_args args;
struct private_data *priv = interface->conn->interfacePrivateData;
struct private_data *priv = iface->conn->interfacePrivateData;
remoteDriverLock(priv);
make_nonnull_interface (&args.interface, interface);
make_nonnull_interface (&args.iface, iface);
args.flags = flags;
if (call (interface->conn, priv, 0, REMOTE_PROC_INTERFACE_DESTROY,
if (call (iface->conn, priv, 0, REMOTE_PROC_INTERFACE_DESTROY,
(xdrproc_t) xdr_remote_interface_destroy_args, (char *) &args,
(xdrproc_t) xdr_void, (char *) NULL) == -1)
goto done;
......@@ -7256,9 +7256,9 @@ get_nonnull_network (virConnectPtr conn, remote_nonnull_network network)
}
static virInterfacePtr
get_nonnull_interface (virConnectPtr conn, remote_nonnull_interface interface)
get_nonnull_interface (virConnectPtr conn, remote_nonnull_interface iface)
{
return virGetInterface (conn, interface.name, interface.mac);
return virGetInterface (conn, iface.name, iface.mac);
}
static virStoragePoolPtr
......
tests/testutils.c
浏览文件 @ 8a1a2ac5
......@@ -18,7 +18,9 @@
#ifndef WIN32
#include <sys/wait.h>
#endif
#ifdef HAVE_REGEX_H
#include <regex.h>
#endif
#include <unistd.h>
#include <string.h>
#include <fcntl.h>
......@@ -460,6 +462,7 @@ cleanup:
}
#ifdef HAVE_REGEX_H
int virtTestClearLineRegex(const char *pattern,
char *str)
{
......@@ -503,3 +506,10 @@ int virtTestClearLineRegex(const char *pattern,
return 0;
}
#else
int virtTestClearLineRegex(const char *pattern ATTRIBUTE_UNUSED,
char *str ATTRIBUTE_UNUSED)
{
return 0;
}
#endif
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或