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

src/remote: use #pragma once in headers

Browse Source 
Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Jonathon Jongsma 2019-06-18 11:12:38 -05:00 committed by Ján Tomko
parent 5dad4b5d93
commit 85dd3d05cc
5 changed files with 40 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/remote/remote_daemon.h
View File

@ -19,22 +19,21 @@
* <http://www.gnu.org/licenses/>. * <http://www.gnu.org/licenses/>.
*/ */
#ifndef LIBVIRT_REMOTE_DAEMON_H #pragma once
# define LIBVIRT_REMOTE_DAEMON_H
# define VIR_ENUM_SENTINELS #define VIR_ENUM_SENTINELS
# include <rpc/types.h> #include <rpc/types.h>
# include <rpc/xdr.h> #include <rpc/xdr.h>
# include "remote_protocol.h" #include "remote_protocol.h"
# include "lxc_protocol.h" #include "lxc_protocol.h"
# include "qemu_protocol.h" #include "qemu_protocol.h"
# include "virthread.h" #include "virthread.h"
# if WITH_SASL #if WITH_SASL
# include "virnetsaslcontext.h" # include "virnetsaslcontext.h"
# endif #endif
# include "virnetserverprogram.h" #include "virnetserverprogram.h"
typedef struct daemonClientStream daemonClientStream; typedef struct daemonClientStream daemonClientStream;
typedef daemonClientStream *daemonClientStreamPtr; typedef daemonClientStream *daemonClientStreamPtr;
@ -62,9 +61,9 @@ struct daemonClientPrivate {
size_t nsecretEventCallbacks; size_t nsecretEventCallbacks;
bool closeRegistered; bool closeRegistered;
# if WITH_SASL #if WITH_SASL
virNetSASLSessionPtr sasl; virNetSASLSessionPtr sasl;
# endif #endif
/* This is only valid if a remote open call has been made on this /* This is only valid if a remote open call has been made on this
* connection, otherwise it will be NULL. Also if remote close is * connection, otherwise it will be NULL. Also if remote close is
@ -82,10 +81,8 @@ struct daemonClientPrivate {
}; };
# if WITH_SASL #if WITH_SASL
extern virNetSASLContextPtr saslCtxt; extern virNetSASLContextPtr saslCtxt;
# endif #endif
extern virNetServerProgramPtr remoteProgram; extern virNetServerProgramPtr remoteProgram;
extern virNetServerProgramPtr qemuProgram; extern virNetServerProgramPtr qemuProgram;
#endif /* LIBVIRT_REMOTE_DAEMON_H */

7
src/remote/remote_daemon_config.h
View File

@ -19,10 +19,9 @@
* <http://www.gnu.org/licenses/>. * <http://www.gnu.org/licenses/>.
*/ */
#ifndef LIBVIRT_REMOTE_DAEMON_CONFIG_H #pragma once
# define LIBVIRT_REMOTE_DAEMON_CONFIG_H
# include "internal.h" #include "internal.h"
struct daemonConfig { struct daemonConfig {
char *host_uuid; char *host_uuid;
@ -103,5 +102,3 @@ int daemonConfigLoadFile(struct daemonConfig *data,
int daemonConfigLoadData(struct daemonConfig *data, int daemonConfigLoadData(struct daemonConfig *data,
const char *filename, const char *filename,
const char *filedata); const char *filedata);
#endif /* LIBVIRT_REMOTE_DAEMON_CONFIG_H */

11
src/remote/remote_daemon_dispatch.h
View File

@ -18,12 +18,11 @@
* <http://www.gnu.org/licenses/>. * <http://www.gnu.org/licenses/>.
*/ */
#ifndef LIBVIRT_REMOTE_DAEMON_DISPATCH_H #pragma once
# define LIBVIRT_REMOTE_DAEMON_DISPATCH_H
# include "remote_protocol.h" #include "remote_protocol.h"
# include "rpc/virnetserverprogram.h" #include "rpc/virnetserverprogram.h"
# include "rpc/virnetserverclient.h" #include "rpc/virnetserverclient.h"
extern virNetServerProgramProc remoteProcs[]; extern virNetServerProgramProc remoteProcs[];
@ -38,5 +37,3 @@ extern size_t qemuNProcs;
void remoteClientFree(void *data); void remoteClientFree(void *data);
void *remoteClientNew(virNetServerClientPtr client, void *remoteClientNew(virNetServerClientPtr client,
void *opaque); void *opaque);
#endif /* LIBVIRT_REMOTE_DAEMON_DISPATCH_H */

7
src/remote/remote_daemon_stream.h
View File

@ -18,10 +18,9 @@
* <http://www.gnu.org/licenses/>. * <http://www.gnu.org/licenses/>.
*/ */
#ifndef LIBVIRT_REMOTE_DAEMON_STREAM_H #pragma once
# define LIBVIRT_REMOTE_DAEMON_STREAM_H
# include "remote_daemon.h" #include "remote_daemon.h"
daemonClientStream * daemonClientStream *
daemonCreateClientStream(virNetServerClientPtr client, daemonCreateClientStream(virNetServerClientPtr client,
@ -43,5 +42,3 @@ daemonRemoveClientStream(virNetServerClientPtr client,
void void
daemonRemoveAllClientStreams(daemonClientStream *stream); daemonRemoveAllClientStreams(daemonClientStream *stream);
#endif /* LIBVIRT_REMOTE_DAEMON_STREAM_H */

36
src/remote/remote_driver.h
View File

@ -19,31 +19,27 @@
* <http://www.gnu.org/licenses/>. * <http://www.gnu.org/licenses/>.
*/ */
#ifndef LIBVIRT_REMOTE_DRIVER_H #pragma once
# define LIBVIRT_REMOTE_DRIVER_H
# include "internal.h" #include "internal.h"
# include "configmake.h" #include "configmake.h"
int remoteRegister (void); int remoteRegister (void);
unsigned long remoteVersion(void); unsigned long remoteVersion(void);
# define LIBVIRTD_LISTEN_ADDR NULL #define LIBVIRTD_LISTEN_ADDR NULL
# define LIBVIRTD_TLS_PORT "16514" #define LIBVIRTD_TLS_PORT "16514"
# define LIBVIRTD_TCP_PORT "16509" #define LIBVIRTD_TCP_PORT "16509"
# define LIBVIRTD_PRIV_UNIX_SOCKET LOCALSTATEDIR "/run/libvirt/libvirt-sock" #define LIBVIRTD_PRIV_UNIX_SOCKET LOCALSTATEDIR "/run/libvirt/libvirt-sock"
# define LIBVIRTD_PRIV_UNIX_SOCKET_RO LOCALSTATEDIR "/run/libvirt/libvirt-sock-ro" #define LIBVIRTD_PRIV_UNIX_SOCKET_RO LOCALSTATEDIR "/run/libvirt/libvirt-sock-ro"
# define LIBVIRTD_USER_UNIX_SOCKET "libvirt-sock" #define LIBVIRTD_USER_UNIX_SOCKET "libvirt-sock"
# define LIBVIRTD_CONFIGURATION_FILE SYSCONFDIR "/libvirt/libvirtd.conf" #define LIBVIRTD_CONFIGURATION_FILE SYSCONFDIR "/libvirt/libvirtd.conf"
/* Defaults for PKI directory. */ /* Defaults for PKI directory. */
# define LIBVIRT_PKI_DIR SYSCONFDIR "/pki" #define LIBVIRT_PKI_DIR SYSCONFDIR "/pki"
# define LIBVIRT_CACERT LIBVIRT_PKI_DIR "/CA/cacert.pem" #define LIBVIRT_CACERT LIBVIRT_PKI_DIR "/CA/cacert.pem"
# define LIBVIRT_CLIENTKEY LIBVIRT_PKI_DIR "/libvirt/private/clientkey.pem" #define LIBVIRT_CLIENTKEY LIBVIRT_PKI_DIR "/libvirt/private/clientkey.pem"
# define LIBVIRT_CLIENTCERT LIBVIRT_PKI_DIR "/libvirt/clientcert.pem" #define LIBVIRT_CLIENTCERT LIBVIRT_PKI_DIR "/libvirt/clientcert.pem"
# define LIBVIRT_SERVERKEY LIBVIRT_PKI_DIR "/libvirt/private/serverkey.pem" #define LIBVIRT_SERVERKEY LIBVIRT_PKI_DIR "/libvirt/private/serverkey.pem"
# define LIBVIRT_SERVERCERT LIBVIRT_PKI_DIR "/libvirt/servercert.pem" #define LIBVIRT_SERVERCERT LIBVIRT_PKI_DIR "/libvirt/servercert.pem"
#endif /* LIBVIRT_REMOTE_DRIVER_H */