From: John Ferlan <jferlan@redhat.com>
Date: Wed, 11 May 2016 20:57:54 +0000 (-0400)
Subject: qemu: Change from SecretIV or _IV to SecretAES or _AES
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=677b94f48763efd703cb80ea5e7badeff857de5d;p=libvirt.git

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@redhat.com>
---

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 7e39b8ab24..0d6d5f8ba9 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;
     }
@@ -676,7 +676,7 @@ qemuBuildRBDSecinfoURI(virBufferPtr buf,
                         secinfo->s.plain.secret);
         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 3da0079770..39a50e6d70 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 c71118845d..331ade0d27 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;
@@ -254,11 +254,11 @@ struct _qemuDomainSecretPlain {
     char *secret;
 };
 
-# 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_IV_KEY_LEN 16   /* 16 bytes for 128 bit random */
+                                         /*    initialization vector */
+typedef struct _qemuDomainSecretAES qemuDomainSecretAES;
+typedef struct _qemuDomainSecretAES *qemuDomainSecretAESPtr;
+struct _qemuDomainSecretAES {
     char *username;
     char *alias;      /* generated alias for secret */
     char *iv;         /* base64 encoded initialization vector */
@@ -271,7 +271,7 @@ struct _qemuDomainSecretInfo {
     qemuDomainSecretInfoType type;
     union {
         qemuDomainSecretPlain plain;
-        qemuDomainSecretIV iv;
+        qemuDomainSecretAES aes;
     } s;
 };