[libvirt] [PATCH 3/3] qemu: Change from SecretIV or _IV to SecretAES or _AES
The preferred name will be AES not IV, change current references
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
---
src/qemu/qemu_command.c | 4 ++--
src/qemu/qemu_domain.c | 6 +++---
src/qemu/qemu_domain.h | 14 +++++++-------
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index fd7ce72..1375d96 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -638,7 +638,7 @@ qemuBuildGeneralSecinfoURI(virURIPtr uri,
}
break;
- case VIR_DOMAIN_SECRET_INFO_TYPE_IV:
+ case VIR_DOMAIN_SECRET_INFO_TYPE_AES:
case VIR_DOMAIN_SECRET_INFO_TYPE_LAST:
return -1;
}
@@ -677,7 +677,7 @@ qemuBuildRBDSecinfoURI(virBufferPtr buf,
secinfo->s.plain.secretlen);
break;
- case VIR_DOMAIN_SECRET_INFO_TYPE_IV:
+ case VIR_DOMAIN_SECRET_INFO_TYPE_AES:
case VIR_DOMAIN_SECRET_INFO_TYPE_LAST:
return -1;
}
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 98ab55fc..62dea1a 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -737,7 +737,7 @@ qemuDomainSecretPlainFree(qemuDomainSecretPlain secret)
static void
-qemuDomainSecretIVFree(qemuDomainSecretIV secret)
+qemuDomainSecretAESFree(qemuDomainSecretAES secret)
{
VIR_FREE(secret.username);
VIR_FREE(secret.alias);
@@ -757,8 +757,8 @@ qemuDomainSecretInfoFree(qemuDomainSecretInfoPtr *secinfo)
qemuDomainSecretPlainFree((*secinfo)->s.plain);
break;
- case VIR_DOMAIN_SECRET_INFO_TYPE_IV:
- qemuDomainSecretIVFree((*secinfo)->s.iv);
+ case VIR_DOMAIN_SECRET_INFO_TYPE_AES:
+ qemuDomainSecretAESFree((*secinfo)->s.aes);
break;
case VIR_DOMAIN_SECRET_INFO_TYPE_LAST:
diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index a03bdc5..5e825b3 100644
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -242,7 +242,7 @@ struct _qemuDomainObjPrivate {
/* Type of domain secret */
typedef enum {
VIR_DOMAIN_SECRET_INFO_TYPE_PLAIN = 0,
- VIR_DOMAIN_SECRET_INFO_TYPE_IV,
+ VIR_DOMAIN_SECRET_INFO_TYPE_AES, /* utilize GNUTLS_CIPHER_AES_256_CBC */
VIR_DOMAIN_SECRET_INFO_TYPE_LAST
} qemuDomainSecretInfoType;
@@ -255,11 +255,11 @@ struct _qemuDomainSecretPlain {
size_t secretlen;
};
-# define QEMU_DOMAIN_IV_KEY_LEN 16 /* 16 bytes for 128 bit random */
- /* initialization vector key */
-typedef struct _qemuDomainSecretIV qemuDomainSecretIV;
-typedef struct _qemuDomainSecretIV *qemuDomainSecretIVPtr;
-struct _qemuDomainSecretIV {
+# define QEMU_DOMAIN_AES_KEY_LEN 16 /* 16 bytes for 128 bit random */
+ /* initialization vector key */
+typedef struct _qemuDomainSecretAES qemuDomainSecretAES;
+typedef struct _qemuDomainSecretAES *qemuDomainSecretAESPtr;
+struct _qemuDomainSecretAES {
char *username;
char *alias; /* generated alias for secret */
char *iv; /* base64 encoded initialization vector */
@@ -272,7 +272,7 @@ struct _qemuDomainSecretInfo {
qemuDomainSecretInfoType type;
union {
qemuDomainSecretPlain plain;
- qemuDomainSecretIV iv;
+ qemuDomainSecretAES aes;
} s;
};
--
2.5.5