1. Patchew
  2. QEMU
  3. [Qemu-devel] [PATCH 00/16] qapi: Rework mapping of enum value to string
  4. View patch

[Qemu-devel] [PATCH 09/16] crypto: Use qapi_enum_parse() in qcrypto_block_luks_name_lookup()

Markus Armbruster posted 16 patches 8 years, 5 months ago
[Qemu-devel] [PATCH 09/16] crypto: Use qapi_enum_parse() in qcrypto_block_luks_name_lookup()
Posted by Markus Armbruster 8 years, 5 months ago 
Cc: "Daniel P. Berrange" <berrange@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 crypto/block-luks.c | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/crypto/block-luks.c b/crypto/block-luks.c
index afb8543..c3cacdb 100644
--- a/crypto/block-luks.c
+++ b/crypto/block-luks.c
@@ -20,6 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qapi/util.h"
 #include "qemu/bswap.h"
 
 #include "crypto/block-luks.h"
@@ -265,39 +266,33 @@ qcrypto_block_luks_cipher_alg_lookup(QCryptoCipherAlgorithm alg,
  * make that function emit a more friendly error message */
 static int qcrypto_block_luks_name_lookup(const char *name,
                                           const char *const *map,
-                                          size_t maplen,
                                           const char *type,
                                           Error **errp)
 {
-    size_t i;
-    for (i = 0; i < maplen; i++) {
-        if (g_str_equal(map[i], name)) {
-            return i;
-        }
-    }
+    int ret = qapi_enum_parse(map, name, -1, NULL);
 
-    error_setg(errp, "%s %s not supported", type, name);
-    return 0;
+    if (ret < 0) {
+        error_setg(errp, "%s %s not supported", type, name);
+        return 0;
+    }
+    return ret;
 }
 
 #define qcrypto_block_luks_cipher_mode_lookup(name, errp)               \
     qcrypto_block_luks_name_lookup(name,                                \
                                    QCryptoCipherMode_lookup,            \
-                                   QCRYPTO_CIPHER_MODE__MAX,            \
                                    "Cipher mode",                       \
                                    errp)
 
 #define qcrypto_block_luks_hash_name_lookup(name, errp)                 \
     qcrypto_block_luks_name_lookup(name,                                \
                                    QCryptoHashAlgorithm_lookup,         \
-                                   QCRYPTO_HASH_ALG__MAX,               \
                                    "Hash algorithm",                    \
                                    errp)
 
 #define qcrypto_block_luks_ivgen_name_lookup(name, errp)                \
     qcrypto_block_luks_name_lookup(name,                                \
                                    QCryptoIVGenAlgorithm_lookup,        \
-                                   QCRYPTO_IVGEN_ALG__MAX,              \
                                    "IV generator",                      \
                                    errp)
 
-- 
2.7.5
Re: [Qemu-devel] [PATCH 09/16] crypto: Use qapi_enum_parse() in qcrypto_block_luks_name_lookup()
Posted by Marc-André Lureau 8 years, 5 months ago 
On Thu, Aug 24, 2017 at 10:46 AM, Markus Armbruster <armbru@redhat.com> wrote:
> Cc: "Daniel P. Berrange" <berrange@redhat.com>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>

Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>


> ---
>  crypto/block-luks.c | 19 +++++++------------
>  1 file changed, 7 insertions(+), 12 deletions(-)
>
> diff --git a/crypto/block-luks.c b/crypto/block-luks.c
> index afb8543..c3cacdb 100644
> --- a/crypto/block-luks.c
> +++ b/crypto/block-luks.c
> @@ -20,6 +20,7 @@
>
>  #include "qemu/osdep.h"
>  #include "qapi/error.h"
> +#include "qapi/util.h"
>  #include "qemu/bswap.h"
>
>  #include "crypto/block-luks.h"
> @@ -265,39 +266,33 @@ qcrypto_block_luks_cipher_alg_lookup(QCryptoCipherAlgorithm alg,
>   * make that function emit a more friendly error message */
>  static int qcrypto_block_luks_name_lookup(const char *name,
>                                            const char *const *map,
> -                                          size_t maplen,
>                                            const char *type,
>                                            Error **errp)
>  {
> -    size_t i;
> -    for (i = 0; i < maplen; i++) {
> -        if (g_str_equal(map[i], name)) {
> -            return i;
> -        }
> -    }
> +    int ret = qapi_enum_parse(map, name, -1, NULL);
>
> -    error_setg(errp, "%s %s not supported", type, name);
> -    return 0;
> +    if (ret < 0) {
> +        error_setg(errp, "%s %s not supported", type, name);
> +        return 0;
> +    }
> +    return ret;
>  }
>
>  #define qcrypto_block_luks_cipher_mode_lookup(name, errp)               \
>      qcrypto_block_luks_name_lookup(name,                                \
>                                     QCryptoCipherMode_lookup,            \
> -                                   QCRYPTO_CIPHER_MODE__MAX,            \
>                                     "Cipher mode",                       \
>                                     errp)
>
>  #define qcrypto_block_luks_hash_name_lookup(name, errp)                 \
>      qcrypto_block_luks_name_lookup(name,                                \
>                                     QCryptoHashAlgorithm_lookup,         \
> -                                   QCRYPTO_HASH_ALG__MAX,               \
>                                     "Hash algorithm",                    \
>                                     errp)
>
>  #define qcrypto_block_luks_ivgen_name_lookup(name, errp)                \
>      qcrypto_block_luks_name_lookup(name,                                \
>                                     QCryptoIVGenAlgorithm_lookup,        \
> -                                   QCRYPTO_IVGEN_ALG__MAX,              \
>                                     "IV generator",                      \
>                                     errp)
>
> --
> 2.7.5
>
>



-- 
Marc-André Lureau
Re: [Qemu-devel] [PATCH 09/16] crypto: Use qapi_enum_parse() in qcrypto_block_luks_name_lookup()
Posted by Daniel P. Berrange 8 years, 5 months ago 
On Thu, Aug 24, 2017 at 10:46:04AM +0200, Markus Armbruster wrote:
> Cc: "Daniel P. Berrange" <berrange@redhat.com>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>  crypto/block-luks.c | 19 +++++++------------
>  1 file changed, 7 insertions(+), 12 deletions(-)

Acked-by: Daniel P. Berrange <berrange@redhat.com>

> 
> diff --git a/crypto/block-luks.c b/crypto/block-luks.c
> index afb8543..c3cacdb 100644
> --- a/crypto/block-luks.c
> +++ b/crypto/block-luks.c
> @@ -20,6 +20,7 @@
>  
>  #include "qemu/osdep.h"
>  #include "qapi/error.h"
> +#include "qapi/util.h"
>  #include "qemu/bswap.h"
>  
>  #include "crypto/block-luks.h"
> @@ -265,39 +266,33 @@ qcrypto_block_luks_cipher_alg_lookup(QCryptoCipherAlgorithm alg,
>   * make that function emit a more friendly error message */
>  static int qcrypto_block_luks_name_lookup(const char *name,
>                                            const char *const *map,
> -                                          size_t maplen,
>                                            const char *type,
>                                            Error **errp)
>  {
> -    size_t i;
> -    for (i = 0; i < maplen; i++) {
> -        if (g_str_equal(map[i], name)) {
> -            return i;
> -        }
> -    }
> +    int ret = qapi_enum_parse(map, name, -1, NULL);
>  
> -    error_setg(errp, "%s %s not supported", type, name);
> -    return 0;
> +    if (ret < 0) {
> +        error_setg(errp, "%s %s not supported", type, name);
> +        return 0;
> +    }
> +    return ret;
>  }
>  
>  #define qcrypto_block_luks_cipher_mode_lookup(name, errp)               \
>      qcrypto_block_luks_name_lookup(name,                                \
>                                     QCryptoCipherMode_lookup,            \
> -                                   QCRYPTO_CIPHER_MODE__MAX,            \
>                                     "Cipher mode",                       \
>                                     errp)
>  
>  #define qcrypto_block_luks_hash_name_lookup(name, errp)                 \
>      qcrypto_block_luks_name_lookup(name,                                \
>                                     QCryptoHashAlgorithm_lookup,         \
> -                                   QCRYPTO_HASH_ALG__MAX,               \
>                                     "Hash algorithm",                    \
>                                     errp)
>  
>  #define qcrypto_block_luks_ivgen_name_lookup(name, errp)                \
>      qcrypto_block_luks_name_lookup(name,                                \
>                                     QCryptoIVGenAlgorithm_lookup,        \
> -                                   QCRYPTO_IVGEN_ALG__MAX,              \
>                                     "IV generator",                      \
>                                     errp)
>  
> -- 
> 2.7.5
> 

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.