[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 10/20] tests/unit/test-smp-parse: Simplify pointer to compound lit
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 10/20] tests/unit/test-smp-parse: Simplify pointer to compound literal use |
Date: |
Fri, 31 Dec 2021 13:47:44 +0100 |
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 b20bf2c2359..395929b66cf 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.33.1
- [PULL 00/20] Machine-next patches for 2021-12-31, Philippe Mathieu-Daudé, 2021/12/31
- [PULL 01/20] hw/qdev: Cosmetic around documentation, Philippe Mathieu-Daudé, 2021/12/31
- [PULL 02/20] hw/qdev: Correct qdev_init_gpio_out_named() documentation, Philippe Mathieu-Daudé, 2021/12/31
- [PULL 03/20] hw/qdev: Correct qdev_connect_gpio_out_named() documentation, Philippe Mathieu-Daudé, 2021/12/31
- [PULL 04/20] hw/qdev: Rename qdev_connect_gpio_out*() 'input_pin' parameter, Philippe Mathieu-Daudé, 2021/12/31
- [PULL 05/20] tests/unit/test-smp-parse: Pass machine type as argument to tests, Philippe Mathieu-Daudé, 2021/12/31
- [PULL 06/20] tests/unit/test-smp-parse: Split the 'generic' test in valid / invalid, Philippe Mathieu-Daudé, 2021/12/31
- [PULL 07/20] tests/unit/test-smp-parse: Add 'smp-with-dies' machine type, Philippe Mathieu-Daudé, 2021/12/31
- [PULL 08/20] tests/unit/test-smp-parse: Add 'smp-generic-invalid' machine type, Philippe Mathieu-Daudé, 2021/12/31
- [PULL 09/20] tests/unit/test-smp-parse: Add 'smp-generic-valid' machine type, Philippe Mathieu-Daudé, 2021/12/31
- [PULL 10/20] tests/unit/test-smp-parse: Simplify pointer to compound literal use,
Philippe Mathieu-Daudé <=
- [PULL 11/20] tests/unit/test-smp-parse: Constify some pointer/struct, Philippe Mathieu-Daudé, 2021/12/31
- [PULL 12/20] hw/core: Rename smp_parse() -> machine_parse_smp_config(), Philippe Mathieu-Daudé, 2021/12/31
- [PULL 14/20] hw/core/machine: Introduce CPU cluster topology support, Philippe Mathieu-Daudé, 2021/12/31
- [PULL 13/20] qemu-options: Improve readability of SMP related Docs, Philippe Mathieu-Daudé, 2021/12/31
- [PULL 15/20] tests/unit/test-smp-parse: Add testcases for CPU clusters, Philippe Mathieu-Daudé, 2021/12/31
- [PULL 16/20] tests/unit/test-smp-parse: No need to explicitly zero MachineClass members, Philippe Mathieu-Daudé, 2021/12/31
- [PULL 17/20] tests/unit/test-smp-parse: Keep default MIN/MAX CPUs in machine_base_class_init, Philippe Mathieu-Daudé, 2021/12/31
- [PULL 18/20] MAINTAINERS: Self-recommended as reviewer of "Machine core", Philippe Mathieu-Daudé, 2021/12/31
- [PULL 19/20] MAINTAINERS: Change philmd's email address, Philippe Mathieu-Daudé, 2021/12/31
- [PULL 20/20] MAINTAINERS: email address change, Philippe Mathieu-Daudé, 2021/12/31