From nobody Sat Feb 7 10:08:14 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1505522975303370.7254342268443; Fri, 15 Sep 2017 17:49:35 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3BBBB3B9; Sat, 16 Sep 2017 00:49:34 +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 19C2160475; Sat, 16 Sep 2017 00:49:34 +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 D6A003FA56; Sat, 16 Sep 2017 00:49:33 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v8G0UOe1013104 for ; Fri, 15 Sep 2017 20:30:25 -0400 Received: by smtp.corp.redhat.com (Postfix) id F263618179; Sat, 16 Sep 2017 00:30:24 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-116-172.phx2.redhat.com [10.3.116.172]) by smtp.corp.redhat.com (Postfix) with ESMTP id BBD51179FF for ; Sat, 16 Sep 2017 00:30:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 3BBBB3B9 Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=libvir-list-bounces@redhat.com From: John Ferlan To: libvir-list@redhat.com Date: Fri, 15 Sep 2017 20:30:04 -0400 Message-Id: <20170916003017.32502-2-jferlan@redhat.com> In-Reply-To: <20170916003017.32502-1-jferlan@redhat.com> References: <20170916003017.32502-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 01/14] util: Move virSecretUsageType to virsecret.h 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: , MIME-Version: 1.0 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.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Sat, 16 Sep 2017 00:49:34 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Move the virSecretUsageType into the util. Signed-off-by: John Ferlan --- src/conf/domain_conf.c | 1 + src/conf/secret_conf.c | 4 +--- src/conf/secret_conf.h | 2 -- src/qemu/qemu_parse_command.c | 2 +- src/storage/storage_driver.c | 1 + src/util/virsecret.c | 2 ++ src/util/virsecret.h | 3 +++ tools/virsh-secret.c | 2 +- 8 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index cc5e79b70..8dca1357c 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -53,6 +53,7 @@ #include "device_conf.h" #include "network_conf.h" #include "virtpm.h" +#include "virsecret.h" #include "virstring.h" #include "virnetdev.h" #include "virnetdevmacvlan.h" diff --git a/src/conf/secret_conf.c b/src/conf/secret_conf.c index bd085b7e4..989705234 100644 --- a/src/conf/secret_conf.c +++ b/src/conf/secret_conf.c @@ -30,6 +30,7 @@ #include "secret_conf.h" #include "virsecretobj.h" #include "virerror.h" +#include "virsecret.h" #include "virstring.h" #include "virxml.h" #include "viruuid.h" @@ -38,9 +39,6 @@ =20 VIR_LOG_INIT("conf.secret_conf"); =20 -VIR_ENUM_IMPL(virSecretUsage, VIR_SECRET_USAGE_TYPE_LAST, - "none", "volume", "ceph", "iscsi", "tls") - void virSecretDefFree(virSecretDefPtr def) { diff --git a/src/conf/secret_conf.h b/src/conf/secret_conf.h index e0d9465a0..aa81651d4 100644 --- a/src/conf/secret_conf.h +++ b/src/conf/secret_conf.h @@ -26,8 +26,6 @@ # include "internal.h" # include "virutil.h" =20 -VIR_ENUM_DECL(virSecretUsage) - typedef struct _virSecretDef virSecretDef; typedef virSecretDef *virSecretDefPtr; struct _virSecretDef { diff --git a/src/qemu/qemu_parse_command.c b/src/qemu/qemu_parse_command.c index 8cb96a24a..ac9076190 100644 --- a/src/qemu/qemu_parse_command.c +++ b/src/qemu/qemu_parse_command.c @@ -28,9 +28,9 @@ #include "dirname.h" #include "viralloc.h" #include "virlog.h" +#include "virsecret.h" #include "virstring.h" #include "c-ctype.h" -#include "secret_conf.h" =20 #define VIR_FROM_THIS VIR_FROM_QEMU =20 diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 7cf5943cb..59ccc8036 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -48,6 +48,7 @@ #include "virfile.h" #include "virfdstream.h" #include "configmake.h" +#include "virsecret.h" #include "virstring.h" #include "viraccessapicheck.h" //#include "dirname.h" diff --git a/src/util/virsecret.c b/src/util/virsecret.c index aded8028b..4dd19cdf5 100644 --- a/src/util/virsecret.c +++ b/src/util/virsecret.c @@ -32,6 +32,8 @@ =20 VIR_LOG_INIT("util.secret"); =20 +VIR_ENUM_IMPL(virSecretUsage, VIR_SECRET_USAGE_TYPE_LAST, + "none", "volume", "ceph", "iscsi", "tls") =20 void virSecretLookupDefClear(virSecretLookupTypeDefPtr def) diff --git a/src/util/virsecret.h b/src/util/virsecret.h index 4506fb36e..a56e0c0c5 100644 --- a/src/util/virsecret.h +++ b/src/util/virsecret.h @@ -24,8 +24,11 @@ =20 # include "internal.h" =20 +# include "virutil.h" # include "virxml.h" =20 +VIR_ENUM_DECL(virSecretUsage) + typedef enum { VIR_SECRET_LOOKUP_TYPE_NONE, VIR_SECRET_LOOKUP_TYPE_UUID, diff --git a/tools/virsh-secret.c b/tools/virsh-secret.c index cd788b687..52f067652 100644 --- a/tools/virsh-secret.c +++ b/tools/virsh-secret.c @@ -32,9 +32,9 @@ #include "viralloc.h" #include "virfile.h" #include "virutil.h" +#include "virsecret.h" #include "virstring.h" #include "virtime.h" -#include "conf/secret_conf.h" =20 static virSecretPtr virshCommandOptSecret(vshControl *ctl, const vshCmd *cmd, const char **nam= e) --=20 2.13.5 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list