From nobody Mon Feb 9 16:32:40 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1560874529; cv=none; d=zoho.com; s=zohoarc; b=ht9GIWkSWIcGLZ2jP5T8jYUpfY583ArNe3cU9prMqfdRHtili7mJ/nXcR7VpqZcKoibS4pCA79ms09dIKdzW0n/XWffQd8+J74VXpq70K0f0/alQmtLtnavEXN/xf5UIo5CYNcqJBrCMTSrIf9UEUaEPLYkfVeE3GR0iWj30nWk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1560874529; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=UdOH8S2ZKZ9ob+aUr/IdExt6gwvgkGPo0jCLueehhSQ=; b=ENwMZJR78dJXU09wl0NrmXo88kd/YqOTIrXk9ljJflWaqKERSR9SIQap9swqHMPLS+A5pKykyGozYeXwhkXktaUaHAbG0vgUKwnC8PitFyZnMbg3AcgTmF7o4QCnkRqq7ykXCmgDd8h08s6RnNF2b3tJ0SEPOE59C3bOdppnt7I= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1560874529046255.78622201289977; Tue, 18 Jun 2019 09:15:29 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6AB1C30C1CBE; Tue, 18 Jun 2019 16:15:21 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3C88584EF; Tue, 18 Jun 2019 16:15:20 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id D8BB2206D1; Tue, 18 Jun 2019 16:15:17 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x5IGDQZk024161 for ; Tue, 18 Jun 2019 12:13:26 -0400 Received: by smtp.corp.redhat.com (Postfix) id CFFA860FAB; Tue, 18 Jun 2019 16:13:26 +0000 (UTC) Received: from aegolius.redhat.com (ovpn-117-198.phx2.redhat.com [10.3.117.198]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9DFB984EF for ; Tue, 18 Jun 2019 16:13:26 +0000 (UTC) From: Jonathon Jongsma To: libvir-list@redhat.com Date: Tue, 18 Jun 2019 11:12:38 -0500 Message-Id: <20190618161316.1722-9-jjongsma@redhat.com> In-Reply-To: <20190618161316.1722-1-jjongsma@redhat.com> References: <20190618161316.1722-1-jjongsma@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 08/46] src/remote: use #pragma once in headers X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Tue, 18 Jun 2019 16:15:28 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Signed-off-by: Jonathon Jongsma Reviewed-by: J=C3=A1n Tomko --- src/remote/remote_daemon.h | 35 +++++++++++++--------------- src/remote/remote_daemon_config.h | 7 ++---- src/remote/remote_daemon_dispatch.h | 11 ++++----- src/remote/remote_daemon_stream.h | 7 ++---- src/remote/remote_driver.h | 36 +++++++++++++---------------- 5 files changed, 40 insertions(+), 56 deletions(-) diff --git a/src/remote/remote_daemon.h b/src/remote/remote_daemon.h index 50e912f828..a403d2593a 100644 --- a/src/remote/remote_daemon.h +++ b/src/remote/remote_daemon.h @@ -19,22 +19,21 @@ * . */ =20 -#ifndef LIBVIRT_REMOTE_DAEMON_H -# define LIBVIRT_REMOTE_DAEMON_H +#pragma once =20 -# define VIR_ENUM_SENTINELS +#define VIR_ENUM_SENTINELS =20 -# include -# include -# include "remote_protocol.h" -# include "lxc_protocol.h" -# include "qemu_protocol.h" -# include "virthread.h" +#include +#include +#include "remote_protocol.h" +#include "lxc_protocol.h" +#include "qemu_protocol.h" +#include "virthread.h" =20 -# if WITH_SASL -# include "virnetsaslcontext.h" -# endif -# include "virnetserverprogram.h" +#if WITH_SASL +# include "virnetsaslcontext.h" +#endif +#include "virnetserverprogram.h" =20 typedef struct daemonClientStream daemonClientStream; typedef daemonClientStream *daemonClientStreamPtr; @@ -62,9 +61,9 @@ struct daemonClientPrivate { size_t nsecretEventCallbacks; bool closeRegistered; =20 -# if WITH_SASL +#if WITH_SASL virNetSASLSessionPtr sasl; -# endif +#endif =20 /* 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 @@ -82,10 +81,8 @@ struct daemonClientPrivate { }; =20 =20 -# if WITH_SASL +#if WITH_SASL extern virNetSASLContextPtr saslCtxt; -# endif +#endif extern virNetServerProgramPtr remoteProgram; extern virNetServerProgramPtr qemuProgram; - -#endif /* LIBVIRT_REMOTE_DAEMON_H */ diff --git a/src/remote/remote_daemon_config.h b/src/remote/remote_daemon_c= onfig.h index 56d130bdce..533fc7bbd3 100644 --- a/src/remote/remote_daemon_config.h +++ b/src/remote/remote_daemon_config.h @@ -19,10 +19,9 @@ * . */ =20 -#ifndef LIBVIRT_REMOTE_DAEMON_CONFIG_H -# define LIBVIRT_REMOTE_DAEMON_CONFIG_H +#pragma once =20 -# include "internal.h" +#include "internal.h" =20 struct daemonConfig { char *host_uuid; @@ -103,5 +102,3 @@ int daemonConfigLoadFile(struct daemonConfig *data, int daemonConfigLoadData(struct daemonConfig *data, const char *filename, const char *filedata); - -#endif /* LIBVIRT_REMOTE_DAEMON_CONFIG_H */ diff --git a/src/remote/remote_daemon_dispatch.h b/src/remote/remote_daemon= _dispatch.h index cafe109a21..1f70b9e4e9 100644 --- a/src/remote/remote_daemon_dispatch.h +++ b/src/remote/remote_daemon_dispatch.h @@ -18,12 +18,11 @@ * . */ =20 -#ifndef LIBVIRT_REMOTE_DAEMON_DISPATCH_H -# define LIBVIRT_REMOTE_DAEMON_DISPATCH_H +#pragma once =20 -# include "remote_protocol.h" -# include "rpc/virnetserverprogram.h" -# include "rpc/virnetserverclient.h" +#include "remote_protocol.h" +#include "rpc/virnetserverprogram.h" +#include "rpc/virnetserverclient.h" =20 =20 extern virNetServerProgramProc remoteProcs[]; @@ -38,5 +37,3 @@ extern size_t qemuNProcs; void remoteClientFree(void *data); void *remoteClientNew(virNetServerClientPtr client, void *opaque); - -#endif /* LIBVIRT_REMOTE_DAEMON_DISPATCH_H */ diff --git a/src/remote/remote_daemon_stream.h b/src/remote/remote_daemon_s= tream.h index 46e3df5c5e..a9bed10292 100644 --- a/src/remote/remote_daemon_stream.h +++ b/src/remote/remote_daemon_stream.h @@ -18,10 +18,9 @@ * . */ =20 -#ifndef LIBVIRT_REMOTE_DAEMON_STREAM_H -# define LIBVIRT_REMOTE_DAEMON_STREAM_H +#pragma once =20 -# include "remote_daemon.h" +#include "remote_daemon.h" =20 daemonClientStream * daemonCreateClientStream(virNetServerClientPtr client, @@ -43,5 +42,3 @@ daemonRemoveClientStream(virNetServerClientPtr client, =20 void daemonRemoveAllClientStreams(daemonClientStream *stream); - -#endif /* LIBVIRT_REMOTE_DAEMON_STREAM_H */ diff --git a/src/remote/remote_driver.h b/src/remote/remote_driver.h index 5d6580e855..8c7da6b000 100644 --- a/src/remote/remote_driver.h +++ b/src/remote/remote_driver.h @@ -19,31 +19,27 @@ * . */ =20 -#ifndef LIBVIRT_REMOTE_DRIVER_H -# define LIBVIRT_REMOTE_DRIVER_H +#pragma once =20 -# include "internal.h" -# include "configmake.h" +#include "internal.h" +#include "configmake.h" =20 int remoteRegister (void); =20 unsigned long remoteVersion(void); =20 -# define LIBVIRTD_LISTEN_ADDR NULL -# define LIBVIRTD_TLS_PORT "16514" -# define LIBVIRTD_TCP_PORT "16509" -# define LIBVIRTD_PRIV_UNIX_SOCKET LOCALSTATEDIR "/run/libvirt/libvirt-soc= k" -# define LIBVIRTD_PRIV_UNIX_SOCKET_RO LOCALSTATEDIR "/run/libvirt/libvirt-= sock-ro" -# define LIBVIRTD_USER_UNIX_SOCKET "libvirt-sock" -# define LIBVIRTD_CONFIGURATION_FILE SYSCONFDIR "/libvirt/libvirtd.conf" +#define LIBVIRTD_LISTEN_ADDR NULL +#define LIBVIRTD_TLS_PORT "16514" +#define LIBVIRTD_TCP_PORT "16509" +#define LIBVIRTD_PRIV_UNIX_SOCKET LOCALSTATEDIR "/run/libvirt/libvirt-sock" +#define LIBVIRTD_PRIV_UNIX_SOCKET_RO LOCALSTATEDIR "/run/libvirt/libvirt-s= ock-ro" +#define LIBVIRTD_USER_UNIX_SOCKET "libvirt-sock" +#define LIBVIRTD_CONFIGURATION_FILE SYSCONFDIR "/libvirt/libvirtd.conf" =20 /* Defaults for PKI directory. */ -# define LIBVIRT_PKI_DIR SYSCONFDIR "/pki" -# define LIBVIRT_CACERT LIBVIRT_PKI_DIR "/CA/cacert.pem" -# define LIBVIRT_CLIENTKEY LIBVIRT_PKI_DIR "/libvirt/private/clientkey.pem" -# define LIBVIRT_CLIENTCERT LIBVIRT_PKI_DIR "/libvirt/clientcert.pem" -# define LIBVIRT_SERVERKEY LIBVIRT_PKI_DIR "/libvirt/private/serverkey.pem" -# define LIBVIRT_SERVERCERT LIBVIRT_PKI_DIR "/libvirt/servercert.pem" - - -#endif /* LIBVIRT_REMOTE_DRIVER_H */ +#define LIBVIRT_PKI_DIR SYSCONFDIR "/pki" +#define LIBVIRT_CACERT LIBVIRT_PKI_DIR "/CA/cacert.pem" +#define LIBVIRT_CLIENTKEY LIBVIRT_PKI_DIR "/libvirt/private/clientkey.pem" +#define LIBVIRT_CLIENTCERT LIBVIRT_PKI_DIR "/libvirt/clientcert.pem" +#define LIBVIRT_SERVERKEY LIBVIRT_PKI_DIR "/libvirt/private/serverkey.pem" +#define LIBVIRT_SERVERCERT LIBVIRT_PKI_DIR "/libvirt/servercert.pem" --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list