|
 |
9ae3a8 |
From 99dd65105a5f7048d231e311b55995ef41f37278 Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
Message-Id: <99dd65105a5f7048d231e311b55995ef41f37278.1383564115.git.minovotn@redhat.com>
|
|
|
9ae3a8 |
In-Reply-To: <5575e0aec51f40ebec46e98ec085cda053283aba.1383564115.git.minovotn@redhat.com>
|
|
|
9ae3a8 |
References: <5575e0aec51f40ebec46e98ec085cda053283aba.1383564115.git.minovotn@redhat.com>
|
|
|
9ae3a8 |
From: Markus Armbruster <armbru@redhat.com>
|
|
|
9ae3a8 |
Date: Fri, 27 Sep 2013 13:31:20 +0200
|
|
|
9ae3a8 |
Subject: [PATCH 10/14] boot-order-test: New; covering just PC for now
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
RH-Author: Markus Armbruster <armbru@redhat.com>
|
|
|
9ae3a8 |
Message-id: <1380288680-26645-11-git-send-email-armbru@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 54563
|
|
|
9ae3a8 |
O-Subject: [PATCH 7.0 qemu-kvm 10/10] boot-order-test: New; covering just PC for now
|
|
|
9ae3a8 |
Bugzilla: 997817
|
|
|
9ae3a8 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Luiz Capitulino <lcapitulino@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
From: Markus Armbruster <armbru@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Markus Armbruster <armbru@redhat.com>
|
|
|
9ae3a8 |
Message-id: 1372254743-15808-3-git-send-email-armbru@redhat.com
|
|
|
9ae3a8 |
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
|
|
|
9ae3a8 |
(cherry picked from commit edbd790d20cf19d039dfe431aaf0973a9e0afa8f)
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
tests/Makefile | 2 ++
|
|
|
9ae3a8 |
tests/boot-order-test.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++++
|
|
|
9ae3a8 |
2 files changed, 75 insertions(+)
|
|
|
9ae3a8 |
create mode 100644 tests/boot-order-test.c
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Michal Novotny <minovotn@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
tests/Makefile | 2 ++
|
|
|
9ae3a8 |
tests/boot-order-test.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++++
|
|
|
9ae3a8 |
2 files changed, 75 insertions(+)
|
|
|
9ae3a8 |
create mode 100644 tests/boot-order-test.c
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/tests/Makefile b/tests/Makefile
|
|
|
9ae3a8 |
index c107489..394e029 100644
|
|
|
9ae3a8 |
--- a/tests/Makefile
|
|
|
9ae3a8 |
+++ b/tests/Makefile
|
|
|
9ae3a8 |
@@ -54,6 +54,7 @@ gcov-files-i386-y = hw/fdc.c
|
|
|
9ae3a8 |
check-qtest-i386-y += tests/ide-test$(EXESUF)
|
|
|
9ae3a8 |
check-qtest-i386-y += tests/hd-geo-test$(EXESUF)
|
|
|
9ae3a8 |
gcov-files-i386-y += hw/hd-geometry.c
|
|
|
9ae3a8 |
+check-qtest-i386-y += tests/boot-order-test$(EXESUF)
|
|
|
9ae3a8 |
check-qtest-i386-y += tests/rtc-test$(EXESUF)
|
|
|
9ae3a8 |
check-qtest-i386-y += tests/i440fx-test$(EXESUF)
|
|
|
9ae3a8 |
check-qtest-i386-y += tests/fw_cfg-test$(EXESUF)
|
|
|
9ae3a8 |
@@ -130,6 +131,7 @@ tests/m48t59-test$(EXESUF): tests/m48t59-test.o
|
|
|
9ae3a8 |
tests/fdc-test$(EXESUF): tests/fdc-test.o
|
|
|
9ae3a8 |
tests/ide-test$(EXESUF): tests/ide-test.o $(libqos-pc-obj-y)
|
|
|
9ae3a8 |
tests/hd-geo-test$(EXESUF): tests/hd-geo-test.o
|
|
|
9ae3a8 |
+tests/boot-order-test$(EXESUF): tests/boot-order-test.o
|
|
|
9ae3a8 |
tests/tmp105-test$(EXESUF): tests/tmp105-test.o $(libqos-omap-obj-y)
|
|
|
9ae3a8 |
tests/i440fx-test$(EXESUF): tests/i440fx-test.o $(libqos-pc-obj-y)
|
|
|
9ae3a8 |
tests/fw_cfg-test$(EXESUF): tests/fw_cfg-test.o $(libqos-pc-obj-y)
|
|
|
9ae3a8 |
diff --git a/tests/boot-order-test.c b/tests/boot-order-test.c
|
|
|
9ae3a8 |
new file mode 100644
|
|
|
9ae3a8 |
index 0000000..447be31
|
|
|
9ae3a8 |
--- /dev/null
|
|
|
9ae3a8 |
+++ b/tests/boot-order-test.c
|
|
|
9ae3a8 |
@@ -0,0 +1,73 @@
|
|
|
9ae3a8 |
+/*
|
|
|
9ae3a8 |
+ * Boot order test cases.
|
|
|
9ae3a8 |
+ *
|
|
|
9ae3a8 |
+ * Copyright (c) 2013 Red Hat Inc.
|
|
|
9ae3a8 |
+ *
|
|
|
9ae3a8 |
+ * Authors:
|
|
|
9ae3a8 |
+ * Markus Armbruster <armbru@redhat.com>,
|
|
|
9ae3a8 |
+ *
|
|
|
9ae3a8 |
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
|
|
|
9ae3a8 |
+ * See the COPYING file in the top-level directory.
|
|
|
9ae3a8 |
+ */
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
+#include <glib.h>
|
|
|
9ae3a8 |
+#include "libqtest.h"
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
+static void test_pc_cmos_byte(int reg, int expected)
|
|
|
9ae3a8 |
+{
|
|
|
9ae3a8 |
+ int actual;
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
+ outb(0x70, reg);
|
|
|
9ae3a8 |
+ actual = inb(0x71);
|
|
|
9ae3a8 |
+ g_assert_cmphex(actual, ==, expected);
|
|
|
9ae3a8 |
+}
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
+static void test_pc_cmos(uint8_t boot1, uint8_t boot2)
|
|
|
9ae3a8 |
+{
|
|
|
9ae3a8 |
+ test_pc_cmos_byte(0x38, boot1);
|
|
|
9ae3a8 |
+ test_pc_cmos_byte(0x3d, boot2);
|
|
|
9ae3a8 |
+}
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
+static void test_pc_with_args(const char *test_args,
|
|
|
9ae3a8 |
+ uint8_t boot1, uint8_t boot2,
|
|
|
9ae3a8 |
+ uint8_t reboot1, uint8_t reboot2)
|
|
|
9ae3a8 |
+{
|
|
|
9ae3a8 |
+ char *args = g_strdup_printf("-nodefaults -display none %s", test_args);
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
+ qtest_start(args);
|
|
|
9ae3a8 |
+ test_pc_cmos(boot1, boot2);
|
|
|
9ae3a8 |
+ qmp("{ 'execute': 'system_reset' }");
|
|
|
9ae3a8 |
+ /*
|
|
|
9ae3a8 |
+ * system_reset only requests reset. We get a RESET event after
|
|
|
9ae3a8 |
+ * the actual reset completes. Need to wait for that.
|
|
|
9ae3a8 |
+ */
|
|
|
9ae3a8 |
+ qmp(""); /* HACK: wait for event */
|
|
|
9ae3a8 |
+ test_pc_cmos(reboot1, reboot2);
|
|
|
9ae3a8 |
+ qtest_quit(global_qtest);
|
|
|
9ae3a8 |
+ g_free(args);
|
|
|
9ae3a8 |
+}
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
+static void test_pc_boot_order(void)
|
|
|
9ae3a8 |
+{
|
|
|
9ae3a8 |
+ test_pc_with_args("", 0x30, 0x12, 0x30, 0x12);
|
|
|
9ae3a8 |
+ test_pc_with_args("-no-fd-bootchk", 0x31, 0x12, 0x31, 0x12);
|
|
|
9ae3a8 |
+ test_pc_with_args("-boot c", 0, 0x02, 0, 0x02);
|
|
|
9ae3a8 |
+ test_pc_with_args("-boot nda", 0x10, 0x34, 0x10, 0x34);
|
|
|
9ae3a8 |
+ test_pc_with_args("-boot order=", 0, 0, 0, 0);
|
|
|
9ae3a8 |
+ test_pc_with_args("-boot order= -boot order=c", 0, 0x02, 0, 0x02);
|
|
|
9ae3a8 |
+ test_pc_with_args("-boot once=a", 0, 0x01, 0x30, 0x12);
|
|
|
9ae3a8 |
+ test_pc_with_args("-boot once=a -no-fd-bootchk", 0x01, 0x01, 0x31, 0x12);
|
|
|
9ae3a8 |
+ test_pc_with_args("-boot once=a,order=c", 0, 0x01, 0, 0x02);
|
|
|
9ae3a8 |
+ test_pc_with_args("-boot once=d -boot order=nda", 0, 0x03, 0x10, 0x34);
|
|
|
9ae3a8 |
+ test_pc_with_args("-boot once=a -boot once=b -boot once=c",
|
|
|
9ae3a8 |
+ 0, 0x02, 0x30, 0x12);
|
|
|
9ae3a8 |
+}
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
+int main(int argc, char *argv[])
|
|
|
9ae3a8 |
+{
|
|
|
9ae3a8 |
+ g_test_init(&argc, &argv, NULL);
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
+ qtest_add_func("boot-order/pc", test_pc_boot_order);
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
+ return g_test_run();
|
|
|
9ae3a8 |
+}
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.7.11.7
|
|
|
9ae3a8 |
|