From: "wangyanan (Y)" <wangyanan55@huawei.com>
To: "Philippe Mathieu-Daudé" <philmd@redhat.com>, qemu-devel@nongnu.org
Cc: Thomas Huth <thuth@redhat.com>, Andrew Jones <drjones@redhat.com>,
Markus Armbruster <armbru@redhat.com>,
Eduardo Habkost <ehabkost@redhat.com>
Subject: Re: [PATCH-for-6.2 v3 4/6] tests/unit/test-smp-parse: Simplify pointer to compound literal use
Date: Fri, 12 Nov 2021 10:46:58 +0800 [thread overview]
Message-ID: <839fc70e-6a0f-f762-fb46-231c5c6fb7c3@huawei.com> (raw)
In-Reply-To: <20211111100351.2153662-5-philmd@redhat.com>
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);
next prev parent reply other threads:[~2021-11-12 2:47 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-11 10:03 [PATCH-for-6.2 v3 0/6] tests/unit: Fix test-smp-parse Philippe Mathieu-Daudé
2021-11-11 10:03 ` [PATCH-for-6.2 v3 1/6] tests/unit/test-smp-parse: Restore MachineClass fields after modifying Philippe Mathieu-Daudé
2021-11-11 14:16 ` Richard Henderson
2021-11-12 2:04 ` wangyanan (Y)
2021-11-15 10:24 ` Philippe Mathieu-Daudé
2021-11-16 11:06 ` wangyanan (Y)
2021-11-11 10:03 ` [PATCH-for-6.2 v3 2/6] tests/unit/test-smp-parse: QOM'ify smp_machine_class_init() Philippe Mathieu-Daudé
2021-11-11 14:18 ` Richard Henderson
2021-11-12 2:05 ` wangyanan (Y)
2021-11-11 10:03 ` [PATCH-for-6.2 v3 3/6] tests/unit/test-smp-parse: Explicit MachineClass name Philippe Mathieu-Daudé
2021-11-11 12:56 ` Andrew Jones
2021-11-11 14:18 ` Richard Henderson
2021-11-12 2:28 ` wangyanan (Y)
2021-11-15 10:16 ` Philippe Mathieu-Daudé
2021-11-16 11:15 ` wangyanan (Y)
2021-11-11 10:03 ` [PATCH-for-6.2 v3 4/6] tests/unit/test-smp-parse: Simplify pointer to compound literal use Philippe Mathieu-Daudé
2021-11-11 14:19 ` Richard Henderson
2021-11-12 2:46 ` wangyanan (Y) [this message]
2021-11-11 10:03 ` [PATCH-for-6.2 v3 5/6] tests/unit/test-smp-parse: Constify some pointer/struct Philippe Mathieu-Daudé
2021-11-11 14:20 ` Richard Henderson
2021-11-12 3:12 ` wangyanan (Y)
2021-11-11 10:03 ` [PATCH-for-6.2 v3 6/6] hw/core: Rename smp_parse() -> machine_parse_smp_config() Philippe Mathieu-Daudé
2021-11-11 14:20 ` Richard Henderson
2021-11-12 3:22 ` wangyanan (Y)
2021-11-11 12:57 ` [PATCH-for-6.2 v3 0/6] tests/unit: Fix test-smp-parse Andrew Jones
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=839fc70e-6a0f-f762-fb46-231c5c6fb7c3@huawei.com \
--to=wangyanan55@huawei.com \
--cc=armbru@redhat.com \
--cc=drjones@redhat.com \
--cc=ehabkost@redhat.com \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).