mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests/qtest/display-vga-test: Add proper checks if a device is available

Browse Source 
display-vga-test currently tries to guess the usable VGA devices
according to the target architecture that is used for the test.
This of course does not work if QEMU has been built with the
"--without-default-devices" configure switch. To fix this, use the
qtest_has_device() function for the decision instead. This way
we can also consolidate most of the test functions into one single
function (that takes a parameter with the device name now), except
for the multihead test that tries to instantiate two devices and
thus is a little bit different.

Message-Id: <20230130104446.1286773-4-thuth@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
(cherry picked from commit f2e57851b8)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
This commit is contained in:
Thomas Huth 2023-01-30 11:44:43 +01:00 committed by Michael Tokarev
parent 73bf928177
commit b0ed25ee07
1 changed files with 25 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
tests/qtest/display-vga-test.c
View File

@ -8,61 +8,46 @@
*/
#include "qemu/osdep.h"
#include "libqtest-single.h"
static void pci_cirrus(void)
{
qtest_start("-vga none -device cirrus-vga");
qtest_end();
}
static void pci_stdvga(void)
{
qtest_start("-vga none -device VGA");
qtest_end();
}
static void pci_secondary(void)
{
qtest_start("-vga none -device secondary-vga");
qtest_end();
}
#include "libqtest.h"
static void pci_multihead(void)
{
qtest_start("-vga none -device VGA -device secondary-vga");
qtest_end();
QTestState *qts;
qts = qtest_init("-vga none -device VGA -device secondary-vga");
qtest_quit(qts);
}
static void pci_virtio_gpu(void)
static void test_vga(gconstpointer data)
{
qtest_start("-vga none -device virtio-gpu-pci");
qtest_end();
}
QTestState *qts;
static void pci_virtio_vga(void)
{
qtest_start("-vga none -device virtio-vga");
qtest_end();
qts = qtest_initf("-vga none -device %s", (const char *)data);
qtest_quit(qts);
}
int main(int argc, char **argv)
{
const char *arch = qtest_get_arch();
static const char *devices[] = {
"cirrus-vga",
"VGA",
"secondary-vga",
"virtio-gpu-pci",
"virtio-vga"
};
g_test_init(&argc, &argv, NULL);
if (strcmp(arch, "alpha") == 0 || strcmp(arch, "i386") == 0 ||
strcmp(arch, "mips") == 0 || strcmp(arch, "x86_64") == 0) {
qtest_add_func("/display/pci/cirrus", pci_cirrus);
for (int i = 0; i < ARRAY_SIZE(devices); i++) {
if (qtest_has_device(devices[i])) {
char *testpath = g_strdup_printf("/display/pci/%s", devices[i]);
qtest_add_data_func(testpath, devices[i], test_vga);
g_free(testpath);
}
}
qtest_add_func("/display/pci/stdvga", pci_stdvga);
qtest_add_func("/display/pci/secondary", pci_secondary);
qtest_add_func("/display/pci/multihead", pci_multihead);
qtest_add_func("/display/pci/virtio-gpu", pci_virtio_gpu);
if (g_str_equal(arch, "i386") || g_str_equal(arch, "x86_64") ||
g_str_equal(arch, "hppa") || g_str_equal(arch, "ppc64")) {
qtest_add_func("/display/pci/virtio-vga", pci_virtio_vga);
if (qtest_has_device("secondary-vga")) {
qtest_add_func("/display/pci/multihead", pci_multihead);
}
return g_test_run();