[Qemu-devel] [PATCH 0/2] ppc: deprecate 'prep' machine

[Qemu-devel] [PATCH 0/2] ppc: deprecate 'prep' machine

[Hervé Poussineau]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=UTF-8, Size: 443 bytes --]

Hello,

These two small patches deprecate the PPC 'prep' machine in favor of the
'40p' machine.

This is already flagged as 'Future candidate' for removal in
https://wiki.qemu.org/Features/LegacyRemoval

HervÃ

Hervé Poussineau (2):
  hw/ppc: on 40p machine, change default firmware to OpenBIOS
  hw/ppc: deprecate the machine type 'prep', replaced by '40p'

 hw/ppc/prep.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

-- 
2.11.0

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

[Hervé Poussineau]

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

[David Gibson]

[-- Attachment #1: Type: text/plain, Size: 1260 bytes --]

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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

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

[Hervé Poussineau]

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);
> 

[Qemu-devel] [PATCH 2/2] hw/ppc: deprecate the machine type 'prep', replaced by '40p'

[Hervé Poussineau]

- prep machine is a fictional machine, so has no specifications. Which
  devices can be changed/added/removed without impact? Are interrupts
  correctly mapped?
- prep firmware (OHW) has support only for IDE drives (no SCSI).
  Booting from IDE has been broken approximatively 3 years ago, and nobody complained.
- OHW is limited on IDE boot to a specific set of OS loaders.
  These operating systems are of the 2004 time frame.
- OHW can use -kernel. Linux kernel freezes a long time after PS/2 mouse
  detection, and then screen becomes garbage. This was already broken in
  QEMU v2.7, 2 years ago, and nobody complained.

On the other side:
- 40p is a real machine, so emulation can be checked against
  hardware specifications
- OpenBIOS has support for SCSI block devices, including 40p LSI adapter
- OpenBIOS can start mostly all Linux kernels (including recent ones)
  and recent operating system (like NetBSD 7.1.2)

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

diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c
index 1558855247..fbcaebabc0 100644
--- a/hw/ppc/prep.c
+++ b/hw/ppc/prep.c
@@ -676,6 +676,7 @@ static void ppc_prep_init(MachineState *machine)
 
 static void prep_machine_init(MachineClass *mc)
 {
+    mc->deprecation_reason = "use 40p machine type instead";
     mc->desc = "PowerPC PREP platform";
     mc->init = ppc_prep_init;
     mc->block_default_type = IF_IDE;
-- 
2.11.0

Re: [Qemu-devel] [PATCH 2/2] hw/ppc: deprecate the machine type 'prep', replaced by '40p'

[David Gibson]

[-- Attachment #1: Type: text/plain, Size: 1849 bytes --]

On Thu, Aug 09, 2018 at 10:40:10PM +0200, Hervé Poussineau wrote:
> - prep machine is a fictional machine, so has no specifications. Which
>   devices can be changed/added/removed without impact? Are interrupts
>   correctly mapped?
> - prep firmware (OHW) has support only for IDE drives (no SCSI).
>   Booting from IDE has been broken approximatively 3 years ago, and nobody complained.
> - OHW is limited on IDE boot to a specific set of OS loaders.
>   These operating systems are of the 2004 time frame.
> - OHW can use -kernel. Linux kernel freezes a long time after PS/2 mouse
>   detection, and then screen becomes garbage. This was already broken in
>   QEMU v2.7, 2 years ago, and nobody complained.
> 
> On the other side:
> - 40p is a real machine, so emulation can be checked against
>   hardware specifications
> - OpenBIOS has support for SCSI block devices, including 40p LSI adapter
> - OpenBIOS can start mostly all Linux kernels (including recent ones)
>   and recent operating system (like NetBSD 7.1.2)
> 
> Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>

Applied to ppc-for-3.1.

> ---
>  hw/ppc/prep.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c
> index 1558855247..fbcaebabc0 100644
> --- a/hw/ppc/prep.c
> +++ b/hw/ppc/prep.c
> @@ -676,6 +676,7 @@ static void ppc_prep_init(MachineState *machine)
>  
>  static void prep_machine_init(MachineClass *mc)
>  {
> +    mc->deprecation_reason = "use 40p machine type instead";
>      mc->desc = "PowerPC PREP platform";
>      mc->init = ppc_prep_init;
>      mc->block_default_type = IF_IDE;

-- 
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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [Qemu-devel] [PATCH 2/2] hw/ppc: deprecate the machine type 'prep', replaced by '40p'

[Daniel P. Berrangé]

On Thu, Aug 09, 2018 at 10:40:10PM +0200, Hervé Poussineau wrote:
> - prep machine is a fictional machine, so has no specifications. Which
>   devices can be changed/added/removed without impact? Are interrupts
>   correctly mapped?
> - prep firmware (OHW) has support only for IDE drives (no SCSI).
>   Booting from IDE has been broken approximatively 3 years ago, and nobody complained.
> - OHW is limited on IDE boot to a specific set of OS loaders.
>   These operating systems are of the 2004 time frame.
> - OHW can use -kernel. Linux kernel freezes a long time after PS/2 mouse
>   detection, and then screen becomes garbage. This was already broken in
>   QEMU v2.7, 2 years ago, and nobody complained.
> 
> On the other side:
> - 40p is a real machine, so emulation can be checked against
>   hardware specifications
> - OpenBIOS has support for SCSI block devices, including 40p LSI adapter
> - OpenBIOS can start mostly all Linux kernels (including recent ones)
>   and recent operating system (like NetBSD 7.1.2)
> 
> Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
> ---
>  hw/ppc/prep.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c
> index 1558855247..fbcaebabc0 100644
> --- a/hw/ppc/prep.c
> +++ b/hw/ppc/prep.c
> @@ -676,6 +676,7 @@ static void ppc_prep_init(MachineState *machine)
>  
>  static void prep_machine_init(MachineClass *mc)
>  {
> +    mc->deprecation_reason = "use 40p machine type instead";
>      mc->desc = "PowerPC PREP platform";
>      mc->init = ppc_prep_init;
>      mc->block_default_type = IF_IDE;

A deprecation needs to be listed in qemu-deprecated.texi for it to
be official.

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|