1. Patchew
  2. QEMU
  3. [PATCH-for-6.2 v3 0/6] tests/unit: Fix test-smp-parse
  4. View patch

[PATCH-for-6.2 v3 4/6] tests/unit/test-smp-parse: Simplify pointer to compound literal use

Philippe Mathieu-Daudé posted 6 patches 4 years, 1 month ago
There is a newer version of this series
[PATCH-for-6.2 v3 4/6] tests/unit/test-smp-parse: Simplify pointer to compound literal use
Posted by Philippe Mathieu-Daudé 4 years, 1 month ago 
We can simply use a local variable (and pass its pointer) instead
of a pointer to a compound literal.

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 tests/unit/test-smp-parse.c | 64 ++++++++++++++++++-------------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/tests/unit/test-smp-parse.c b/tests/unit/test-smp-parse.c
index de6d226b455..83a5b8ffdcf 100644
--- a/tests/unit/test-smp-parse.c
+++ b/tests/unit/test-smp-parse.c
@@ -492,19 +492,19 @@ static void test_generic(void)
     Object *obj = object_new(TYPE_MACHINE);
     MachineState *ms = MACHINE(obj);
     MachineClass *mc = MACHINE_GET_CLASS(obj);
-    SMPTestData *data = &(SMPTestData){{ }};
+    SMPTestData data = {};
     int i;
 
     for (i = 0; i < ARRAY_SIZE(data_generic_valid); i++) {
-        *data = data_generic_valid[i];
-        unsupported_params_init(mc, data);
+        data = data_generic_valid[i];
+        unsupported_params_init(mc, &data);
 
-        smp_parse_test(ms, data, true);
+        smp_parse_test(ms, &data, true);
 
         /* Unsupported parameters can be provided with their values as 1 */
-        data->config.has_dies = true;
-        data->config.dies = 1;
-        smp_parse_test(ms, data, true);
+        data.config.has_dies = true;
+        data.config.dies = 1;
+        smp_parse_test(ms, &data, true);
     }
 
     /* Force invalid min CPUs and max CPUs */
@@ -512,10 +512,10 @@ static void test_generic(void)
     mc->max_cpus = 511;
 
     for (i = 0; i < ARRAY_SIZE(data_generic_invalid); i++) {
-        *data = data_generic_invalid[i];
-        unsupported_params_init(mc, data);
+        data = data_generic_invalid[i];
+        unsupported_params_init(mc, &data);
 
-        smp_parse_test(ms, data, false);
+        smp_parse_test(ms, &data, false);
     }
 
     /* Reset the supported min CPUs and max CPUs */
@@ -530,47 +530,47 @@ static void test_with_dies(void)
     Object *obj = object_new(TYPE_MACHINE);
     MachineState *ms = MACHINE(obj);
     MachineClass *mc = MACHINE_GET_CLASS(obj);
-    SMPTestData *data = &(SMPTestData){{ }};
+    SMPTestData data = {};
     unsigned int num_dies = 2;
     int i;
 
     mc->smp_props.dies_supported = true;
 
     for (i = 0; i < ARRAY_SIZE(data_generic_valid); i++) {
-        *data = data_generic_valid[i];
-        unsupported_params_init(mc, data);
+        data = data_generic_valid[i];
+        unsupported_params_init(mc, &data);
 
         /* when dies parameter is omitted, it will be set as 1 */
-        data->expect_prefer_sockets.dies = 1;
-        data->expect_prefer_cores.dies = 1;
+        data.expect_prefer_sockets.dies = 1;
+        data.expect_prefer_cores.dies = 1;
 
-        smp_parse_test(ms, data, true);
+        smp_parse_test(ms, &data, true);
 
         /* when dies parameter is specified */
-        data->config.has_dies = true;
-        data->config.dies = num_dies;
-        if (data->config.has_cpus) {
-            data->config.cpus *= num_dies;
+        data.config.has_dies = true;
+        data.config.dies = num_dies;
+        if (data.config.has_cpus) {
+            data.config.cpus *= num_dies;
         }
-        if (data->config.has_maxcpus) {
-            data->config.maxcpus *= num_dies;
+        if (data.config.has_maxcpus) {
+            data.config.maxcpus *= num_dies;
         }
 
-        data->expect_prefer_sockets.dies = num_dies;
-        data->expect_prefer_sockets.cpus *= num_dies;
-        data->expect_prefer_sockets.max_cpus *= num_dies;
-        data->expect_prefer_cores.dies = num_dies;
-        data->expect_prefer_cores.cpus *= num_dies;
-        data->expect_prefer_cores.max_cpus *= num_dies;
+        data.expect_prefer_sockets.dies = num_dies;
+        data.expect_prefer_sockets.cpus *= num_dies;
+        data.expect_prefer_sockets.max_cpus *= num_dies;
+        data.expect_prefer_cores.dies = num_dies;
+        data.expect_prefer_cores.cpus *= num_dies;
+        data.expect_prefer_cores.max_cpus *= num_dies;
 
-        smp_parse_test(ms, data, true);
+        smp_parse_test(ms, &data, true);
     }
 
     for (i = 0; i < ARRAY_SIZE(data_with_dies_invalid); i++) {
-        *data = data_with_dies_invalid[i];
-        unsupported_params_init(mc, data);
+        data = data_with_dies_invalid[i];
+        unsupported_params_init(mc, &data);
 
-        smp_parse_test(ms, data, false);
+        smp_parse_test(ms, &data, false);
     }
 
     object_unref(obj);
-- 
2.31.1
Re: [PATCH-for-6.2 v3 4/6] tests/unit/test-smp-parse: Simplify pointer to compound literal use
Posted by wangyanan (Y) 4 years, 1 month ago 
On 2021/11/11 18:03, Philippe Mathieu-Daudé wrote:
> We can simply use a local variable (and pass its pointer) instead
> of a pointer to a compound literal.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
>   tests/unit/test-smp-parse.c | 64 ++++++++++++++++++-------------------
>   1 file changed, 32 insertions(+), 32 deletions(-)
Reviewed-by: Yanan Wang <wangyanan55@huawei.com>
Tested-by: Yanan Wang <wangyanan55@huawei.com>

Thanks,
Yanan
> diff --git a/tests/unit/test-smp-parse.c b/tests/unit/test-smp-parse.c
> index de6d226b455..83a5b8ffdcf 100644
> --- a/tests/unit/test-smp-parse.c
> +++ b/tests/unit/test-smp-parse.c
> @@ -492,19 +492,19 @@ static void test_generic(void)
>       Object *obj = object_new(TYPE_MACHINE);
>       MachineState *ms = MACHINE(obj);
>       MachineClass *mc = MACHINE_GET_CLASS(obj);
> -    SMPTestData *data = &(SMPTestData){{ }};
> +    SMPTestData data = {};
>       int i;
>   
>       for (i = 0; i < ARRAY_SIZE(data_generic_valid); i++) {
> -        *data = data_generic_valid[i];
> -        unsupported_params_init(mc, data);
> +        data = data_generic_valid[i];
> +        unsupported_params_init(mc, &data);
>   
> -        smp_parse_test(ms, data, true);
> +        smp_parse_test(ms, &data, true);
>   
>           /* Unsupported parameters can be provided with their values as 1 */
> -        data->config.has_dies = true;
> -        data->config.dies = 1;
> -        smp_parse_test(ms, data, true);
> +        data.config.has_dies = true;
> +        data.config.dies = 1;
> +        smp_parse_test(ms, &data, true);
>       }
>   
>       /* Force invalid min CPUs and max CPUs */
> @@ -512,10 +512,10 @@ static void test_generic(void)
>       mc->max_cpus = 511;
>   
>       for (i = 0; i < ARRAY_SIZE(data_generic_invalid); i++) {
> -        *data = data_generic_invalid[i];
> -        unsupported_params_init(mc, data);
> +        data = data_generic_invalid[i];
> +        unsupported_params_init(mc, &data);
>   
> -        smp_parse_test(ms, data, false);
> +        smp_parse_test(ms, &data, false);
>       }
>   
>       /* Reset the supported min CPUs and max CPUs */
> @@ -530,47 +530,47 @@ static void test_with_dies(void)
>       Object *obj = object_new(TYPE_MACHINE);
>       MachineState *ms = MACHINE(obj);
>       MachineClass *mc = MACHINE_GET_CLASS(obj);
> -    SMPTestData *data = &(SMPTestData){{ }};
> +    SMPTestData data = {};
>       unsigned int num_dies = 2;
>       int i;
>   
>       mc->smp_props.dies_supported = true;
>   
>       for (i = 0; i < ARRAY_SIZE(data_generic_valid); i++) {
> -        *data = data_generic_valid[i];
> -        unsupported_params_init(mc, data);
> +        data = data_generic_valid[i];
> +        unsupported_params_init(mc, &data);
>   
>           /* when dies parameter is omitted, it will be set as 1 */
> -        data->expect_prefer_sockets.dies = 1;
> -        data->expect_prefer_cores.dies = 1;
> +        data.expect_prefer_sockets.dies = 1;
> +        data.expect_prefer_cores.dies = 1;
>   
> -        smp_parse_test(ms, data, true);
> +        smp_parse_test(ms, &data, true);
>   
>           /* when dies parameter is specified */
> -        data->config.has_dies = true;
> -        data->config.dies = num_dies;
> -        if (data->config.has_cpus) {
> -            data->config.cpus *= num_dies;
> +        data.config.has_dies = true;
> +        data.config.dies = num_dies;
> +        if (data.config.has_cpus) {
> +            data.config.cpus *= num_dies;
>           }
> -        if (data->config.has_maxcpus) {
> -            data->config.maxcpus *= num_dies;
> +        if (data.config.has_maxcpus) {
> +            data.config.maxcpus *= num_dies;
>           }
>   
> -        data->expect_prefer_sockets.dies = num_dies;
> -        data->expect_prefer_sockets.cpus *= num_dies;
> -        data->expect_prefer_sockets.max_cpus *= num_dies;
> -        data->expect_prefer_cores.dies = num_dies;
> -        data->expect_prefer_cores.cpus *= num_dies;
> -        data->expect_prefer_cores.max_cpus *= num_dies;
> +        data.expect_prefer_sockets.dies = num_dies;
> +        data.expect_prefer_sockets.cpus *= num_dies;
> +        data.expect_prefer_sockets.max_cpus *= num_dies;
> +        data.expect_prefer_cores.dies = num_dies;
> +        data.expect_prefer_cores.cpus *= num_dies;
> +        data.expect_prefer_cores.max_cpus *= num_dies;
>   
> -        smp_parse_test(ms, data, true);
> +        smp_parse_test(ms, &data, true);
>       }
>   
>       for (i = 0; i < ARRAY_SIZE(data_with_dies_invalid); i++) {
> -        *data = data_with_dies_invalid[i];
> -        unsupported_params_init(mc, data);
> +        data = data_with_dies_invalid[i];
> +        unsupported_params_init(mc, &data);
>   
> -        smp_parse_test(ms, data, false);
> +        smp_parse_test(ms, &data, false);
>       }
>   
>       object_unref(obj);
Re: [PATCH-for-6.2 v3 4/6] tests/unit/test-smp-parse: Simplify pointer to compound literal use
Posted by Richard Henderson 4 years, 1 month ago 
On 11/11/21 11:03 AM, Philippe Mathieu-Daudé wrote:
> We can simply use a local variable (and pass its pointer) instead
> of a pointer to a compound literal.
> 
> Signed-off-by: Philippe Mathieu-Daudé<philmd@redhat.com>
> ---
>   tests/unit/test-smp-parse.c | 64 ++++++++++++++++++-------------------
>   1 file changed, 32 insertions(+), 32 deletions(-)

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

r~

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.