Tue May 8 11:49:00 BST 2007 Richard W.M. Jones <rjones@redhat.com>

        * src/hash.c, src/internal.h, src/libvirt_sym.version: Export
          __virGetDomain and __virGetNetwork for use by the libvirtd.
          The double underscores indicate that these interfaces are
          not officially supported parts of the libvirt API or ABI.

diff --git a/ChangeLog b/ChangeLog
index 8c0de219eac828f0139db35d1c9278fd6fa12f33..c5636613f4dd0301655d9c37ed9c8a6fcaf9a7fd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue May  8 11:49:00 BST 2007  Richard W.M. Jones  <rjones@redhat.com>
+
+       * src/hash.c, src/internal.h, src/libvirt_sym.version: Export
+         __virGetDomain and __virGetNetwork for use by the libvirtd.
+         The double underscores indicate that these interfaces are
+         not officially supported parts of the libvirt API or ABI.
+
 Tue May  8 11:14:00 BST 2007 Richard W.M. Jones <rjones@redhat.com>
 
        * src/hash.c, src/internal.h, src/xs_internal.c: Remove

diff --git a/src/hash.c b/src/hash.c
index cdaeb49f853f46922201a5bd2991d5501c5e591a..29cdfbf59e8bd84afe7b4b1cf28f08755ced522e 100644 (file)
--- a/src/hash.c
+++ b/src/hash.c
@@ -744,7 +744,7 @@ virFreeConnect(virConnectPtr conn) {
  * Returns a pointer to the domain, or NULL in case of failure
  */
 virDomainPtr
-virGetDomain(virConnectPtr conn, const char *name, const unsigned char *uuid) {
+__virGetDomain(virConnectPtr conn, const char *name, const unsigned char *uuid) {
     virDomainPtr ret = NULL;
 
     if ((!VIR_IS_CONNECT(conn)) || (name == NULL) || (uuid == NULL) ||
@@ -922,7 +922,7 @@ done:
  * Returns a pointer to the network, or NULL in case of failure
  */
 virNetworkPtr
-virGetNetwork(virConnectPtr conn, const char *name, const unsigned char *uuid) {
+__virGetNetwork(virConnectPtr conn, const char *name, const unsigned char *uuid) {
     virNetworkPtr ret = NULL;
 
     if ((!VIR_IS_CONNECT(conn)) || (name == NULL) || (uuid == NULL) ||

diff --git a/src/internal.h b/src/internal.h
index 4579f84e6091c44e7d506a97079718b2af7f7af3..54c63421f7dc497ac4bd5c731a2badaa2e835e43 100644 (file)
--- a/src/internal.h
+++ b/src/internal.h
@@ -198,19 +198,22 @@ const char *__virErrorMsg(virErrorNumber error, const char *info);
 
 virConnectPtr  virGetConnect   (void);
 int            virFreeConnect  (virConnectPtr conn);
-virDomainPtr   virGetDomain    (virConnectPtr conn,
+virDomainPtr   __virGetDomain  (virConnectPtr conn,
                                 const char *name,
                                 const unsigned char *uuid);
 int            virFreeDomain   (virConnectPtr conn,
                                 virDomainPtr domain);
 virDomainPtr   virGetDomainByID(virConnectPtr conn,
                                 int id);
-virNetworkPtr  virGetNetwork   (virConnectPtr conn,
+virNetworkPtr  __virGetNetwork (virConnectPtr conn,
                                 const char *name,
                                 const unsigned char *uuid);
 int            virFreeNetwork  (virConnectPtr conn,
                                 virNetworkPtr domain);
 
+#define virGetDomain(c,n,u) __virGetDomain((c),(n),(u))
+#define virGetNetwork(c,n,u) __virGetNetwork((c),(n),(u))
+
 #ifdef __cplusplus
 }
 #endif                          /* __cplusplus */

diff --git a/src/libvirt_sym.version b/src/libvirt_sym.version
index 91b6190f8444abf7736ec2f28b4adbc5e8c022ea..1d00ad988ffa869ef574b9b0bf7b7db6cb30c702 100644 (file)
--- a/src/libvirt_sym.version
+++ b/src/libvirt_sym.version
@@ -93,5 +93,8 @@
        __virConfWriteFile;
        __virConfWriteMem;
 
+       __virGetDomain;
+       __virGetNetwork;
+
     local: *;
 };