diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/boot-order-test.c | 2 | ||||
| -rw-r--r-- | tests/endianness-test.c | 6 | ||||
| -rw-r--r-- | tests/fw_cfg-test.c | 3 | ||||
| -rw-r--r-- | tests/hd-geo-test.c | 2 | ||||
| -rw-r--r-- | tests/i440fx-test.c | 2 | ||||
| -rw-r--r-- | tests/libqtest.c | 1 | ||||
| -rw-r--r-- | tests/m48t59-test.c | 2 | ||||
| -rw-r--r-- | tests/qom-test.c | 2 | ||||
| -rw-r--r-- | tests/rtc-test.c | 2 | ||||
| -rw-r--r-- | tests/tmp105-test.c | 2 |
10 files changed, 12 insertions, 12 deletions
diff --git a/tests/boot-order-test.c b/tests/boot-order-test.c index da158c32bd..360a6911eb 100644 --- a/tests/boot-order-test.c +++ b/tests/boot-order-test.c @@ -34,7 +34,7 @@ static void test_a_boot_order(const char *machine, char *args; uint64_t actual; - args = g_strdup_printf("-nodefaults -display none%s%s %s", + args = g_strdup_printf("-nodefaults%s%s %s", machine ? " -M " : "", machine ?: "", test_args); diff --git a/tests/endianness-test.c b/tests/endianness-test.c index 8719c0999c..646df7d8da 100644 --- a/tests/endianness-test.c +++ b/tests/endianness-test.c @@ -121,7 +121,7 @@ static void test_endianness(gconstpointer data) const TestCase *test = data; char *args; - args = g_strdup_printf("-display none -M %s%s%s -device pc-testdev", + args = g_strdup_printf("-M %s%s%s -device pc-testdev", test->machine, test->superio ? " -device " : "", test->superio ?: ""); @@ -196,7 +196,7 @@ static void test_endianness_split(gconstpointer data) const TestCase *test = data; char *args; - args = g_strdup_printf("-display none -M %s%s%s -device pc-testdev", + args = g_strdup_printf("-M %s%s%s -device pc-testdev", test->machine, test->superio ? " -device " : "", test->superio ?: ""); @@ -243,7 +243,7 @@ static void test_endianness_combine(gconstpointer data) const TestCase *test = data; char *args; - args = g_strdup_printf("-display none -M %s%s%s -device pc-testdev", + args = g_strdup_printf("-M %s%s%s -device pc-testdev", test->machine, test->superio ? " -device " : "", test->superio ?: ""); diff --git a/tests/fw_cfg-test.c b/tests/fw_cfg-test.c index b86e49ab09..e4f355ce3f 100644 --- a/tests/fw_cfg-test.c +++ b/tests/fw_cfg-test.c @@ -126,8 +126,7 @@ int main(int argc, char **argv) g_test_add_func("/fw_cfg/numa", test_fw_cfg_numa); g_test_add_func("/fw_cfg/boot_menu", test_fw_cfg_boot_menu); - cmdline = g_strdup_printf("-display none " - "-uuid 4600cb32-38ec-4b2f-8acb-81c6ea54f2d8 "); + cmdline = g_strdup_printf("-uuid 4600cb32-38ec-4b2f-8acb-81c6ea54f2d8 "); s = qtest_start(cmdline); g_free(cmdline); diff --git a/tests/hd-geo-test.c b/tests/hd-geo-test.c index b72042e59d..c84d1e75e0 100644 --- a/tests/hd-geo-test.c +++ b/tests/hd-geo-test.c @@ -171,7 +171,7 @@ static int setup_common(char *argv[], int argv_sz) { memset(cur_ide, 0, sizeof(cur_ide)); return append_arg(0, argv, argv_sz, - g_strdup("-nodefaults -display none")); + g_strdup("-nodefaults")); } static void setup_mbr(int img_idx, MBRcontents mbr) diff --git a/tests/i440fx-test.c b/tests/i440fx-test.c index 08ce820ebd..65c786ca1e 100644 --- a/tests/i440fx-test.c +++ b/tests/i440fx-test.c @@ -265,7 +265,7 @@ int main(int argc, char **argv) data.num_cpus = 1; - cmdline = g_strdup_printf("-display none -smp %d", data.num_cpus); + cmdline = g_strdup_printf("-smp %d", data.num_cpus); s = qtest_start(cmdline); g_free(cmdline); diff --git a/tests/libqtest.c b/tests/libqtest.c index 83424c3c6b..359d571a06 100644 --- a/tests/libqtest.c +++ b/tests/libqtest.c @@ -135,6 +135,7 @@ QTestState *qtest_init(const char *extra_args) "-qmp unix:%s,nowait " "-pidfile %s " "-machine accel=qtest " + "-display none " "%s", qemu_binary, s->socket_path, s->qmp_socket_path, pid_file, extra_args ?: ""); diff --git a/tests/m48t59-test.c b/tests/m48t59-test.c index 4081a5fdb2..6abc4c8bf0 100644 --- a/tests/m48t59-test.c +++ b/tests/m48t59-test.c @@ -249,7 +249,7 @@ int main(int argc, char **argv) g_test_init(&argc, &argv, NULL); - s = qtest_start("-display none -rtc clock=vm"); + s = qtest_start("-rtc clock=vm"); qtest_add_func("/rtc/bcd/check-time", bcd_check_time); qtest_add_func("/rtc/fuzz-registers", fuzz_registers); diff --git a/tests/qom-test.c b/tests/qom-test.c index 6ed23c5e54..499be40261 100644 --- a/tests/qom-test.c +++ b/tests/qom-test.c @@ -18,7 +18,7 @@ static void test_nop(gconstpointer data) const char *machine = data; char *args; - args = g_strdup_printf("-display none -machine %s", machine); + args = g_strdup_printf("-machine %s", machine); s = qtest_start(args); if (s) { qtest_quit(s); diff --git a/tests/rtc-test.c b/tests/rtc-test.c index 3395d7f50b..f1b123fae1 100644 --- a/tests/rtc-test.c +++ b/tests/rtc-test.c @@ -552,7 +552,7 @@ int main(int argc, char **argv) g_test_init(&argc, &argv, NULL); - s = qtest_start("-display none -rtc clock=vm"); + s = qtest_start("-rtc clock=vm"); qtest_irq_intercept_in(s, "ioapic"); qtest_add_func("/rtc/check-time/bcd", bcd_check_time); diff --git a/tests/tmp105-test.c b/tests/tmp105-test.c index fecd6dcd70..5ac48e2f5c 100644 --- a/tests/tmp105-test.c +++ b/tests/tmp105-test.c @@ -59,7 +59,7 @@ int main(int argc, char **argv) g_test_init(&argc, &argv, NULL); - s = qtest_start("-display none -machine n800"); + s = qtest_start("-machine n800"); i2c = omap_i2c_create(OMAP2_I2C_1_BASE); addr = N8X0_ADDR; |