diff options
| author | Yanan Wang <wangyanan55@huawei.com> | 2021-09-29 10:58:07 +0800 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2021-10-01 15:27:56 +0200 |
| commit | afc8e9aaa7915ebfe1af8eba6994a38b3e556ba9 (patch) | |
| tree | 20d27460343be569647447174efd359bc782137a /tests/qtest | |
| parent | 52082d3ba4e81bf9df23d3cd5ddfb2a620e9b267 (diff) | |
| download | qemu-afc8e9aaa7915ebfe1af8eba6994a38b3e556ba9.zip qemu-afc8e9aaa7915ebfe1af8eba6994a38b3e556ba9.tar.gz qemu-afc8e9aaa7915ebfe1af8eba6994a38b3e556ba9.tar.bz2 | |
qtest/numa-test: Use detailed -smp CLIs in pc_dynamic_cpu_cfg
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".
Signed-off-by: Yanan Wang <wangyanan55@huawei.com>
Reviewed-by: Andrew Jones <drjones@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20210929025816.21076-8-wangyanan55@huawei.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'tests/qtest')
| -rw-r--r-- | tests/qtest/numa-test.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/qtest/numa-test.c b/tests/qtest/numa-test.c index c677cd6..fd7a2e8 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 */ |