| Message ID | 20210910073025.16480-7-wangyanan55@huawei.com |
|---|---|
| State | New |
| Headers | show |
| Series | machine: smp parsing fixes and improvement | expand |
On Fri, Sep 10, 2021 at 03:30:15PM +0800, Yanan Wang wrote: > Since commit 80d7835749 (qemu-options: rewrite help for -smp options), > the preference of sockets/cores in -smp parsing is considered liable > to change, and actually we are going to change it in a coming commit. > So it'll be more stable to use detailed -smp CLIs in testing if we > have strong dependency on the parsing results. > > pc_dynamic_cpu_cfg currently assumes/needs that there will be 2 CPU > sockets with "-smp 2". To avoid breaking the test because of parsing > logic change, now explicitly use "-smp 2,sockets=2". > > Cc: Thomas Huth <thuth@redhat.com> > Cc: Laurent Vivier <lvivier@redhat.com> > Cc: Paolo Bonzini <pbonzini@redhat.com> > Cc: Igor Mammedov <imammedo@redhat.com> > Signed-off-by: Yanan Wang <wangyanan55@huawei.com> > --- > tests/qtest/numa-test.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/tests/qtest/numa-test.c b/tests/qtest/numa-test.c > index c677cd63c4..fd7a2e80a0 100644 > --- a/tests/qtest/numa-test.c > +++ b/tests/qtest/numa-test.c > @@ -265,7 +265,8 @@ static void pc_dynamic_cpu_cfg(const void *data) > QTestState *qs; > g_autofree char *cli = NULL; > > - cli = make_cli(data, "-nodefaults --preconfig -machine smp.cpus=2"); > + cli = make_cli(data, "-nodefaults --preconfig " > + "-machine smp.cpus=2,smp.sockets=2"); > qs = qtest_init(cli); > > /* create 2 numa nodes */ > -- > 2.23.0 > Reviewed-by: Andrew Jones <drjones@redhat.com>
diff --git a/tests/qtest/numa-test.c b/tests/qtest/numa-test.c index c677cd63c4..fd7a2e80a0 100644 --- a/tests/qtest/numa-test.c +++ b/tests/qtest/numa-test.c @@ -265,7 +265,8 @@ static void pc_dynamic_cpu_cfg(const void *data) QTestState *qs; g_autofree char *cli = NULL; - cli = make_cli(data, "-nodefaults --preconfig -machine smp.cpus=2"); + cli = make_cli(data, "-nodefaults --preconfig " + "-machine smp.cpus=2,smp.sockets=2"); qs = qtest_init(cli); /* create 2 numa nodes */
Since commit 80d7835749 (qemu-options: rewrite help for -smp options), the preference of sockets/cores in -smp parsing is considered liable to change, and actually we are going to change it in a coming commit. So it'll be more stable to use detailed -smp CLIs in testing if we have strong dependency on the parsing results. pc_dynamic_cpu_cfg currently assumes/needs that there will be 2 CPU sockets with "-smp 2". To avoid breaking the test because of parsing logic change, now explicitly use "-smp 2,sockets=2". Cc: Thomas Huth <thuth@redhat.com> Cc: Laurent Vivier <lvivier@redhat.com> Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: Igor Mammedov <imammedo@redhat.com> Signed-off-by: Yanan Wang <wangyanan55@huawei.com> --- tests/qtest/numa-test.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)