From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46869) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UnUOS-0008HF-HM for qemu-devel@nongnu.org; Fri, 14 Jun 2013 09:50:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UnUOO-0001I7-Si for qemu-devel@nongnu.org; Fri, 14 Jun 2013 09:50:20 -0400 Received: from e9.ny.us.ibm.com ([32.97.182.139]:51410) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UnUOO-0001Hx-OS for qemu-devel@nongnu.org; Fri, 14 Jun 2013 09:50:16 -0400 Received: from /spool/local by e9.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 14 Jun 2013 09:50:15 -0400 From: Anthony Liguori In-Reply-To: <1371208516-7857-10-git-send-email-armbru@redhat.com> References: <1371208516-7857-1-git-send-email-armbru@redhat.com> <1371208516-7857-10-git-send-email-armbru@redhat.com> Date: Fri, 14 Jun 2013 08:49:51 -0500 Message-ID: <87ehc4g5ts.fsf@codemonkey.ws> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v3 09/16] boot-order-test: Add tests for PowerMacs List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Markus Armbruster , qemu-devel@nongnu.org Cc: jan.kiszka@siemens.com, Alexander Graf , alex.williamson@redhat.com, qemu-ppc@nongnu.org, aviksil@linux.vnet.ibm.com, afaerber@suse.de Markus Armbruster writes: > 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 > Signed-off-by: Markus Armbruster > --- > tests/Makefile | 2 ++ > tests/boot-order-test.c | 66 +++++++++++++++++++++++++++++++++++++++++++= +++++- > 2 files changed, 67 insertions(+), 1 deletion(-) > > diff --git a/tests/Makefile b/tests/Makefile > index 394e029..9653fce 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=20 > GENERATED_HEADERS +=3D tests/test-qapi-types.h tests/test-qapi-visit.h t= ests/test-qmp-commands.h >=20=20 > diff --git a/tests/boot-order-test.c b/tests/boot-order-test.c > index 2215710..c1cc2a6 100644 > --- a/tests/boot-order-test.c > +++ b/tests/boot-order-test.c > @@ -10,8 +10,10 @@ > * See the COPYING file in the top-level directory. > */ >=20=20 > +#include > #include > #include "libqtest.h" > +#include "qemu/bswap.h" >=20=20 > static void test_pc_cmos_byte(int reg, int expected) > { > @@ -58,11 +60,73 @@ static void test_pc_boot_order(void) > 0, 0x02, 0x30, 0x12); > } >=20=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 powermac_fw_cfg_read(bool newworld, uint16_t cmd, > + uint8_t *buf, unsigned int len) > +{ > + unsigned int i; > + > + writew(newworld ? MAC99_CFG_ADDR : G3BEIGE_CFG_ADDR, cmd); > + for (i =3D 0; i < len; i++) { > + buf[i] =3D readb((newworld ? MAC99_CFG_ADDR : G3BEIGE_CFG_ADDR) = + 2); > + } > +} > + > +static uint16_t powermac_fw_cfg_read16(bool newworld, uint16_t cmd) > +{ > + uint16_t value; > + > + powermac_fw_cfg_read(newworld, cmd, (uint8_t *)&value, sizeof(value)= ); > + return le16_to_cpu(value); > +} > + > +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); > + uint16_t actual; > + qtest_start(args); > + actual =3D powermac_fw_cfg_read16(newworld, FW_CFG_BOOT_DEVICE); > + g_assert_cmphex(actual, =3D=3D, expected_boot); > + qmp("{ 'execute': 'system_reset' }"); Same concern here but otherwise looks good. Regards, Anthony Liguori > + actual =3D powermac_fw_cfg_read16(newworld, 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=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=20 > return g_test_run(); > } > --=20 > 1.7.11.7