tests/qtest: Unify the test for the xenfv and xenpv machines

We have the same check in three places. Let's unify it in a central
place instead.

Message-Id: <20200622104339.21000-1-thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Thomas Huth 2020-06-17 16:52:04 +02:00
parent dda2f556c3
commit 51b3ca9759
4 changed files with 4 additions and 15 deletions

View File

@ -287,11 +287,6 @@ static void add_machine_test_case(const char *mname)
{
char *path, *args;
/* Ignore blacklisted machines */
if (!memcmp("xenfv", mname, 5) || g_str_equal("xenpv", mname)) {
return;
}
path = g_strdup_printf("device/introspect/concrete/defaults/%s", mname);
args = g_strdup_printf("-M %s", mname);
qtest_add_data_func(path, args, test_device_intro_concrete);

View File

@ -1232,6 +1232,10 @@ void qtest_cb_for_every_machine(void (*cb)(const char *machine),
qstr = qobject_to(QString, qobj);
g_assert(qstr);
mname = qstring_get_str(qstr);
/* Ignore machines that cannot be used for qtests */
if (!memcmp("xenfv", mname, 5) || g_str_equal("xenpv", mname)) {
continue;
}
if (!skip_old_versioned || !qtest_is_old_versioned_machine(mname)) {
cb(mname);
}

View File

@ -81,11 +81,6 @@ static void add_machine_test_case(const char *mname)
{
char *path;
/* Ignore blacklisted machines that have known problems */
if (!memcmp("xenfv", mname, 5) || g_str_equal("xenpv", mname)) {
return;
}
path = g_strdup_printf("qom/%s", mname);
qtest_add_data_func(path, g_strdup(mname), test_machine);
g_free(path);

View File

@ -143,11 +143,6 @@ static void add_machine_test_case(const char *mname)
{
char *path;
/* Ignore blacklisted machines that have known problems */
if (!memcmp("xenfv", mname, 5) || g_str_equal("xenpv", mname)) {
return;
}
path = g_strdup_printf("hmp/%s", mname);
qtest_add_data_func(path, g_strdup(mname), test_machine);
g_free(path);