[libvirt] [PATCH v2 1/8] qemu: Adjust names of qemuDomainSecretInfoType enums

Also use qemuDomainSecretInfoType in the struct rather than int with the comment field containing the struct name Signed-off-by: John Ferlan <jferlan(a)redhat.com&gt; --- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_domain.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 3f1fbd7..383c735 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -855,7 +855,7 @@ qemuDomainSecretPlainSetup(virConnectPtr conn, int secretType = VIR_SECRET_USAGE_TYPE_ISCSI; const char *protocolstr = virStorageNetProtocolTypeToString(protocol); - secinfo->type = VIR_DOMAIN_SECRET_INFO_PLAIN; + secinfo->type = VIR_DOMAIN_SECRET_INFO_TYPE_PLAIN; if (VIR_STRDUP(secinfo->s.plain.username, authdef->username) < 0) return -1; diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 63f98ba..c81921e 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -241,9 +241,9 @@ struct _qemuDomainObjPrivate { /* Type of domain secret */ typedef enum { - VIR_DOMAIN_SECRET_INFO_PLAIN = 0, + VIR_DOMAIN_SECRET_INFO_TYPE_PLAIN = 0, - VIR_DOMAIN_SECRET_INFO_LAST + VIR_DOMAIN_SECRET_INFO_TYPE_LAST } qemuDomainSecretInfoType; typedef struct _qemuDomainSecretPlain qemuDomainSecretPlain; @@ -256,7 +256,7 @@ struct _qemuDomainSecretPlain { typedef struct _qemuDomainSecretInfo qemuDomainSecretInfo; typedef qemuDomainSecretInfo *qemuDomainSecretInfoPtr; struct _qemuDomainSecretInfo { - int type; /* qemuDomainSecretInfoType */ + qemuDomainSecretInfoType type; union { qemuDomainSecretPlain plain; } s; -- 2.5.5