Message ID | 1371208516-7857-10-git-send-email-armbru@redhat.com |
---|---|
State | New |
Headers | show |
Markus Armbruster <armbru@redhat.com> writes: > From: Andreas Färber <afaerber@suse.de> > > 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 <afaerber@suse.de> > Cc: Alexander Graf <agraf@suse.de> > Cc: qemu-ppc@nongnu.org > Signed-off-by: Markus Armbruster <armbru@redhat.com> > --- > 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 += 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 > > 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. > */ > > +#include <string.h> > #include <glib.h> > #include "libqtest.h" > +#include "qemu/bswap.h" > > 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); > } > > +#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 = 0; i < len; i++) { > + buf[i] = 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_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); > + uint16_t actual; > + qtest_start(args); > + actual = powermac_fw_cfg_read16(newworld, FW_CFG_BOOT_DEVICE); > + g_assert_cmphex(actual, ==, expected_boot); > + qmp("{ 'execute': 'system_reset' }"); Same concern here but otherwise looks good. Regards, Anthony Liguori > + actual = powermac_fw_cfg_read16(newworld, 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(); > } > -- > 1.7.11.7
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 += 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 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. */ +#include <string.h> #include <glib.h> #include "libqtest.h" +#include "qemu/bswap.h" 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); } +#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 = 0; i < len; i++) { + buf[i] = 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_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); + uint16_t actual; + qtest_start(args); + actual = powermac_fw_cfg_read16(newworld, FW_CFG_BOOT_DEVICE); + g_assert_cmphex(actual, ==, expected_boot); + qmp("{ 'execute': 'system_reset' }"); + actual = powermac_fw_cfg_read16(newworld, 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(); }