[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-stable] [PATCH v2 8/8] qtest: Add boot order test
From: |
Markus Armbruster |
Subject: |
[Qemu-stable] [PATCH v2 8/8] qtest: Add boot order test |
Date: |
Fri, 22 Feb 2013 18:20:01 +0100 |
Covers only PC so far.
Signed-off-by: Markus Armbruster <address@hidden>
---
tests/Makefile | 2 ++
tests/boot-order-test.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 73 insertions(+)
create mode 100644 tests/boot-order-test.c
diff --git a/tests/Makefile b/tests/Makefile
index 567e36e..1305642 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -65,6 +65,7 @@ check-qtest-i386-y = tests/fdc-test$(EXESUF)
gcov-files-i386-y = hw/fdc.c
check-qtest-i386-y += tests/hd-geo-test$(EXESUF)
gcov-files-i386-y += hw/hd-geometry.c
+check-qtest-i386-y += tests/boot-order-test$(EXESUF)
check-qtest-i386-y += tests/rtc-test$(EXESUF)
check-qtest-x86_64-y = $(check-qtest-i386-y)
gcov-files-i386-y += i386-softmmu/hw/mc146818rtc.c
@@ -132,6 +133,7 @@ tests/rtc-test$(EXESUF): tests/rtc-test.o
tests/m48t59-test$(EXESUF): tests/m48t59-test.o
tests/fdc-test$(EXESUF): tests/fdc-test.o
tests/hd-geo-test$(EXESUF): tests/hd-geo-test.o
+tests/boot-order-test$(EXESUF): tests/boot-order-test.o
tests/tmp105-test$(EXESUF): tests/tmp105-test.o
# QTest rules
diff --git a/tests/boot-order-test.c b/tests/boot-order-test.c
new file mode 100644
index 0000000..60412ad
--- /dev/null
+++ b/tests/boot-order-test.c
@@ -0,0 +1,71 @@
+/*
+ * Boot order test cases.
+ *
+ * Copyright (c) 2013 Red Hat Inc.
+ *
+ * Authors:
+ * Markus Armbruster <address@hidden>,
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ */
+
+/*
+ * Covers only PC. Better than nothing. Improvements welcome.
+ */
+
+#include <glib.h>
+#include "libqtest.h"
+
+static void test_cmos_byte(int reg, int expected)
+{
+ int actual;
+
+ outb(0x70 + 0, reg);
+ actual = inb(0x71);
+ g_assert_cmphex(actual, ==, expected);
+}
+
+static void test_cmos(uint8_t boot1, uint8_t boot2)
+{
+ test_cmos_byte(0x38, boot1);
+ test_cmos_byte(0x3d, boot2);
+}
+
+static void test_pc_with_args(const char *args, uint8_t boot1, uint8_t boot2,
+ uint8_t reboot1, uint8_t reboot2)
+{
+ char *extra_args = g_strdup_printf("-nodefaults -display none -S %s",
+ args);
+ qtest_start(extra_args);
+ test_cmos(boot1, boot2);
+ qtest_qmp(global_qtest, "{ 'execute': 'system_reset' }");
+ test_cmos(reboot1, reboot2);
+ qtest_quit(global_qtest);
+ g_free(extra_args);
+}
+
+static void test_pc_boot_order(void)
+{
+ test_pc_with_args("", 0x30, 0x12, 0x30, 0x12);
+ test_pc_with_args("-no-fd-bootchk", 0x31, 0x12, 0x31, 0x12);
+ test_pc_with_args("-boot c", 0, 0x02, 0, 0x02);
+ test_pc_with_args("-boot nda", 0x10, 0x34, 0x10, 0x34);
+ test_pc_with_args("-boot order=", 0, 0, 0, 0);
+ test_pc_with_args("-boot order= -boot order=c", 0, 0x02, 0, 0x02);
+ test_pc_with_args("-boot once=a", 0, 0x01, 0x30, 0x12);
+ test_pc_with_args("-boot once=a -no-fd-bootchk", 0x01, 0x01, 0x31, 0x12);
+ test_pc_with_args("-boot once=a,order=c", 0, 0x01, 0, 0x02);
+ test_pc_with_args("-boot once=d -boot order=nda", 0, 0x03, 0x10, 0x34);
+ test_pc_with_args("-boot once=a -boot once=b -boot once=c",
+ 0, 0x02, 0x30, 0x12);
+}
+
+int main(int argc, char *argv[])
+{
+ g_test_init(&argc, &argv, NULL);
+
+ qtest_add_func("boot-order/pc", test_pc_boot_order);
+
+ return g_test_run();
+}
--
1.7.11.7
- [Qemu-stable] [PATCH v2 0/8] -boot and -no-fd-bootchk fixes, Markus Armbruster, 2013/02/22
- [Qemu-stable] [PATCH v2 2/8] qemu-option: check_params() is now unused, drop it, Markus Armbruster, 2013/02/22
- [Qemu-stable] [PATCH v2 3/8] vl: Fix -boot order and once regressions, and related bugs, Markus Armbruster, 2013/02/22
- [Qemu-stable] [PATCH v2 1/8] vl: Clean up parsing of -boot option argument, Markus Armbruster, 2013/02/22
- [Qemu-stable] [PATCH v2 4/8] vl: Rename *boot_devices to *boot_order, for consistency, Markus Armbruster, 2013/02/22
- [Qemu-stable] [PATCH v2 5/8] pc: Make -no-fd-bootchk stick across boot order changes, Markus Armbruster, 2013/02/22
- [Qemu-stable] [PATCH v2 6/8] pc: Drop ref to Bochs from -no-fd-bootchk documentation, Markus Armbruster, 2013/02/22
- [Qemu-stable] [PATCH v2 7/8] qtest: Don't reset on qtest chardev connect, Markus Armbruster, 2013/02/22
- [Qemu-stable] [PATCH v2 8/8] qtest: Add boot order test,
Markus Armbruster <=