Re: [PATCH] hw/ppc/prep: Remove the deprecated "prep" machine and the OpenHackware BIOS

[Philippe Mathieu-Daudé]

On 12/3/19 8:29 AM, Thomas Huth wrote:
> It's been deprecated since QEMU v3.1. The 40p machine should be
> used nowadays instead.
>
> Signed-off-by: Thomas Huth <address@hidden>
> ---
>   .gitmodules                |   3 -
>   MAINTAINERS                |   1 -
>   Makefile                   |   2 +-
>   docs/interop/firmware.json |   3 +-
>   hw/ppc/ppc.c               |  18 --
>   hw/ppc/prep.c              | 384 +------------------------------------
>   include/hw/ppc/ppc.h       |   1 -
>   pc-bios/README             |   3 -
>   pc-bios/ppc_rom.bin        | Bin 1048576 -> 0 bytes
>   qemu-deprecated.texi       |   6 -
>   qemu-doc.texi              |  15 +-
>   roms/openhackware          |   1 -
>   tests/boot-order-test.c    |  25 ---
>   tests/cdrom-test.c         |   2 +-
>   tests/endianness-test.c    |   2 +-
>   15 files changed, 10 insertions(+), 456 deletions(-)
>   delete mode 100644 pc-bios/ppc_rom.bin
>   delete mode 160000 roms/openhackware
[...]
> diff --git a/tests/boot-order-test.c b/tests/boot-order-test.c
> index a725bce729..4a6218a516 100644
> --- a/tests/boot-order-test.c
> +++ b/tests/boot-order-test.c
> @@ -108,30 +108,6 @@ static void test_pc_boot_order(void)
>       test_boot_orders(NULL, read_boot_order_pc, test_cases_pc);
>   }
>   
> -static uint8_t read_m48t59(QTestState *qts, uint64_t addr, uint16_t reg)
> -{
> -    qtest_writeb(qts, addr, reg & 0xff);
> -    qtest_writeb(qts, addr + 1, reg >> 8);
> -    return qtest_readb(qts, addr + 3);
> -}
> -
> -static uint64_t read_boot_order_prep(QTestState *qts)
> -{
> -    return read_m48t59(qts, 0x80000000 + 0x74, 0x34);

I'd rather keep this generic mmio-mapped ISA test.
Maybe run it with the 40p machine?

Maybe we can rename this as read_boot_order_mm, and the previous 
read_boot_order_pc as read_boot_order_io.

Except this comment, thanks for this cleaning.

Ideally keeping read_boot_order_io test:
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>

> -}
> -
> -static const boot_order_test test_cases_prep[] = {
> -    { "", 'c', 'c' },
> -    { "-boot c", 'c', 'c' },
> -    { "-boot d", 'd', 'd' },
> -    {}
> -};
> -
> -static void test_prep_boot_order(void)
> -{
> -    test_boot_orders("prep", read_boot_order_prep, test_cases_prep);
> -}
> -
>   static uint64_t read_boot_order_pmac(QTestState *qts)
>   {
>       QFWCFG *fw_cfg = mm_fw_cfg_init(qts, 0xf0000510);
> @@ -190,7 +166,6 @@ int main(int argc, char *argv[])
>       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/prep", test_prep_boot_order);
>           qtest_add_func("boot-order/pmac_oldworld",
>                          test_pmac_oldworld_boot_order);
>           qtest_add_func("boot-order/pmac_newworld",
> diff --git a/tests/cdrom-test.c b/tests/cdrom-test.c
> index 34e9974634..006044f48a 100644
> --- a/tests/cdrom-test.c
> +++ b/tests/cdrom-test.c
> @@ -189,7 +189,7 @@ int main(int argc, char **argv)
>           add_s390x_tests();
>       } else if (g_str_equal(arch, "ppc64")) {
>           const char *ppcmachines[] = {
> -            "pseries", "mac99", "g3beige", "40p", "prep", NULL
> +            "pseries", "mac99", "g3beige", "40p", NULL
>           };
>           add_cdrom_param_tests(ppcmachines);
>       } else if (g_str_equal(arch, "sparc")) {
> diff --git a/tests/endianness-test.c b/tests/endianness-test.c
> index 58527952a5..2798802c63 100644
> --- a/tests/endianness-test.c
> +++ b/tests/endianness-test.c
> @@ -35,7 +35,7 @@ static const TestCase test_cases[] = {
>       { "mips64", "malta", 0x10000000, .bswap = true },
>       { "mips64el", "fulong2e", 0x1fd00000 },
>       { "ppc", "g3beige", 0xfe000000, .bswap = true, .superio = "i82378" },
> -    { "ppc", "prep", 0x80000000, .bswap = true },
> +    { "ppc", "40p", 0x80000000, .bswap = true },
>       { "ppc", "bamboo", 0xe8000000, .bswap = true, .superio = "i82378" },
>       { "ppc64", "mac99", 0xf2000000, .bswap = true, .superio = "i82378" },
>       { "ppc64", "pseries", (1ULL << 45), .bswap = true, .superio = "i82378" },