From nobody Tue Feb 10 01:59:09 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=1560874505; cv=none; d=zoho.com; s=zohoarc; b=FgcO/vT4soZltFQ95uzRg+pSIsVBGQXqPtmm46JtOHRZxJwz7LnkEvdqmZho49jV6wgG5mz5PrOtDU7QN4eif5l33tv6mP+7OVQah7H14OaP9RocHUG97PXTmrsRqD/pkfrvxd+lJYf/QFPVSCK5GgyvBDWRj+07mbmmE7lRMd8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1560874505; 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=VShoJdLWv/ZZ2+uyoskangoY4It1lndyikJDYMnQQ2U=; b=bhLxvb0Nc29m8gwYmnWtZ1uS+4pWPynUnwTC+YUev+f0qJ64gRUXH1a5yLP2KxHujTF5K7AQVC3e43DuXTg3L9BO0qNvPJ+T3+QxO5Mp9tixvZrUU6Z6ntxRvv7AkHG91GeP9+wFE2YR4G+011Mr4c6cQ+IK9sGhR6AMNPbdXYE= 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 1560874505879468.7167720165713; Tue, 18 Jun 2019 09:15:05 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 766BE3086229; Tue, 18 Jun 2019 16:14:49 +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 789737D65A; Tue, 18 Jun 2019 16:14:46 +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 9D32D1806B1C; Tue, 18 Jun 2019 16:14:40 +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 x5IGDPJW024139 for ; Tue, 18 Jun 2019 12:13:25 -0400 Received: by smtp.corp.redhat.com (Postfix) id B7CE684EF; Tue, 18 Jun 2019 16:13:25 +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 8561360FAB for ; Tue, 18 Jun 2019 16:13:25 +0000 (UTC) From: Jonathon Jongsma To: libvir-list@redhat.com Date: Tue, 18 Jun 2019 11:12:35 -0500 Message-Id: <20190618161316.1722-6-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 05/46] src/openvz: 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.15 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:14:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Signed-off-by: Jonathon Jongsma Reviewed-by: J=C3=A1n Tomko --- src/openvz/openvz_conf.h | 21 +++++++++------------ src/openvz/openvz_driver.h | 11 ++++------- src/openvz/openvz_util.h | 5 +---- 3 files changed, 14 insertions(+), 23 deletions(-) diff --git a/src/openvz/openvz_conf.h b/src/openvz/openvz_conf.h index 05ccd6f927..cd42d697ce 100644 --- a/src/openvz/openvz_conf.h +++ b/src/openvz/openvz_conf.h @@ -21,21 +21,20 @@ * . */ =20 -#ifndef LIBVIRT_OPENVZ_CONF_H -# define LIBVIRT_OPENVZ_CONF_H +#pragma once =20 -# include "internal.h" -# include "virdomainobjlist.h" -# include "virthread.h" +#include "internal.h" +#include "virdomainobjlist.h" +#include "virthread.h" =20 =20 /* OpenVZ commands - Replace with wrapper scripts later? */ -# define VZLIST "/usr/sbin/vzlist" -# define VZCTL "/usr/sbin/vzctl" -# define VZMIGRATE "/usr/sbin/vzmigrate" -# define VZ_CONF_FILE "/etc/vz/vz.conf" +#define VZLIST "/usr/sbin/vzlist" +#define VZCTL "/usr/sbin/vzctl" +#define VZMIGRATE "/usr/sbin/vzmigrate" +#define VZ_CONF_FILE "/etc/vz/vz.conf" =20 -# define VZCTL_BRIDGE_MIN_VERSION ((3 * 1000 * 1000) + (0 * 1000) + 22 + 1) +#define VZCTL_BRIDGE_MIN_VERSION ((3 * 1000 * 1000) + (0 * 1000) + 22 + 1) =20 struct openvz_driver { virMutex lock; @@ -64,5 +63,3 @@ int strtoI(const char *str); int openvzSetDefinedUUID(int vpsid, unsigned char *uuid); int openvzGetVEID(const char *name); int openvzReadNetworkConf(virDomainDefPtr def, int veid); - -#endif /* LIBVIRT_OPENVZ_CONF_H */ diff --git a/src/openvz/openvz_driver.h b/src/openvz/openvz_driver.h index dd2cfd900e..1570fd82ac 100644 --- a/src/openvz/openvz_driver.h +++ b/src/openvz/openvz_driver.h @@ -20,21 +20,18 @@ * . */ =20 -#ifndef LIBVIRT_OPENVZ_DRIVER_H -# define LIBVIRT_OPENVZ_DRIVER_H +#pragma once =20 -# include "internal.h" +#include "internal.h" =20 -# define OPENVZ_MIGRATION_FLAGS \ +#define OPENVZ_MIGRATION_FLAGS \ (VIR_MIGRATE_LIVE) =20 /* All supported migration parameters and their types. */ -# define OPENVZ_MIGRATION_PARAMETERS \ +#define OPENVZ_MIGRATION_PARAMETERS \ VIR_MIGRATE_PARAM_URI, VIR_TYPED_PARAM_STRING, \ VIR_MIGRATE_PARAM_DEST_NAME, VIR_TYPED_PARAM_STRING, \ VIR_MIGRATE_PARAM_DEST_XML, VIR_TYPED_PARAM_STRING, \ NULL =20 int openvzRegister(void); - -#endif /* LIBVIRT_OPENVZ_DRIVER_H */ diff --git a/src/openvz/openvz_util.h b/src/openvz/openvz_util.h index bc3247119a..a1f046c5d2 100644 --- a/src/openvz/openvz_util.h +++ b/src/openvz/openvz_util.h @@ -19,10 +19,7 @@ * */ =20 -#ifndef LIBVIRT_OPENVZ_UTIL_H -# define LIBVIRT_OPENVZ_UTIL_H +#pragma once =20 long openvzKBPerPages(void); char *openvzVEGetStringParam(virDomainPtr dom, const char *param); - -#endif /* LIBVIRT_OPENVZ_UTIL_H */ --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list