1. Patchew
  2. QEMU
  3. View series

[Qemu-devel] [PATCH] tests: fix incorrect size_t format in benchmark-crypto

Philippe Mathieu-Daudé posted 1 patch 6 years, 7 months ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20170828113737.12199-1-f4bug@amsat.org
Test FreeBSD passed
Test checkpatch passed
Test docker passed
Test s390x passed
tests/benchmark-crypto-cipher.c | 4 ++--
tests/benchmark-crypto-hash.c   | 4 ++--
tests/benchmark-crypto-hmac.c   | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
[Qemu-devel] [PATCH] tests: fix incorrect size_t format in benchmark-crypto
Posted by Philippe Mathieu-Daudé 6 years, 7 months ago 
  $ make check-speed
  tests/benchmark-crypto-hash.c: In function 'test_hash_speed':
  tests/benchmark-crypto-hash.c:44:5: error: format '%ld' expects argument of type 'long int', but argument 2 has type 'size_t' [-Werror=format=]
       g_print("Testing chunk_size %ld bytes ", chunk_size);
       ^
  tests/benchmark-crypto-hash.c: In function 'main':
  tests/benchmark-crypto-hash.c:62:9: error: format '%lu' expects argument of type 'long unsigned int', but argument 4 has type 'size_t' [-Werror=format=]
           snprintf(name, sizeof(name), "/crypto/hash/speed-%lu", i);
           ^
  cc1: all warnings being treated as errors
  rules.mak:66: recipe for target 'tests/benchmark-crypto-hash.o' failed
  make: *** [tests/benchmark-crypto-hash.o] Error 1

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
testing v2.10.0-rc4

 tests/benchmark-crypto-cipher.c | 4 ++--
 tests/benchmark-crypto-hash.c   | 4 ++--
 tests/benchmark-crypto-hmac.c   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/benchmark-crypto-cipher.c b/tests/benchmark-crypto-cipher.c
index c6a40929e4..cf98443468 100644
--- a/tests/benchmark-crypto-cipher.c
+++ b/tests/benchmark-crypto-cipher.c
@@ -59,7 +59,7 @@ static void test_cipher_speed(const void *opaque)
     total /= 1024 * 1024; /* to MB */
 
     g_print("cbc(aes128): ");
-    g_print("Testing chunk_size %ld bytes ", chunk_size);
+    g_print("Testing chunk_size %zu bytes ", chunk_size);
     g_print("done: %.2f MB in %.2f secs: ", total, g_test_timer_last());
     g_print("%.2f MB/sec\n", total / g_test_timer_last());
 
@@ -80,7 +80,7 @@ int main(int argc, char **argv)
 
     for (i = 512; i <= (64 * 1204); i *= 2) {
         memset(name, 0 , sizeof(name));
-        snprintf(name, sizeof(name), "/crypto/cipher/speed-%lu", i);
+        snprintf(name, sizeof(name), "/crypto/cipher/speed-%zu", i);
         g_test_add_data_func(name, (void *)i, test_cipher_speed);
     }
 
diff --git a/tests/benchmark-crypto-hash.c b/tests/benchmark-crypto-hash.c
index 6769d2a11b..122bfb6b85 100644
--- a/tests/benchmark-crypto-hash.c
+++ b/tests/benchmark-crypto-hash.c
@@ -41,7 +41,7 @@ static void test_hash_speed(const void *opaque)
 
     total /= 1024 * 1024; /* to MB */
     g_print("sha256: ");
-    g_print("Testing chunk_size %ld bytes ", chunk_size);
+    g_print("Testing chunk_size %zu bytes ", chunk_size);
     g_print("done: %.2f MB in %.2f secs: ", total, g_test_timer_last());
     g_print("%.2f MB/sec\n", total / g_test_timer_last());
 
@@ -59,7 +59,7 @@ int main(int argc, char **argv)
 
     for (i = 512; i <= (64 * 1204); i *= 2) {
         memset(name, 0 , sizeof(name));
-        snprintf(name, sizeof(name), "/crypto/hash/speed-%lu", i);
+        snprintf(name, sizeof(name), "/crypto/hash/speed-%zu", i);
         g_test_add_data_func(name, (void *)i, test_hash_speed);
     }
 
diff --git a/tests/benchmark-crypto-hmac.c b/tests/benchmark-crypto-hmac.c
index 72408be987..c30250df3e 100644
--- a/tests/benchmark-crypto-hmac.c
+++ b/tests/benchmark-crypto-hmac.c
@@ -56,7 +56,7 @@ static void test_hmac_speed(const void *opaque)
     total /= 1024 * 1024; /* to MB */
 
     g_print("hmac(sha256): ");
-    g_print("Testing chunk_size %ld bytes ", chunk_size);
+    g_print("Testing chunk_size %zu bytes ", chunk_size);
     g_print("done: %.2f MB in %.2f secs: ", total, g_test_timer_last());
     g_print("%.2f MB/sec\n", total / g_test_timer_last());
 
@@ -74,7 +74,7 @@ int main(int argc, char **argv)
 
     for (i = 512; i <= (64 * 1204); i *= 2) {
         memset(name, 0 , sizeof(name));
-        snprintf(name, sizeof(name), "/crypto/hmac/speed-%lu", i);
+        snprintf(name, sizeof(name), "/crypto/hmac/speed-%zu", i);
         g_test_add_data_func(name, (void *)i, test_hmac_speed);
     }
 
-- 
2.14.1
Re: [Qemu-devel] [PATCH] tests: fix incorrect size_t format in benchmark-crypto
Posted by Marc-André Lureau 6 years, 7 months ago 
On Mon, Aug 28, 2017 at 1:38 PM Philippe Mathieu-Daudé <f4bug@amsat.org>
wrote:

>   $ make check-speed
>   tests/benchmark-crypto-hash.c: In function 'test_hash_speed':
>   tests/benchmark-crypto-hash.c:44:5: error: format '%ld' expects argument
> of type 'long int', but argument 2 has type 'size_t' [-Werror=format=]
>        g_print("Testing chunk_size %ld bytes ", chunk_size);
>        ^
>   tests/benchmark-crypto-hash.c: In function 'main':
>   tests/benchmark-crypto-hash.c:62:9: error: format '%lu' expects argument
> of type 'long unsigned int', but argument 4 has type 'size_t'
> [-Werror=format=]
>            snprintf(name, sizeof(name), "/crypto/hash/speed-%lu", i);
>            ^
>   cc1: all warnings being treated as errors
>   rules.mak:66: recipe for target 'tests/benchmark-crypto-hash.o' failed
>   make: *** [tests/benchmark-crypto-hash.o] Error 1
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
>

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

---
> testing v2.10.0-rc4
>
>  tests/benchmark-crypto-cipher.c | 4 ++--
>  tests/benchmark-crypto-hash.c   | 4 ++--
>  tests/benchmark-crypto-hmac.c   | 4 ++--
>  3 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/tests/benchmark-crypto-cipher.c
> b/tests/benchmark-crypto-cipher.c
> index c6a40929e4..cf98443468 100644
> --- a/tests/benchmark-crypto-cipher.c
> +++ b/tests/benchmark-crypto-cipher.c
> @@ -59,7 +59,7 @@ static void test_cipher_speed(const void *opaque)
>      total /= 1024 * 1024; /* to MB */
>
>      g_print("cbc(aes128): ");
> -    g_print("Testing chunk_size %ld bytes ", chunk_size);
> +    g_print("Testing chunk_size %zu bytes ", chunk_size);
>      g_print("done: %.2f MB in %.2f secs: ", total, g_test_timer_last());
>      g_print("%.2f MB/sec\n", total / g_test_timer_last());
>
> @@ -80,7 +80,7 @@ int main(int argc, char **argv)
>
>      for (i = 512; i <= (64 * 1204); i *= 2) {
>          memset(name, 0 , sizeof(name));
> -        snprintf(name, sizeof(name), "/crypto/cipher/speed-%lu", i);
> +        snprintf(name, sizeof(name), "/crypto/cipher/speed-%zu", i);
>          g_test_add_data_func(name, (void *)i, test_cipher_speed);
>      }
>
> diff --git a/tests/benchmark-crypto-hash.c b/tests/benchmark-crypto-hash.c
> index 6769d2a11b..122bfb6b85 100644
> --- a/tests/benchmark-crypto-hash.c
> +++ b/tests/benchmark-crypto-hash.c
> @@ -41,7 +41,7 @@ static void test_hash_speed(const void *opaque)
>
>      total /= 1024 * 1024; /* to MB */
>      g_print("sha256: ");
> -    g_print("Testing chunk_size %ld bytes ", chunk_size);
> +    g_print("Testing chunk_size %zu bytes ", chunk_size);
>      g_print("done: %.2f MB in %.2f secs: ", total, g_test_timer_last());
>      g_print("%.2f MB/sec\n", total / g_test_timer_last());
>
> @@ -59,7 +59,7 @@ int main(int argc, char **argv)
>
>      for (i = 512; i <= (64 * 1204); i *= 2) {
>          memset(name, 0 , sizeof(name));
> -        snprintf(name, sizeof(name), "/crypto/hash/speed-%lu", i);
> +        snprintf(name, sizeof(name), "/crypto/hash/speed-%zu", i);
>          g_test_add_data_func(name, (void *)i, test_hash_speed);
>      }
>
> diff --git a/tests/benchmark-crypto-hmac.c b/tests/benchmark-crypto-hmac.c
> index 72408be987..c30250df3e 100644
> --- a/tests/benchmark-crypto-hmac.c
> +++ b/tests/benchmark-crypto-hmac.c
> @@ -56,7 +56,7 @@ static void test_hmac_speed(const void *opaque)
>      total /= 1024 * 1024; /* to MB */
>
>      g_print("hmac(sha256): ");
> -    g_print("Testing chunk_size %ld bytes ", chunk_size);
> +    g_print("Testing chunk_size %zu bytes ", chunk_size);
>      g_print("done: %.2f MB in %.2f secs: ", total, g_test_timer_last());
>      g_print("%.2f MB/sec\n", total / g_test_timer_last());
>
> @@ -74,7 +74,7 @@ int main(int argc, char **argv)
>
>      for (i = 512; i <= (64 * 1204); i *= 2) {
>          memset(name, 0 , sizeof(name));
> -        snprintf(name, sizeof(name), "/crypto/hmac/speed-%lu", i);
> +        snprintf(name, sizeof(name), "/crypto/hmac/speed-%zu", i);
>          g_test_add_data_func(name, (void *)i, test_hmac_speed);
>      }
>
> --
> 2.14.1
>
>
> --
Marc-André Lureau
Re: [Qemu-devel] [PATCH] tests: fix incorrect size_t format in benchmark-crypto
Posted by Longpeng (Mike) 6 years, 7 months ago 

On 2017/8/28 19:37, Philippe Mathieu-Daudé wrote:

>   $ make check-speed
>   tests/benchmark-crypto-hash.c: In function 'test_hash_speed':
>   tests/benchmark-crypto-hash.c:44:5: error: format '%ld' expects argument of type 'long int', but argument 2 has type 'size_t' [-Werror=format=]
>        g_print("Testing chunk_size %ld bytes ", chunk_size);
>        ^
>   tests/benchmark-crypto-hash.c: In function 'main':
>   tests/benchmark-crypto-hash.c:62:9: error: format '%lu' expects argument of type 'long unsigned int', but argument 4 has type 'size_t' [-Werror=format=]
>            snprintf(name, sizeof(name), "/crypto/hash/speed-%lu", i);
>            ^
>   cc1: all warnings being treated as errors
>   rules.mak:66: recipe for target 'tests/benchmark-crypto-hash.o' failed
>   make: *** [tests/benchmark-crypto-hash.o] Error 1
> 
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>


Reviewed-by: Longpeng(Mike) <longpeng@@huawei.com>

> ---
> testing v2.10.0-rc4
> 
>  tests/benchmark-crypto-cipher.c | 4 ++--
>  tests/benchmark-crypto-hash.c   | 4 ++--
>  tests/benchmark-crypto-hmac.c   | 4 ++--
>  3 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/tests/benchmark-crypto-cipher.c b/tests/benchmark-crypto-cipher.c
> index c6a40929e4..cf98443468 100644
> --- a/tests/benchmark-crypto-cipher.c
> +++ b/tests/benchmark-crypto-cipher.c
> @@ -59,7 +59,7 @@ static void test_cipher_speed(const void *opaque)
>      total /= 1024 * 1024; /* to MB */
>  
>      g_print("cbc(aes128): ");
> -    g_print("Testing chunk_size %ld bytes ", chunk_size);
> +    g_print("Testing chunk_size %zu bytes ", chunk_size);
>      g_print("done: %.2f MB in %.2f secs: ", total, g_test_timer_last());
>      g_print("%.2f MB/sec\n", total / g_test_timer_last());
>  
> @@ -80,7 +80,7 @@ int main(int argc, char **argv)
>  
>      for (i = 512; i <= (64 * 1204); i *= 2) {
>          memset(name, 0 , sizeof(name));
> -        snprintf(name, sizeof(name), "/crypto/cipher/speed-%lu", i);
> +        snprintf(name, sizeof(name), "/crypto/cipher/speed-%zu", i);
>          g_test_add_data_func(name, (void *)i, test_cipher_speed);
>      }
>  
> diff --git a/tests/benchmark-crypto-hash.c b/tests/benchmark-crypto-hash.c
> index 6769d2a11b..122bfb6b85 100644
> --- a/tests/benchmark-crypto-hash.c
> +++ b/tests/benchmark-crypto-hash.c
> @@ -41,7 +41,7 @@ static void test_hash_speed(const void *opaque)
>  
>      total /= 1024 * 1024; /* to MB */
>      g_print("sha256: ");
> -    g_print("Testing chunk_size %ld bytes ", chunk_size);
> +    g_print("Testing chunk_size %zu bytes ", chunk_size);
>      g_print("done: %.2f MB in %.2f secs: ", total, g_test_timer_last());
>      g_print("%.2f MB/sec\n", total / g_test_timer_last());
>  
> @@ -59,7 +59,7 @@ int main(int argc, char **argv)
>  
>      for (i = 512; i <= (64 * 1204); i *= 2) {
>          memset(name, 0 , sizeof(name));
> -        snprintf(name, sizeof(name), "/crypto/hash/speed-%lu", i);
> +        snprintf(name, sizeof(name), "/crypto/hash/speed-%zu", i);
>          g_test_add_data_func(name, (void *)i, test_hash_speed);
>      }
>  
> diff --git a/tests/benchmark-crypto-hmac.c b/tests/benchmark-crypto-hmac.c
> index 72408be987..c30250df3e 100644
> --- a/tests/benchmark-crypto-hmac.c
> +++ b/tests/benchmark-crypto-hmac.c
> @@ -56,7 +56,7 @@ static void test_hmac_speed(const void *opaque)
>      total /= 1024 * 1024; /* to MB */
>  
>      g_print("hmac(sha256): ");
> -    g_print("Testing chunk_size %ld bytes ", chunk_size);
> +    g_print("Testing chunk_size %zu bytes ", chunk_size);
>      g_print("done: %.2f MB in %.2f secs: ", total, g_test_timer_last());
>      g_print("%.2f MB/sec\n", total / g_test_timer_last());
>  
> @@ -74,7 +74,7 @@ int main(int argc, char **argv)
>  
>      for (i = 512; i <= (64 * 1204); i *= 2) {
>          memset(name, 0 , sizeof(name));
> -        snprintf(name, sizeof(name), "/crypto/hmac/speed-%lu", i);
> +        snprintf(name, sizeof(name), "/crypto/hmac/speed-%zu", i);
>          g_test_add_data_func(name, (void *)i, test_hmac_speed);
>      }
>  


-- 
Regards,
Longpeng(Mike)
Re: [Qemu-devel] [PATCH] tests: fix incorrect size_t format in benchmark-crypto
Posted by Longpeng (Mike) 6 years, 7 months ago 

On 2017/8/29 8:21, Longpeng (Mike) wrote:

> 
> 
> On 2017/8/28 19:37, Philippe Mathieu-Daudé wrote:
> 
>>   $ make check-speed
>>   tests/benchmark-crypto-hash.c: In function 'test_hash_speed':
>>   tests/benchmark-crypto-hash.c:44:5: error: format '%ld' expects argument of type 'long int', but argument 2 has type 'size_t' [-Werror=format=]
>>        g_print("Testing chunk_size %ld bytes ", chunk_size);
>>        ^
>>   tests/benchmark-crypto-hash.c: In function 'main':
>>   tests/benchmark-crypto-hash.c:62:9: error: format '%lu' expects argument of type 'long unsigned int', but argument 4 has type 'size_t' [-Werror=format=]
>>            snprintf(name, sizeof(name), "/crypto/hash/speed-%lu", i);
>>            ^
>>   cc1: all warnings being treated as errors
>>   rules.mak:66: recipe for target 'tests/benchmark-crypto-hash.o' failed
>>   make: *** [tests/benchmark-crypto-hash.o] Error 1
>>
>> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> 
> 
> Reviewed-by: Longpeng(Mike) <longpeng@@huawei.com>
> 


Sorry, s/@/2/

Reviewed-by: Longpeng(Mike) <longpeng2@huawei.com>

>> ---
>> testing v2.10.0-rc4
>>
>>  tests/benchmark-crypto-cipher.c | 4 ++--
>>  tests/benchmark-crypto-hash.c   | 4 ++--
>>  tests/benchmark-crypto-hmac.c   | 4 ++--
>>  3 files changed, 6 insertions(+), 6 deletions(-)
>>
>> diff --git a/tests/benchmark-crypto-cipher.c b/tests/benchmark-crypto-cipher.c
>> index c6a40929e4..cf98443468 100644
>> --- a/tests/benchmark-crypto-cipher.c
>> +++ b/tests/benchmark-crypto-cipher.c
>> @@ -59,7 +59,7 @@ static void test_cipher_speed(const void *opaque)
>>      total /= 1024 * 1024; /* to MB */
>>  
>>      g_print("cbc(aes128): ");
>> -    g_print("Testing chunk_size %ld bytes ", chunk_size);
>> +    g_print("Testing chunk_size %zu bytes ", chunk_size);
>>      g_print("done: %.2f MB in %.2f secs: ", total, g_test_timer_last());
>>      g_print("%.2f MB/sec\n", total / g_test_timer_last());
>>  
>> @@ -80,7 +80,7 @@ int main(int argc, char **argv)
>>  
>>      for (i = 512; i <= (64 * 1204); i *= 2) {
>>          memset(name, 0 , sizeof(name));
>> -        snprintf(name, sizeof(name), "/crypto/cipher/speed-%lu", i);
>> +        snprintf(name, sizeof(name), "/crypto/cipher/speed-%zu", i);
>>          g_test_add_data_func(name, (void *)i, test_cipher_speed);
>>      }
>>  
>> diff --git a/tests/benchmark-crypto-hash.c b/tests/benchmark-crypto-hash.c
>> index 6769d2a11b..122bfb6b85 100644
>> --- a/tests/benchmark-crypto-hash.c
>> +++ b/tests/benchmark-crypto-hash.c
>> @@ -41,7 +41,7 @@ static void test_hash_speed(const void *opaque)
>>  
>>      total /= 1024 * 1024; /* to MB */
>>      g_print("sha256: ");
>> -    g_print("Testing chunk_size %ld bytes ", chunk_size);
>> +    g_print("Testing chunk_size %zu bytes ", chunk_size);
>>      g_print("done: %.2f MB in %.2f secs: ", total, g_test_timer_last());
>>      g_print("%.2f MB/sec\n", total / g_test_timer_last());
>>  
>> @@ -59,7 +59,7 @@ int main(int argc, char **argv)
>>  
>>      for (i = 512; i <= (64 * 1204); i *= 2) {
>>          memset(name, 0 , sizeof(name));
>> -        snprintf(name, sizeof(name), "/crypto/hash/speed-%lu", i);
>> +        snprintf(name, sizeof(name), "/crypto/hash/speed-%zu", i);
>>          g_test_add_data_func(name, (void *)i, test_hash_speed);
>>      }
>>  
>> diff --git a/tests/benchmark-crypto-hmac.c b/tests/benchmark-crypto-hmac.c
>> index 72408be987..c30250df3e 100644
>> --- a/tests/benchmark-crypto-hmac.c
>> +++ b/tests/benchmark-crypto-hmac.c
>> @@ -56,7 +56,7 @@ static void test_hmac_speed(const void *opaque)
>>      total /= 1024 * 1024; /* to MB */
>>  
>>      g_print("hmac(sha256): ");
>> -    g_print("Testing chunk_size %ld bytes ", chunk_size);
>> +    g_print("Testing chunk_size %zu bytes ", chunk_size);
>>      g_print("done: %.2f MB in %.2f secs: ", total, g_test_timer_last());
>>      g_print("%.2f MB/sec\n", total / g_test_timer_last());
>>  
>> @@ -74,7 +74,7 @@ int main(int argc, char **argv)
>>  
>>      for (i = 512; i <= (64 * 1204); i *= 2) {
>>          memset(name, 0 , sizeof(name));
>> -        snprintf(name, sizeof(name), "/crypto/hmac/speed-%lu", i);
>> +        snprintf(name, sizeof(name), "/crypto/hmac/speed-%zu", i);
>>          g_test_add_data_func(name, (void *)i, test_hmac_speed);
>>      }
>>  
> 
> 


-- 
Regards,
Longpeng(Mike)
Re: [Qemu-devel] [PATCH] tests: fix incorrect size_t format in benchmark-crypto
Posted by Daniel P. Berrange 6 years, 7 months ago 
On Mon, Aug 28, 2017 at 08:37:37AM -0300, Philippe Mathieu-Daudé wrote:
>   $ make check-speed
>   tests/benchmark-crypto-hash.c: In function 'test_hash_speed':
>   tests/benchmark-crypto-hash.c:44:5: error: format '%ld' expects argument of type 'long int', but argument 2 has type 'size_t' [-Werror=format=]
>        g_print("Testing chunk_size %ld bytes ", chunk_size);
>        ^
>   tests/benchmark-crypto-hash.c: In function 'main':
>   tests/benchmark-crypto-hash.c:62:9: error: format '%lu' expects argument of type 'long unsigned int', but argument 4 has type 'size_t' [-Werror=format=]
>            snprintf(name, sizeof(name), "/crypto/hash/speed-%lu", i);
>            ^
>   cc1: all warnings being treated as errors
>   rules.mak:66: recipe for target 'tests/benchmark-crypto-hash.o' failed
>   make: *** [tests/benchmark-crypto-hash.o] Error 1
> 
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> testing v2.10.0-rc4
> 
>  tests/benchmark-crypto-cipher.c | 4 ++--
>  tests/benchmark-crypto-hash.c   | 4 ++--
>  tests/benchmark-crypto-hmac.c   | 4 ++--
>  3 files changed, 6 insertions(+), 6 deletions(-)

Thanks, added to my crypto queue, unless it merges through -trivial
first.


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-0870f84

© 2016 - 2024 Red Hat, Inc.