| Message ID | 1462192431-146342-24-git-send-email-imammedo@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Mon, May 02, 2016 at 02:33:32PM +0200, Igor Mammedov wrote: > Machine types before 2.7 have legacy CPU hotplug > enabled by defaut to not regress existing setups > where it's always enabled. > > But since 2.7 CPU hotplug is disabled y default > and requires explicit enabling using 'cpu-hotplug' > parameter in '-machine' option. > So turn it on for cpu-hotplug testcase to allow > it test 2.7 and later machine types. > > Fixes following failure: > > /x86_64/cpu/pc-q35-2.7/add/1x3x2&maxcpus=12: ** > ERROR:tests/pc-cpu-test.c:44:test_pc_with_cpu_add: > assertion failed: (!qdict_haskey(response, "error")) Is this test error introduced by a patch in this series? If so, shouldn't this fix be squashed with the patch that disables CPU hotplug by default, so we get a bisectable tree?
diff --git a/tests/pc-cpu-test.c b/tests/pc-cpu-test.c index 6b34ca5..5c9fd1e 100644 --- a/tests/pc-cpu-test.c +++ b/tests/pc-cpu-test.c @@ -31,7 +31,7 @@ static void test_pc_with_cpu_add(gconstpointer data) QDict *response; unsigned int i; - args = g_strdup_printf("-machine %s -cpu %s " + args = g_strdup_printf("-machine %s,cpu-hotplug=on -cpu %s " "-smp sockets=%u,cores=%u,threads=%u,maxcpus=%u", s->machine, s->cpu_model, s->sockets, s->cores, s->threads, s->maxcpus);
Machine types before 2.7 have legacy CPU hotplug enabled by defaut to not regress existing setups where it's always enabled. But since 2.7 CPU hotplug is disabled y default and requires explicit enabling using 'cpu-hotplug' parameter in '-machine' option. So turn it on for cpu-hotplug testcase to allow it test 2.7 and later machine types. Fixes following failure: /x86_64/cpu/pc-q35-2.7/add/1x3x2&maxcpus=12: ** ERROR:tests/pc-cpu-test.c:44:test_pc_with_cpu_add: assertion failed: (!qdict_haskey(response, "error")) Signed-off-by: Igor Mammedov <imammedo@redhat.com> --- tests/pc-cpu-test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)