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

[wangyanan (Y)]

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é <phi...@redhat.com>
---
  tests/unit/test-smp-parse.c | 64 ++++++++++++++++++-------------------
  1 file changed, 32 insertions(+), 32 deletions(-)

Reviewed-by: Yanan Wang <wangyana...@huawei.com>
Tested-by: Yanan Wang <wangyana...@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);