diff options
| -rw-r--r-- | tests/Makefile | 4 | ||||
| -rw-r--r-- | tests/boot-order-test.c | 50 |
2 files changed, 52 insertions, 2 deletions
diff --git a/tests/Makefile b/tests/Makefile index 55bfe24978..c570da03be 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -70,6 +70,8 @@ gcov-files-sparc-y += hw/m48t59.c gcov-files-sparc64-y += hw/m48t59.c check-qtest-arm-y = tests/tmp105-test$(EXESUF) gcov-files-arm-y += hw/tmp105.c +check-qtest-ppc-y += tests/boot-order-test$(EXESUF) +check-qtest-ppc64-y += tests/boot-order-test$(EXESUF) GENERATED_HEADERS += tests/test-qapi-types.h tests/test-qapi-visit.h tests/test-qmp-commands.h @@ -135,7 +137,7 @@ tests/m48t59-test$(EXESUF): tests/m48t59-test.o tests/fdc-test$(EXESUF): tests/fdc-test.o tests/ide-test$(EXESUF): tests/ide-test.o $(libqos-pc-obj-y) tests/hd-geo-test$(EXESUF): tests/hd-geo-test.o -tests/boot-order-test$(EXESUF): tests/boot-order-test.o +tests/boot-order-test$(EXESUF): tests/boot-order-test.o $(libqos-obj-y) tests/tmp105-test$(EXESUF): tests/tmp105-test.o $(libqos-omap-obj-y) tests/i440fx-test$(EXESUF): tests/i440fx-test.o $(libqos-pc-obj-y) tests/fw_cfg-test$(EXESUF): tests/fw_cfg-test.o $(libqos-pc-obj-y) diff --git a/tests/boot-order-test.c b/tests/boot-order-test.c index 447be312ed..766981df83 100644 --- a/tests/boot-order-test.c +++ b/tests/boot-order-test.c @@ -10,7 +10,9 @@ * See the COPYING file in the top-level directory. */ +#include <string.h> #include <glib.h> +#include "libqos/fw_cfg.h" #include "libqtest.h" static void test_pc_cmos_byte(int reg, int expected) @@ -63,11 +65,57 @@ static void test_pc_boot_order(void) 0, 0x02, 0x30, 0x12); } +#define G3BEIGE_CFG_ADDR 0xf0000510 +#define MAC99_CFG_ADDR 0xf0000510 + +#define NO_QEMU_PROTOS +#include "hw/nvram/fw_cfg.h" +#undef NO_QEMU_PROTOS + +static void test_powermac_with_args(bool newworld, const char *extra_args, + uint16_t expected_boot, + uint16_t expected_reboot) +{ + char *args = g_strdup_printf("-nodefaults -display none -machine %s %s", + newworld ? "mac99" : "g3beige", extra_args); + QFWCFG *fw_cfg = mm_fw_cfg_init(newworld ? MAC99_CFG_ADDR + : G3BEIGE_CFG_ADDR); + uint16_t actual; + + qtest_start(args); + actual = qfw_cfg_get_u16(fw_cfg, FW_CFG_BOOT_DEVICE); + g_assert_cmphex(actual, ==, expected_boot); + qmp("{ 'execute': 'system_reset' }"); + actual = qfw_cfg_get_u16(fw_cfg, FW_CFG_BOOT_DEVICE); + g_assert_cmphex(actual, ==, expected_reboot); + qtest_quit(global_qtest); + g_free(args); +} + +static void test_powermac_boot_order(void) +{ + int i; + + for (i = 0; i < 2; i++) { + bool newworld = (i == 1); + + test_powermac_with_args(newworld, "", 'c', 'c'); + test_powermac_with_args(newworld, "-boot c", 'c', 'c'); + test_powermac_with_args(newworld, "-boot d", 'd', 'd'); + } +} + int main(int argc, char *argv[]) { + const char *arch = qtest_get_arch(); + g_test_init(&argc, &argv, NULL); - qtest_add_func("boot-order/pc", test_pc_boot_order); + if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) { + qtest_add_func("boot-order/pc", test_pc_boot_order); + } else if (strcmp(arch, "ppc") == 0 || strcmp(arch, "ppc64") == 0) { + qtest_add_func("boot-order/powermac", test_powermac_boot_order); + } return g_test_run(); } |