* [Qemu-devel] [PATCH] hw/ppc: on 40p machine, change default firmware to OpenBIOS
@ 2018-08-10 5:37 Hervé Poussineau
2018-08-10 6:41 ` David Gibson
2018-08-10 8:00 ` Mark Cave-Ayland
0 siblings, 2 replies; 6+ messages in thread
From: Hervé Poussineau @ 2018-08-10 5:37 UTC (permalink / raw)
To: qemu-devel
Cc: Mark Cave-Ayland, David Gibson, Alexander Graf, qemu-ppc,
Hervé Poussineau
OpenBIOS gained 40p support in 5b20e4cacecb62fb2bdc6867c11d44cddd77c4ff
Use it, instead of relying on an unmaintained and very limited 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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH] hw/ppc: on 40p machine, change default firmware to OpenBIOS
2018-08-10 5:37 [Qemu-devel] [PATCH] hw/ppc: on 40p machine, change default firmware to OpenBIOS Hervé Poussineau
@ 2018-08-10 6:41 ` David Gibson
2018-08-20 3:16 ` David Gibson
2018-08-10 8:00 ` Mark Cave-Ayland
1 sibling, 1 reply; 6+ messages in thread
From: David Gibson @ 2018-08-10 6:41 UTC (permalink / raw)
To: Hervé Poussineau
Cc: qemu-devel, Mark Cave-Ayland, Alexander Graf, qemu-ppc
[-- Attachment #1: Type: text/plain, Size: 1115 bytes --]
On Fri, Aug 10, 2018 at 07:37:12AM +0200, Hervé Poussineau wrote:
> OpenBIOS gained 40p support in 5b20e4cacecb62fb2bdc6867c11d44cddd77c4ff
> Use it, instead of relying on an unmaintained and very limited firmware.
>
> Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
Applied to ppc-for-3.1, thanks.
> ---
> 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 --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH] hw/ppc: on 40p machine, change default firmware to OpenBIOS
2018-08-10 5:37 [Qemu-devel] [PATCH] hw/ppc: on 40p machine, change default firmware to OpenBIOS Hervé Poussineau
2018-08-10 6:41 ` David Gibson
@ 2018-08-10 8:00 ` Mark Cave-Ayland
1 sibling, 0 replies; 6+ messages in thread
From: Mark Cave-Ayland @ 2018-08-10 8:00 UTC (permalink / raw)
To: Hervé Poussineau, qemu-devel; +Cc: qemu-ppc, Alexander Graf, David Gibson
On 10/08/18 06:37, Hervé Poussineau wrote:
> OpenBIOS gained 40p support in 5b20e4cacecb62fb2bdc6867c11d44cddd77c4ff
> Use it, instead of relying on an unmaintained and very limited 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);
Great news!
Acked-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
ATB,
Mark.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH] hw/ppc: on 40p machine, change default firmware to OpenBIOS
2018-08-10 6:41 ` David Gibson
@ 2018-08-20 3:16 ` David Gibson
2018-08-31 14:16 ` Mark Cave-Ayland
0 siblings, 1 reply; 6+ messages in thread
From: David Gibson @ 2018-08-20 3:16 UTC (permalink / raw)
To: Hervé Poussineau
Cc: qemu-devel, Mark Cave-Ayland, Alexander Graf, qemu-ppc
[-- Attachment #1: Type: text/plain, Size: 1677 bytes --]
On Fri, Aug 10, 2018 at 04:41:54PM +1000, David Gibson wrote:
> On Fri, Aug 10, 2018 at 07:37:12AM +0200, Hervé Poussineau wrote:
> > OpenBIOS gained 40p support in 5b20e4cacecb62fb2bdc6867c11d44cddd77c4ff
> > Use it, instead of relying on an unmaintained and very limited firmware.
> >
> > Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
>
> Applied to ppc-for-3.1, thanks.
But I'm afraid I've had to pull it out. This breaks boot-serial-test,
because the new firmware prints different messages than the old one
did and the testcase isn't looking for them.
I tried fixing it, but ran into complications I didn't have time to
debug. So I'm afraid this will miss my coming-soon pull request.
You should be able to reproduce the problem with "make check
SPEED=slow", can you fix this up and resubmit.
>
> > ---
> > 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 --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH] hw/ppc: on 40p machine, change default firmware to OpenBIOS
2018-08-20 3:16 ` David Gibson
@ 2018-08-31 14:16 ` Mark Cave-Ayland
2018-09-04 20:20 ` Hervé Poussineau
0 siblings, 1 reply; 6+ messages in thread
From: Mark Cave-Ayland @ 2018-08-31 14:16 UTC (permalink / raw)
To: David Gibson, Hervé Poussineau
Cc: qemu-ppc, qemu-devel, Alexander Graf, Thomas Huth
On 20/08/18 04:16, David Gibson wrote:
> On Fri, Aug 10, 2018 at 04:41:54PM +1000, David Gibson wrote:
>> On Fri, Aug 10, 2018 at 07:37:12AM +0200, Hervé Poussineau wrote:
>>> OpenBIOS gained 40p support in 5b20e4cacecb62fb2bdc6867c11d44cddd77c4ff
>>> Use it, instead of relying on an unmaintained and very limited firmware.
>>>
>>> Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
>>
>> Applied to ppc-for-3.1, thanks.
>
> But I'm afraid I've had to pull it out. This breaks boot-serial-test,
> because the new firmware prints different messages than the old one
> did and the testcase isn't looking for them.
>
> I tried fixing it, but ran into complications I didn't have time to
> debug. So I'm afraid this will miss my coming-soon pull request.
>
> You should be able to reproduce the problem with "make check
> SPEED=slow", can you fix this up and resubmit.
>
>>
>>> ---
>>> 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);
Thanks to Thomas on IRC, I was able come up with the diff below which
fixes boot-serial-test when this patch is applied:
diff --git a/tests/boot-serial-test.c b/tests/boot-serial-test.c
index f123b15e3e..f865822e32 100644
--- a/tests/boot-serial-test.c
+++ b/tests/boot-serial-test.c
@@ -75,12 +75,12 @@ typedef struct testdef {
static testdef_t tests[] = {
{ "alpha", "clipper", "", "PCI:" },
{ "ppc", "ppce500", "", "U-Boot" },
- { "ppc", "40p", "-boot d", "Booting from device d" },
+ { "ppc", "40p", "-vga none -boot d", "Trying cd:," },
{ "ppc", "g3beige", "", "PowerPC,750" },
{ "ppc", "mac99", "", "PowerPC,G4" },
{ "ppc", "sam460ex", "-m 256", "DRAM: 256 MiB" },
{ "ppc64", "ppce500", "", "U-Boot" },
- { "ppc64", "40p", "-m 192", "Memory size: 192 MB" },
+ { "ppc64", "40p", "-m 192", "Memory: 192M" },
{ "ppc64", "mac99", "", "PowerPC,970FX" },
{ "ppc64", "pseries", "", "Open Firmware" },
{ "ppc64", "powernv", "-cpu POWER8", "OPAL" },
Hervé, can you confirm that this fixes "make check" for you? If so it
should just be a simple case of squashing into the above patch and then
resubmitting a v2.
ATB,
Mark.
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH] hw/ppc: on 40p machine, change default firmware to OpenBIOS
2018-08-31 14:16 ` Mark Cave-Ayland
@ 2018-09-04 20:20 ` Hervé Poussineau
0 siblings, 0 replies; 6+ messages in thread
From: Hervé Poussineau @ 2018-09-04 20:20 UTC (permalink / raw)
To: Mark Cave-Ayland, David Gibson
Cc: qemu-ppc, qemu-devel, Alexander Graf, Thomas Huth
Le 31/08/2018 à 16:16, Mark Cave-Ayland a écrit :
> On 20/08/18 04:16, David Gibson wrote:
>
>> On Fri, Aug 10, 2018 at 04:41:54PM +1000, David Gibson wrote:
>>> On Fri, Aug 10, 2018 at 07:37:12AM +0200, Hervé Poussineau wrote:
>>>> OpenBIOS gained 40p support in 5b20e4cacecb62fb2bdc6867c11d44cddd77c4ff
>>>> Use it, instead of relying on an unmaintained and very limited firmware.
>>>>
>>>> Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
>>>
>>> Applied to ppc-for-3.1, thanks.
>>
>> But I'm afraid I've had to pull it out. This breaks boot-serial-test,
>> because the new firmware prints different messages than the old one
>> did and the testcase isn't looking for them.
>>
>> I tried fixing it, but ran into complications I didn't have time to
>> debug. So I'm afraid this will miss my coming-soon pull request.
>>
>> You should be able to reproduce the problem with "make check
>> SPEED=slow", can you fix this up and resubmit.
>>
>>>
>>>> ---
>>>> 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);
>
> Thanks to Thomas on IRC, I was able come up with the diff below which
> fixes boot-serial-test when this patch is applied:
>
> diff --git a/tests/boot-serial-test.c b/tests/boot-serial-test.c
> index f123b15e3e..f865822e32 100644
> --- a/tests/boot-serial-test.c
> +++ b/tests/boot-serial-test.c
> @@ -75,12 +75,12 @@ typedef struct testdef {
> static testdef_t tests[] = {
> { "alpha", "clipper", "", "PCI:" },
> { "ppc", "ppce500", "", "U-Boot" },
> - { "ppc", "40p", "-boot d", "Booting from device d" },
> + { "ppc", "40p", "-vga none -boot d", "Trying cd:," },
> { "ppc", "g3beige", "", "PowerPC,750" },
> { "ppc", "mac99", "", "PowerPC,G4" },
> { "ppc", "sam460ex", "-m 256", "DRAM: 256 MiB" },
> { "ppc64", "ppce500", "", "U-Boot" },
> - { "ppc64", "40p", "-m 192", "Memory size: 192 MB" },
> + { "ppc64", "40p", "-m 192", "Memory: 192M" },
> { "ppc64", "mac99", "", "PowerPC,970FX" },
> { "ppc64", "pseries", "", "Open Firmware" },
> { "ppc64", "powernv", "-cpu POWER8", "OPAL" },
>
> Hervé, can you confirm that this fixes "make check" for you? If so it
> should just be a simple case of squashing into the above patch and then
> resubmitting a v2.
Yes, this also fixes "make check" for me.
v2 sent at http://lists.gnu.org/archive/html/qemu-devel/2018-09/msg00362.html
Thanks for the help.
Hervé
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-09-04 20:21 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-08-10 5:37 [Qemu-devel] [PATCH] hw/ppc: on 40p machine, change default firmware to OpenBIOS Hervé Poussineau
2018-08-10 6:41 ` David Gibson
2018-08-20 3:16 ` David Gibson
2018-08-31 14:16 ` Mark Cave-Ayland
2018-09-04 20:20 ` Hervé Poussineau
2018-08-10 8:00 ` Mark Cave-Ayland
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.