From 0d555708bd5bbcad39e4c96ee4a5cf486094c807 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 8 May 2007 10:53:27 +0000 Subject: [PATCH] Tue May 8 11:49:00 BST 2007 Richard W.M. Jones * 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. --- ChangeLog | 7 +++++++ src/hash.c | 4 ++-- src/internal.h | 7 +++++-- src/libvirt_sym.version | 3 +++ 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8c0de219ea..c5636613f4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Tue May 8 11:49:00 BST 2007 Richard W.M. Jones + + * 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 * src/hash.c, src/internal.h, src/xs_internal.c: Remove diff --git a/src/hash.c b/src/hash.c index cdaeb49f85..29cdfbf59e 100644 --- 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 4579f84e60..54c63421f7 100644 --- 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 91b6190f84..1d00ad988f 100644 --- a/src/libvirt_sym.version +++ b/src/libvirt_sym.version @@ -93,5 +93,8 @@ __virConfWriteFile; __virConfWriteMem; + __virGetDomain; + __virGetNetwork; + local: *; };