From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37047) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Urq9E-0004E5-5v for qemu-devel@nongnu.org; Wed, 26 Jun 2013 09:52:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Urq98-0007F9-9Y for qemu-devel@nongnu.org; Wed, 26 Jun 2013 09:52:36 -0400 From: Markus Armbruster Date: Wed, 26 Jun 2013 15:52:16 +0200 Message-Id: <1372254743-15808-6-git-send-email-armbru@redhat.com> In-Reply-To: <1372254743-15808-1-git-send-email-armbru@redhat.com> References: <1372254743-15808-1-git-send-email-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v4 05/12] boot-order-test: Add tests for PowerMacs List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, jan.kiszka@siemens.com, mjt@tls.msk.ru, Alexander Graf , alex.williamson@redhat.com, qemu-ppc@nongnu.org, aviksil@linux.vnet.ibm.com, afaerber@suse.de From: Andreas F=C3=A4rber 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=C3=A4rber Cc: Alexander Graf Cc: qemu-ppc@nongnu.org Converted to libqos/fw_cfg on Anthony's request. Signed-off-by: Markus Armbruster --- tests/Makefile | 4 +++- tests/boot-order-test.c | 50 +++++++++++++++++++++++++++++++++++++++++++= +++++- 2 files changed, 52 insertions(+), 2 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index 34a2325..8c7352d 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -67,6 +67,8 @@ gcov-files-sparc-y +=3D hw/m48t59.c gcov-files-sparc64-y +=3D hw/m48t59.c check-qtest-arm-y =3D tests/tmp105-test$(EXESUF) gcov-files-arm-y +=3D hw/tmp105.c +check-qtest-ppc-y +=3D tests/boot-order-test$(EXESUF) +check-qtest-ppc64-y +=3D tests/boot-order-test$(EXESUF) =20 GENERATED_HEADERS +=3D tests/test-qapi-types.h tests/test-qapi-visit.h t= ests/test-qmp-commands.h =20 @@ -131,7 +133,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 447be31..766981d 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. */ =20 +#include #include +#include "libqos/fw_cfg.h" #include "libqtest.h" =20 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); } =20 +#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_arg= s, + uint16_t expected_boot, + uint16_t expected_reboot) +{ + char *args =3D g_strdup_printf("-nodefaults -display none -machine %= s %s", + newworld ? "mac99" : "g3beige", extra_a= rgs); + QFWCFG *fw_cfg =3D mm_fw_cfg_init(newworld ? MAC99_CFG_ADDR + : G3BEIGE_CFG_ADDR); + uint16_t actual; + + qtest_start(args); + actual =3D qfw_cfg_get_u16(fw_cfg, FW_CFG_BOOT_DEVICE); + g_assert_cmphex(actual, =3D=3D, expected_boot); + qmp("{ 'execute': 'system_reset' }"); + actual =3D qfw_cfg_get_u16(fw_cfg, FW_CFG_BOOT_DEVICE); + g_assert_cmphex(actual, =3D=3D, expected_reboot); + qtest_quit(global_qtest); + g_free(args); +} + +static void test_powermac_boot_order(void) +{ + int i; + + for (i =3D 0; i < 2; i++) { + bool newworld =3D (i =3D=3D 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 =3D qtest_get_arch(); + g_test_init(&argc, &argv, NULL); =20 - qtest_add_func("boot-order/pc", test_pc_boot_order); + if (strcmp(arch, "i386") =3D=3D 0 || strcmp(arch, "x86_64") =3D=3D 0= ) { + qtest_add_func("boot-order/pc", test_pc_boot_order); + } else if (strcmp(arch, "ppc") =3D=3D 0 || strcmp(arch, "ppc64") =3D= =3D 0) { + qtest_add_func("boot-order/powermac", test_powermac_boot_order); + } =20 return g_test_run(); } --=20 1.7.11.7