OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

tests/unit/test-smp-parse: Simplify pointer to compound literal use

Browse Source 
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>
This commit is contained in:
Philippe Mathieu-Daudé 2021-11-11 08:58:40 +01:00
parent 2dc426c468
commit 47ab8a491a
1 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
tests/unit/test-smp-parse.c
View File

@ -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);