From 530a7e48bccddd8f1558f48cd4e3f6d46c272c83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 26 Jun 2013 15:52:16 +0200 Subject: boot-order-test: Add tests for PowerMacs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit They set the boot device via fw_cfg, which is then translated to a boot path of "hd" or "cd" in OpenBIOS. Signed-off-by: Andreas Färber Signed-off-by: Andreas Färber Signed-off-by: Markus Armbruster Message-id: 1372254743-15808-6-git-send-email-armbru@redhat.com Cc: Alexander Graf Cc: qemu-ppc@nongnu.org Converted to libqos/fw_cfg on Anthony's request. Signed-off-by: Markus Armbruster Signed-off-by: Anthony Liguori --- tests/boot-order-test.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) (limited to 'tests/boot-order-test.c') 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 #include +#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(); } -- cgit v1.2.1