util: Move virSecretUsageType to virsecret.h

Move the virSecretUsageType into the util.
This commit is contained in:
John Ferlan 2017-09-15 14:55:46 -04:00
parent a74a16320b
commit 2dd024754e
8 changed files with 10 additions and 7 deletions

View File

@ -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"

View File

@ -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 @@
VIR_LOG_INIT("conf.secret_conf");
VIR_ENUM_IMPL(virSecretUsage, VIR_SECRET_USAGE_TYPE_LAST,
"none", "volume", "ceph", "iscsi", "tls")
void
virSecretDefFree(virSecretDefPtr def)
{

View File

@ -26,8 +26,6 @@
# include "internal.h"
# include "virutil.h"
VIR_ENUM_DECL(virSecretUsage)
typedef struct _virSecretDef virSecretDef;
typedef virSecretDef *virSecretDefPtr;
struct _virSecretDef {

View File

@ -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"
#define VIR_FROM_THIS VIR_FROM_QEMU

View File

@ -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"

View File

@ -32,6 +32,8 @@
VIR_LOG_INIT("util.secret");
VIR_ENUM_IMPL(virSecretUsage, VIR_SECRET_USAGE_TYPE_LAST,
"none", "volume", "ceph", "iscsi", "tls")
void
virSecretLookupDefClear(virSecretLookupTypeDefPtr def)

View File

@ -24,8 +24,11 @@
# include "internal.h"
# include "virutil.h"
# include "virxml.h"
VIR_ENUM_DECL(virSecretUsage)
typedef enum {
VIR_SECRET_LOOKUP_TYPE_NONE,
VIR_SECRET_LOOKUP_TYPE_UUID,

View File

@ -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"
static virSecretPtr
virshCommandOptSecret(vshControl *ctl, const vshCmd *cmd, const char **name)