External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

Use separate symbol file for GNUTLS symbols

Browse Source 
A number of symbols are only present when GNUTLS is enabled.
Thus we must use a separate libvirt_gnutls.syms file for them
instead of libvirt_private.syms

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2013-03-13 13:37:29 +00:00
parent b5d014c375
commit 83d7e4e460
3 changed files with 53 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Makefile.am
View File

@ -1458,6 +1458,12 @@ else
SYM_FILES += $(srcdir)/libvirt_sasl.syms SYM_FILES += $(srcdir)/libvirt_sasl.syms
endif endif
if WITH_GNUTLS
USED_SYM_FILES += $(srcdir)/libvirt_gnutls.syms
else
SYM_FILES += $(srcdir)/libvirt_gnutls.syms
endif
if WITH_SSH2 if WITH_SSH2
USED_SYM_FILES += $(srcdir)/libvirt_libssh2.syms USED_SYM_FILES += $(srcdir)/libvirt_libssh2.syms
else else
@ -1481,6 +1487,7 @@ EXTRA_DIST += \
libvirt_openvz.syms \ libvirt_openvz.syms \
libvirt_qemu.syms \ libvirt_qemu.syms \
libvirt_sasl.syms \ libvirt_sasl.syms \
libvirt_gnutls.syms \
libvirt_vmx.syms \ libvirt_vmx.syms \
libvirt_xenxs.syms \ libvirt_xenxs.syms \
libvirt_libssh2.syms libvirt_libssh2.syms

46
src/libvirt_gnutls.syms Normal file
View File

@ -0,0 +1,46 @@
#
# GNUTLS-specific symbols
#
# rpc/virnetclient.h
virNetClientGetTLSKeySize;
virNetClientSetTLSSession;
# rpc/virnetserver.h
virNetServerSetTLSContext;
# rpc/virnetserverclient.h
virNetServerClientGetTLSKeySize;
virNetServerClientHasTLSSession;
# rpc/virnetserverservice.h
virNetServerServiceGetTLSContext;
# rpc/virnetsocket.h
virNetSocketSetTLSSession;
# rpc/virnettlscontext.h
virNetTLSContextCheckCertificate;
virNetTLSContextNewClient;
virNetTLSContextNewClientPath;
virNetTLSContextNewServer;
virNetTLSContextNewServerPath;
virNetTLSInit;
virNetTLSSessionGetHandshakeStatus;
virNetTLSSessionGetKeySize;
virNetTLSSessionHandshake;
virNetTLSSessionNew;
virNetTLSSessionRead;
virNetTLSSessionSetIOCallbacks;
virNetTLSSessionWrite;
# Let emacs know we want case-insensitive sorting
# Local Variables:
# sort-fold-case: t
# End:

23
src/libvirt_private.syms
View File

@ -762,7 +762,6 @@ virNetClientAddStream;
virNetClientClose; virNetClientClose;
virNetClientDupFD; virNetClientDupFD;
virNetClientGetFD; virNetClientGetFD;
virNetClientGetTLSKeySize;
virNetClientHasPassFD; virNetClientHasPassFD;
virNetClientIsEncrypted; virNetClientIsEncrypted;
virNetClientIsOpen; virNetClientIsOpen;
@ -784,7 +783,6 @@ virNetClientSendNoReply;
virNetClientSendWithReply; virNetClientSendWithReply;
virNetClientSendWithReplyStream; virNetClientSendWithReplyStream;
virNetClientSetCloseCallback; virNetClientSetCloseCallback;
virNetClientSetTLSSession;
# rpc/virnetclientprogram.h # rpc/virnetclientprogram.h
@ -844,7 +842,6 @@ virNetServerPreExecRestart;
virNetServerQuit; virNetServerQuit;
virNetServerRemoveShutdownInhibition; virNetServerRemoveShutdownInhibition;
virNetServerRun; virNetServerRun;
virNetServerSetTLSContext;
virNetServerUpdateServices; virNetServerUpdateServices;
@ -856,9 +853,7 @@ virNetServerClientGetAuth;
virNetServerClientGetFD; virNetServerClientGetFD;
virNetServerClientGetPrivateData; virNetServerClientGetPrivateData;
virNetServerClientGetReadonly; virNetServerClientGetReadonly;
virNetServerClientGetTLSKeySize;
virNetServerClientGetUNIXIdentity; virNetServerClientGetUNIXIdentity;
virNetServerClientHasTLSSession;
virNetServerClientImmediateClose; virNetServerClientImmediateClose;
virNetServerClientInit; virNetServerClientInit;
virNetServerClientInitKeepAlive; virNetServerClientInitKeepAlive;
@ -910,7 +905,6 @@ virNetServerServiceClose;
virNetServerServiceGetAuth; virNetServerServiceGetAuth;
virNetServerServiceGetMaxRequests; virNetServerServiceGetMaxRequests;
virNetServerServiceGetPort; virNetServerServiceGetPort;
virNetServerServiceGetTLSContext;
virNetServerServiceIsReadonly; virNetServerServiceIsReadonly;
virNetServerServiceNewFD; virNetServerServiceNewFD;
virNetServerServiceNewPostExecRestart; virNetServerServiceNewPostExecRestart;
@ -952,27 +946,10 @@ virNetSocketRemoteAddrString;
virNetSocketRemoveIOCallback; virNetSocketRemoveIOCallback;
virNetSocketSendFD; virNetSocketSendFD;
virNetSocketSetBlocking; virNetSocketSetBlocking;
virNetSocketSetTLSSession;
virNetSocketUpdateIOCallback; virNetSocketUpdateIOCallback;
virNetSocketWrite; virNetSocketWrite;
# rpc/virnettlscontext.h
virNetTLSContextCheckCertificate;
virNetTLSContextNewClient;
virNetTLSContextNewClientPath;
virNetTLSContextNewServer;
virNetTLSContextNewServerPath;
virNetTLSInit;
virNetTLSSessionGetHandshakeStatus;
virNetTLSSessionGetKeySize;
virNetTLSSessionHandshake;
virNetTLSSessionNew;
virNetTLSSessionRead;
virNetTLSSessionSetIOCallbacks;
virNetTLSSessionWrite;
# security/security_driver.h # security/security_driver.h
virSecurityDriverLookup; virSecurityDriverLookup;