ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tests: cpu-plug-test: fix device_add for pc/q35 machines 

Commit bc1fb850a3 silently broke device_add test for CPU hotplug which
resulted in test successfully passing though it wasn't actually run.
Fix it by making sure that all non present CPUs reported
by "query-hotpluggable-cpus" are hotplugged instead of making up
and hardcoding values.

Use of query-hotpluggable-cpus also allows consolidatiate device_add
cpu testcases and reuse the same test function for all targets.

While at it also add a check that at least one CPU was hotplugged,
to avoid silent breakage in the future.

Fixes: bc1fb850a3 (vl.c deprecate incorrect CPUs topology)
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Message-Id: <20190830110723.15096-3-imammedo@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Igor Mammedov 2019-08-30 07:07:23 -04:00 committed by Eduardo Habkost
parent b4510bb410
commit 021a007efc
1 changed files with 29 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
tests/cpu-plug-test.c
View File

@ -12,6 +12,7 @@
#include "qemu-common.h" #include "qemu-common.h"
#include "libqtest-single.h" #include "libqtest-single.h"
#include "qapi/qmp/qdict.h" #include "qapi/qmp/qdict.h"
#include "qapi/qmp/qlist.h"
struct PlugTestData { struct PlugTestData {
char *machine; char *machine;
@ -72,12 +73,15 @@ static void test_plug_without_cpu_add(gconstpointer data)
g_free(args); g_free(args);
} }
static void test_plug_with_device_add_x86(gconstpointer data) static void test_plug_with_device_add(gconstpointer data)
{ {
const PlugTestData *td = data; const PlugTestData *td = data;
char *args; char *args;
unsigned int s, c, t;
QTestState *qts; QTestState *qts;
QDict *resp;
QList *cpus;
QObject *e;
int hotplugged = 0;
args = g_strdup_printf("-machine %s -cpu %s " args = g_strdup_printf("-machine %s -cpu %s "
"-smp 1,sockets=%u,cores=%u,threads=%u,maxcpus=%u", "-smp 1,sockets=%u,cores=%u,threads=%u,maxcpus=%u",
@ -85,43 +89,29 @@ static void test_plug_with_device_add_x86(gconstpointer data)
td->sockets, td->cores, td->threads, td->maxcpus); td->sockets, td->cores, td->threads, td->maxcpus);
qts = qtest_init(args); qts = qtest_init(args);
for (s = 1; s < td->sockets; s++) { resp = qtest_qmp(qts, "{ 'execute': 'query-hotpluggable-cpus'}");
for (c = 0; c < td->cores; c++) { g_assert(qdict_haskey(resp, "return"));
for (t = 0; t < td->threads; t++) { cpus = qdict_get_qlist(resp, "return");
char *id = g_strdup_printf("id-%i-%i-%i", s, c, t); g_assert(cpus);
qtest_qmp_device_add(qts, td->device_model, id,
"{'socket-id':%u, 'core-id':%u," while ((e = qlist_pop(cpus))) {
" 'thread-id':%u}", const QDict *cpu, *props;
s, c, t);
g_free(id); cpu = qobject_to(QDict, e);
} if (qdict_haskey(cpu, "qom-path")) {
continue;
} }
g_assert(qdict_haskey(cpu, "props"));
props = qdict_get_qdict(cpu, "props");
qtest_qmp_device_add_qdict(qts, td->device_model, props);
hotplugged++;
} }
qtest_quit(qts); /* make sure that there were hotplugged CPUs */
g_free(args); g_assert(hotplugged);
} qobject_unref(resp);
static void test_plug_with_device_add_coreid(gconstpointer data)
{
const PlugTestData *td = data;
char *args;
unsigned int c;
QTestState *qts;
args = g_strdup_printf("-machine %s -cpu %s "
"-smp 1,sockets=%u,cores=%u,threads=%u,maxcpus=%u",
td->machine, td->cpu_model,
td->sockets, td->cores, td->threads, td->maxcpus);
qts = qtest_init(args);
for (c = 1; c < td->cores; c++) {
char *id = g_strdup_printf("id-%i", c);
qtest_qmp_device_add(qts, td->device_model, id,
"{'core-id':%u}", c);
g_free(id);
}
qtest_quit(qts); qtest_quit(qts);
g_free(args); g_free(args);
} }
@ -182,7 +172,7 @@ static void add_pc_test_case(const char *mname)
path = g_strdup_printf("cpu-plug/%s/device-add/%ux%ux%u&maxcpus=%u", path = g_strdup_printf("cpu-plug/%s/device-add/%ux%ux%u&maxcpus=%u",
mname, data2->sockets, data2->cores, mname, data2->sockets, data2->cores,
data2->threads, data2->maxcpus); data2->threads, data2->maxcpus);
qtest_add_data_func_full(path, data2, test_plug_with_device_add_x86, qtest_add_data_func_full(path, data2, test_plug_with_device_add,
test_data_free); test_data_free);
g_free(path); g_free(path);
} }
@ -209,7 +199,7 @@ static void add_pseries_test_case(const char *mname)
path = g_strdup_printf("cpu-plug/%s/device-add/%ux%ux%u&maxcpus=%u", path = g_strdup_printf("cpu-plug/%s/device-add/%ux%ux%u&maxcpus=%u",
mname, data->sockets, data->cores, mname, data->sockets, data->cores,
data->threads, data->maxcpus); data->threads, data->maxcpus);
qtest_add_data_func_full(path, data, test_plug_with_device_add_coreid, qtest_add_data_func_full(path, data, test_plug_with_device_add,
test_data_free); test_data_free);
g_free(path); g_free(path);
} }
@ -246,7 +236,7 @@ static void add_s390x_test_case(const char *mname)
path = g_strdup_printf("cpu-plug/%s/device-add/%ux%ux%u&maxcpus=%u", path = g_strdup_printf("cpu-plug/%s/device-add/%ux%ux%u&maxcpus=%u",
mname, data2->sockets, data2->cores, mname, data2->sockets, data2->cores,
data2->threads, data2->maxcpus); data2->threads, data2->maxcpus);
qtest_add_data_func_full(path, data2, test_plug_with_device_add_coreid, qtest_add_data_func_full(path, data2, test_plug_with_device_add,
test_data_free); test_data_free);
g_free(path); g_free(path);
} }