From nobody Mon Feb 9 16:02:11 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=1560874627; cv=none; d=zoho.com; s=zohoarc; b=dyaDg3e/zuB/szwHOZwiZnwnDfxvJlzAiSkp/wpBnfU9rplDCSoTj+JXttfcqh7bY6CqZR3qie5x0tFx/yLxd2aqrpFhg9PK6wvFjCmjWUabm2/b1ku+VzKxvFjBpz9vBtynv9ZcY13sa4nPRxgD8XKxMGGNd1wPDFQoTAK+F+U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1560874627; 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=bwAPJY6ATqJDjWaCJX3yav9hwba06638KWIzrQrFasY=; b=gzxilYj48RLRH9aFpabX00Lme0R2AJ7ugJfnwtFd75drKEIflQPguTMgIcb+DoG3Stv0eTQPGfU0UI6IL7HjxIP4NNY1ghtzpDIE/Zd4Y39lyyy8SnXFzVroHcAONVsWCs00sa43Ehm5YryDeZntr/+T6yZeKyzRnS01/vgi2mM= 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 1560874627390297.11461758213227; Tue, 18 Jun 2019 09:17:07 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B6A443086233; Tue, 18 Jun 2019 16:17:00 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 90AF05C22B; Tue, 18 Jun 2019 16:17:00 +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 57B351806B1C; Tue, 18 Jun 2019 16:16:59 +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 x5IGDcE4024419 for ; Tue, 18 Jun 2019 12:13:38 -0400 Received: by smtp.corp.redhat.com (Postfix) id 55B0984EF; Tue, 18 Jun 2019 16:13:38 +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 212AF8518 for ; Tue, 18 Jun 2019 16:13:38 +0000 (UTC) From: Jonathon Jongsma To: libvir-list@redhat.com Date: Tue, 18 Jun 2019 11:13:12 -0500 Message-Id: <20190618161316.1722-43-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 42/46] src/vz: 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.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Tue, 18 Jun 2019 16:17:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Signed-off-by: Jonathon Jongsma Reviewed-by: J=C3=A1n Tomko --- src/vz/vz_driver.h | 5 +---- src/vz/vz_sdk.h | 9 +++------ src/vz/vz_utils.h | 37 +++++++++++++++++-------------------- 3 files changed, 21 insertions(+), 30 deletions(-) diff --git a/src/vz/vz_driver.h b/src/vz/vz_driver.h index 593a585075..ce75b11c04 100644 --- a/src/vz/vz_driver.h +++ b/src/vz/vz_driver.h @@ -20,9 +20,6 @@ * */ =20 -#ifndef LIBVIRT_VZ_DRIVER_H -# define LIBVIRT_VZ_DRIVER_H +#pragma once =20 int vzRegister(void); - -#endif /* LIBVIRT_VZ_DRIVER_H */ diff --git a/src/vz/vz_sdk.h b/src/vz/vz_sdk.h index e412b821bb..5acee2ca9d 100644 --- a/src/vz/vz_sdk.h +++ b/src/vz/vz_sdk.h @@ -20,12 +20,11 @@ * */ =20 -#ifndef LIBVIRT_VZ_SDK_H -# define LIBVIRT_VZ_SDK_H +#pragma once =20 -# include +#include =20 -# include "vz_utils.h" +#include "vz_utils.h" =20 int prlsdkInit(void); void prlsdkDeinit(void); @@ -94,5 +93,3 @@ PRL_HANDLE prlsdkSdkDomainLookupByName(vzDriverPtr driver, const char *name); int prlsdkCancelJob(virDomainObjPtr dom); int prlsdkResizeImage(virDomainObjPtr dom, virDomainDiskDefPtr disk, unsig= ned long long newsize); - -#endif /* LIBVIRT_VZ_SDK_H */ diff --git a/src/vz/vz_utils.h b/src/vz/vz_utils.h index fb289ed4a7..d9e3ebc30a 100644 --- a/src/vz/vz_utils.h +++ b/src/vz/vz_utils.h @@ -20,27 +20,26 @@ * */ =20 -#ifndef LIBVIRT_VZ_UTILS_H -# define LIBVIRT_VZ_UTILS_H +#pragma once =20 -# include +#include =20 -# include "driver.h" -# include "conf/domain_conf.h" -# include "conf/snapshot_conf.h" -# include "conf/virdomainsnapshotobjlist.h" -# include "conf/virdomainobjlist.h" -# include "conf/domain_event.h" -# include "virthread.h" -# include "datatypes.h" +#include "driver.h" +#include "conf/domain_conf.h" +#include "conf/snapshot_conf.h" +#include "conf/virdomainsnapshotobjlist.h" +#include "conf/virdomainobjlist.h" +#include "conf/domain_event.h" +#include "virthread.h" +#include "datatypes.h" =20 -# define vzParseError() \ +#define vzParseError() \ virReportErrorHelper(VIR_FROM_TEST, VIR_ERR_OPERATION_FAILED, __FILE__= , \ __FUNCTION__, __LINE__, _("Can't parse prlctl out= put")) =20 -# define IS_CT(def) (def->os.type =3D=3D VIR_DOMAIN_OSTYPE_EXE) +#define IS_CT(def) (def->os.type =3D=3D VIR_DOMAIN_OSTYPE_EXE) =20 -# define vzDomNotFoundError(domain) \ +#define vzDomNotFoundError(domain) \ do { \ char uuidstr[VIR_UUID_STRING_BUFLEN]; \ virUUIDFormat(domain->uuid, uuidstr); \ @@ -48,8 +47,8 @@ _("no domain with matching uuid '%s'"), uuidstr); \ } while (0) =20 -# define PARALLELS_DOMAIN_ROUTED_NETWORK_NAME "host-routed" -# define VIRTUOZZO_VER_7 ((unsigned long)7000000) +#define PARALLELS_DOMAIN_ROUTED_NETWORK_NAME "host-routed" +#define VIRTUOZZO_VER_7 ((unsigned long)7000000) =20 struct _vzCapabilities { virStorageFileFormat vmDiskFormat; @@ -62,7 +61,7 @@ typedef struct _vzCapabilities vzCapabilities; typedef struct _vzCapabilities *vzCapabilitiesPtr; =20 /* +2 to keep enclosing { and } */ -# define VIR_UUID_STRING_BRACED_BUFLEN (VIR_UUID_STRING_BUFLEN + 2) +#define VIR_UUID_STRING_BRACED_BUFLEN (VIR_UUID_STRING_BUFLEN + 2) =20 struct _vzDriver { virObjectLockable parent; @@ -146,7 +145,7 @@ vzGetDefaultSCSIModel(vzDriverPtr driver, =20 int vzCheckUnsupportedGraphics(virDomainGraphicsDefPtr gr); =20 -# define PARALLELS_BLOCK_STATS_FOREACH(OP) \ + define PARALLELS_BLOCK_STATS_FOREACH(OP) \ OP(rd_req, VIR_DOMAIN_BLOCK_STATS_READ_REQ, "read_requests") \ OP(rd_bytes, VIR_DOMAIN_BLOCK_STATS_READ_BYTES, "read_total") \ OP(wr_req, VIR_DOMAIN_BLOCK_STATS_WRITE_REQ, "write_requests") \ @@ -158,5 +157,3 @@ void vzDomainObjEndJob(virDomainObjPtr dom); int vzDomainJobUpdateTime(vzDomainJobObjPtr job); - -#endif /* LIBVIRT_VZ_UTILS_H */ --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list