144 lines
5.1 KiB
Diff
144 lines
5.1 KiB
Diff
From 964965721bbed1941bf77e5a748efc1274b7c289 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@redhat.com>
|
|
Date: Thu, 11 Nov 2021 08:58:40 +0100
|
|
Subject: [PATCH 07/24] tests/unit/test-smp-parse: Simplify pointer to compound
|
|
literal use
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
We can simply use a local variable (and pass its pointer) instead
|
|
of a pointer to a compound literal.
|
|
|
|
Reviewed-by: Andrew Jones <drjones@redhat.com>
|
|
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
|
|
Reviewed-by: Yanan Wang <wangyanan55@huawei.com>
|
|
Tested-by: Yanan Wang <wangyanan55@huawei.com>
|
|
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
Message-Id: <20211216132015.815493-7-philmd@redhat.com>
|
|
---
|
|
tests/unit/test-smp-parse.c | 66 ++++++++++++++++++-------------------
|
|
1 file changed, 33 insertions(+), 33 deletions(-)
|
|
|
|
diff --git a/tests/unit/test-smp-parse.c b/tests/unit/test-smp-parse.c
|
|
index b20bf2c235..395929b66c 100644
|
|
--- a/tests/unit/test-smp-parse.c
|
|
+++ b/tests/unit/test-smp-parse.c
|
|
@@ -520,19 +520,19 @@ static void test_generic_valid(const void *opaque)
|
|
Object *obj = object_new(machine_type);
|
|
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);
|
|
}
|
|
|
|
object_unref(obj);
|
|
@@ -544,14 +544,14 @@ static void test_generic_invalid(const void *opaque)
|
|
Object *obj = object_new(machine_type);
|
|
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_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);
|
|
}
|
|
|
|
object_unref(obj);
|
|
@@ -563,45 +563,45 @@ static void test_with_dies(const void *opaque)
|
|
Object *obj = object_new(machine_type);
|
|
MachineState *ms = MACHINE(obj);
|
|
MachineClass *mc = MACHINE_GET_CLASS(obj);
|
|
- SMPTestData *data = &(SMPTestData){{ }};
|
|
+ SMPTestData data = {};
|
|
unsigned int num_dies = 2;
|
|
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);
|
|
|
|
/* 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.27.0
|
|
|