ppc: deprecate 'prep' machine

[Qemu-devel] [PATCH 1/2] hw/ppc: on 40p machine, change default firmware to OpenBIOS

Posted by Hervé Poussineau 7 years, 2 months ago

OpenBIOS gained 40p support in 5b20e4cacecb62fb2bdc6867c11d44cddd77c4ff
Use it, instead of relying on the presence of a proprietary firmware.

Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
---
 hw/ppc/prep.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c
index 3401570d98..1558855247 100644
--- a/hw/ppc/prep.c
+++ b/hw/ppc/prep.c
@@ -736,7 +736,7 @@ static void ibm_40p_init(MachineState *machine)
     /* PCI host */
     dev = qdev_create(NULL, "raven-pcihost");
     if (!bios_name) {
-        bios_name = BIOS_FILENAME;
+        bios_name = "openbios-ppc";
     }
     qdev_prop_set_string(dev, "bios-name", bios_name);
     qdev_prop_set_uint32(dev, "elf-machine", PPC_ELF_MACHINE);
-- 
2.11.0

Re: [Qemu-devel] [PATCH 1/2] hw/ppc: on 40p machine, change default firmware to OpenBIOS

Posted by David Gibson 7 years, 2 months ago

On Thu, Aug 09, 2018 at 10:40:09PM +0200, Hervé Poussineau wrote:
> OpenBIOS gained 40p support in 5b20e4cacecb62fb2bdc6867c11d44cddd77c4ff
> Use it, instead of relying on the presence of a proprietary
> firmware.

Uh..  openhackware might be, well, a hack, but I don't think it's
propietary.  Replacing it with openbios might well be a good idea, but
we want an accurrate reason for doing so.

> Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
> ---
>  hw/ppc/prep.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c
> index 3401570d98..1558855247 100644
> --- a/hw/ppc/prep.c
> +++ b/hw/ppc/prep.c
> @@ -736,7 +736,7 @@ static void ibm_40p_init(MachineState *machine)
>      /* PCI host */
>      dev = qdev_create(NULL, "raven-pcihost");
>      if (!bios_name) {
> -        bios_name = BIOS_FILENAME;
> +        bios_name = "openbios-ppc";
>      }
>      qdev_prop_set_string(dev, "bios-name", bios_name);
>      qdev_prop_set_uint32(dev, "elf-machine", PPC_ELF_MACHINE);

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

Re: [Qemu-devel] [PATCH 1/2] hw/ppc: on 40p machine, change default firmware to OpenBIOS

Posted by Hervé Poussineau 7 years, 2 months ago

Le 10/08/2018 à 03:04, David Gibson a écrit :
> On Thu, Aug 09, 2018 at 10:40:09PM +0200, Hervé Poussineau wrote:
>> OpenBIOS gained 40p support in 5b20e4cacecb62fb2bdc6867c11d44cddd77c4ff
>> Use it, instead of relying on the presence of a proprietary
>> firmware.
> 
> Uh..  openhackware might be, well, a hack, but I don't think it's
> propietary.  Replacing it with openbios might well be a good idea, but
> we want an accurrate reason for doing so.

Oops, you're right. That's what happens when you try to change/expand
your commit messages just before sending the patch. I will resend.

> 
>> Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
>> ---
>>   hw/ppc/prep.c | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c
>> index 3401570d98..1558855247 100644
>> --- a/hw/ppc/prep.c
>> +++ b/hw/ppc/prep.c
>> @@ -736,7 +736,7 @@ static void ibm_40p_init(MachineState *machine)
>>       /* PCI host */
>>       dev = qdev_create(NULL, "raven-pcihost");
>>       if (!bios_name) {
>> -        bios_name = BIOS_FILENAME;
>> +        bios_name = "openbios-ppc";
>>       }
>>       qdev_prop_set_string(dev, "bios-name", bios_name);
>>       qdev_prop_set_uint32(dev, "elf-machine", PPC_ELF_MACHINE);
>