External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-24 22:55:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Adjust names of qemuDomainSecretInfoType enums

Browse Source 
From a review after push, add the "_TYPE" into the name.

Also use qemuDomainSecretInfoType in the struct rather than int
with the comment field containing the struct name

Signed-off-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
John Ferlan 2016-05-02 07:20:32 -04:00
parent b6238738ea
commit 70ae856e34
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qemu/qemu_domain.c
View File

@ -855,7 +855,7 @@ qemuDomainSecretPlainSetup(virConnectPtr conn,
int secretType = VIR_SECRET_USAGE_TYPE_ISCSI; int secretType = VIR_SECRET_USAGE_TYPE_ISCSI;
const char *protocolstr = virStorageNetProtocolTypeToString(protocol); 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) if (VIR_STRDUP(secinfo->s.plain.username, authdef->username) < 0)
return -1; return -1;

6
src/qemu/qemu_domain.h
View File

@ -241,9 +241,9 @@ struct _qemuDomainObjPrivate {
/* Type of domain secret */ /* Type of domain secret */
typedef enum { 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; } qemuDomainSecretInfoType;
typedef struct _qemuDomainSecretPlain qemuDomainSecretPlain; typedef struct _qemuDomainSecretPlain qemuDomainSecretPlain;
@ -256,7 +256,7 @@ struct _qemuDomainSecretPlain {
typedef struct _qemuDomainSecretInfo qemuDomainSecretInfo; typedef struct _qemuDomainSecretInfo qemuDomainSecretInfo;
typedef qemuDomainSecretInfo *qemuDomainSecretInfoPtr; typedef qemuDomainSecretInfo *qemuDomainSecretInfoPtr;
struct _qemuDomainSecretInfo { struct _qemuDomainSecretInfo {
int type; /* qemuDomainSecretInfoType */ qemuDomainSecretInfoType type;
union { union {
qemuDomainSecretPlain plain; qemuDomainSecretPlain plain;
} s; } s;