[PATCH v2 0/2] hw/arm/raspi: Remove deprecated raspi2/raspi3 aliases

Philippe Mathieu-Daudé posted 2 patches 2 years, 9 months ago
Test checkpatch passed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20210708145514.1751773-1-f4bug@amsat.org
There is a newer version of this series
docs/devel/qgraph.rst                   | 38 ++++++++++++-------------
docs/system/deprecated.rst              |  7 -----
docs/system/removed-features.rst        |  7 +++++
tests/qtest/libqos/qgraph.h             |  6 ++--
tests/qtest/libqos/qgraph_internal.h    |  2 +-
hw/arm/raspi.c                          |  2 --
tests/qtest/boot-serial-test.c          |  2 +-
tests/qtest/libqos/arm-raspi2-machine.c |  8 +++---
tests/unit/test-qgraph.c                |  2 +-
tests/acceptance/boot_linux_console.py  |  6 ++--
10 files changed, 39 insertions(+), 41 deletions(-)
[PATCH v2 0/2] hw/arm/raspi: Remove deprecated raspi2/raspi3 aliases
Posted by Philippe Mathieu-Daudé 2 years, 9 months ago
Since v1:
- renamed tests (Peter)

Philippe Mathieu-Daudé (2):
  tests: Remove uses of deprecated raspi2/raspi3 machine names
  hw/arm/raspi: Remove deprecated raspi2/raspi3 aliases

 docs/devel/qgraph.rst                   | 38 ++++++++++++-------------
 docs/system/deprecated.rst              |  7 -----
 docs/system/removed-features.rst        |  7 +++++
 tests/qtest/libqos/qgraph.h             |  6 ++--
 tests/qtest/libqos/qgraph_internal.h    |  2 +-
 hw/arm/raspi.c                          |  2 --
 tests/qtest/boot-serial-test.c          |  2 +-
 tests/qtest/libqos/arm-raspi2-machine.c |  8 +++---
 tests/unit/test-qgraph.c                |  2 +-
 tests/acceptance/boot_linux_console.py  |  6 ++--
 10 files changed, 39 insertions(+), 41 deletions(-)

-- 
2.31.1

Re: [PATCH v2 0/2] hw/arm/raspi: Remove deprecated raspi2/raspi3 aliases
Posted by Peter Maydell 2 years, 9 months ago
On Thu, 8 Jul 2021 at 15:55, Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
>
> Since v1:
> - renamed tests (Peter)
>
> Philippe Mathieu-Daudé (2):
>   tests: Remove uses of deprecated raspi2/raspi3 machine names
>   hw/arm/raspi: Remove deprecated raspi2/raspi3 aliases



Applied to target-arm.next, thanks.

-- PMM

Re: [PATCH v2 0/2] hw/arm/raspi: Remove deprecated raspi2/raspi3 aliases
Posted by Peter Maydell 2 years, 9 months ago
On Fri, 9 Jul 2021 at 16:33, Peter Maydell <peter.maydell@linaro.org> wrote:
>
> On Thu, 8 Jul 2021 at 15:55, Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
> >
> > Since v1:
> > - renamed tests (Peter)
> >
> > Philippe Mathieu-Daudé (2):
> >   tests: Remove uses of deprecated raspi2/raspi3 machine names
> >   hw/arm/raspi: Remove deprecated raspi2/raspi3 aliases
>
>
>
> Applied to target-arm.next, thanks.

I found that this seems to break 'make check':

 (09/52) tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_arm_raspi2_initrd:
ERROR: Could not perform graceful shutdown (40.38 s)

Dropped from target-arm.next.

thanks
-- PMM

Re: [PATCH v2 0/2] hw/arm/raspi: Remove deprecated raspi2/raspi3 aliases
Posted by Philippe Mathieu-Daudé 2 years, 8 months ago
Hi Peter,

On 7/9/21 6:00 PM, Peter Maydell wrote:
> On Fri, 9 Jul 2021 at 16:33, Peter Maydell <peter.maydell@linaro.org> wrote:
>>
>> On Thu, 8 Jul 2021 at 15:55, Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
>>>
>>> Since v1:
>>> - renamed tests (Peter)
>>>
>>> Philippe Mathieu-Daudé (2):
>>>   tests: Remove uses of deprecated raspi2/raspi3 machine names
>>>   hw/arm/raspi: Remove deprecated raspi2/raspi3 aliases
>>
>>
>>
>> Applied to target-arm.next, thanks.
> 
> I found that this seems to break 'make check':
> 
>  (09/52) tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_arm_raspi2_initrd:
> ERROR: Could not perform graceful shutdown (40.38 s)

I can not reproduce. Maybe something got changed in Python/Avocado
since... I'm going to simply respin (updating 6.1 -> 6.2).

> 
> Dropped from target-arm.next.
> 
> thanks
> -- PMM
> 

Re: [PATCH v2 0/2] hw/arm/raspi: Remove deprecated raspi2/raspi3 aliases
Posted by Willian Rampazzo 2 years, 8 months ago
Hi, Phil,

On Thu, Aug 26, 2021 at 1:49 PM Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
>
> Hi Peter,
>
> On 7/9/21 6:00 PM, Peter Maydell wrote:
> > On Fri, 9 Jul 2021 at 16:33, Peter Maydell <peter.maydell@linaro.org> wrote:
> >>
> >> On Thu, 8 Jul 2021 at 15:55, Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
> >>>
> >>> Since v1:
> >>> - renamed tests (Peter)
> >>>
> >>> Philippe Mathieu-Daudé (2):
> >>>   tests: Remove uses of deprecated raspi2/raspi3 machine names
> >>>   hw/arm/raspi: Remove deprecated raspi2/raspi3 aliases
> >>
> >>
> >>
> >> Applied to target-arm.next, thanks.
> >
> > I found that this seems to break 'make check':
> >
> >  (09/52) tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_arm_raspi2_initrd:
> > ERROR: Could not perform graceful shutdown (40.38 s)
>
> I can not reproduce. Maybe something got changed in Python/Avocado
> since... I'm going to simply respin (updating 6.1 -> 6.2).

I also could not reproduce. I checked and nothing changed on the
Avocado side. The version is still the same on the QEMU side.

>
> >
> > Dropped from target-arm.next.
> >
> > thanks
> > -- PMM
> >
>


Re: [PATCH v2 0/2] hw/arm/raspi: Remove deprecated raspi2/raspi3 aliases
Posted by Philippe Mathieu-Daudé 2 years, 8 months ago
On 8/27/21 8:01 PM, Willian Rampazzo wrote:
> Hi, Phil,
> 
> On Thu, Aug 26, 2021 at 1:49 PM Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
>>
>> Hi Peter,
>>
>> On 7/9/21 6:00 PM, Peter Maydell wrote:
>>> On Fri, 9 Jul 2021 at 16:33, Peter Maydell <peter.maydell@linaro.org> wrote:
>>>>
>>>> On Thu, 8 Jul 2021 at 15:55, Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
>>>>>
>>>>> Since v1:
>>>>> - renamed tests (Peter)
>>>>>
>>>>> Philippe Mathieu-Daudé (2):
>>>>>   tests: Remove uses of deprecated raspi2/raspi3 machine names
>>>>>   hw/arm/raspi: Remove deprecated raspi2/raspi3 aliases
>>>>
>>>>
>>>>
>>>> Applied to target-arm.next, thanks.
>>>
>>> I found that this seems to break 'make check':
>>>
>>>  (09/52) tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_arm_raspi2_initrd:
>>> ERROR: Could not perform graceful shutdown (40.38 s)
>>
>> I can not reproduce. Maybe something got changed in Python/Avocado
>> since... I'm going to simply respin (updating 6.1 -> 6.2).
> 
> I also could not reproduce. I checked and nothing changed on the
> Avocado side. The version is still the same on the QEMU side.

Thanks for double-checking!

Re: [PATCH v2 0/2] hw/arm/raspi: Remove deprecated raspi2/raspi3 aliases
Posted by John Snow 2 years, 7 months ago
On Fri, Aug 27, 2021 at 2:30 PM Philippe Mathieu-Daudé <f4bug@amsat.org>
wrote:

> On 8/27/21 8:01 PM, Willian Rampazzo wrote:
> > Hi, Phil,
> >
> > On Thu, Aug 26, 2021 at 1:49 PM Philippe Mathieu-Daudé <f4bug@amsat.org>
> wrote:
> >>
> >> Hi Peter,
> >>
> >> On 7/9/21 6:00 PM, Peter Maydell wrote:
> >>> On Fri, 9 Jul 2021 at 16:33, Peter Maydell <peter.maydell@linaro.org>
> wrote:
> >>>>
> >>>> On Thu, 8 Jul 2021 at 15:55, Philippe Mathieu-Daudé <f4bug@amsat.org>
> wrote:
> >>>>>
> >>>>> Since v1:
> >>>>> - renamed tests (Peter)
> >>>>>
> >>>>> Philippe Mathieu-Daudé (2):
> >>>>>   tests: Remove uses of deprecated raspi2/raspi3 machine names
> >>>>>   hw/arm/raspi: Remove deprecated raspi2/raspi3 aliases
> >>>>
> >>>>
> >>>>
> >>>> Applied to target-arm.next, thanks.
> >>>
> >>> I found that this seems to break 'make check':
> >>>
> >>>  (09/52)
> tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_arm_raspi2_initrd:
> >>> ERROR: Could not perform graceful shutdown (40.38 s)
> >>
> >> I can not reproduce. Maybe something got changed in Python/Avocado
> >> since... I'm going to simply respin (updating 6.1 -> 6.2).
> >
> > I also could not reproduce. I checked and nothing changed on the
> > Avocado side. The version is still the same on the QEMU side.
>
> Thanks for double-checking!
>
>
Sorry for the long silence.

Did you get this sorted out? I don't recall changing the QEMUMachine code
upstream lately (Though I have been tinkering with it a lot in my own
branches) -- was the root cause of the failure discovered?

--js
Re: [PATCH v2 0/2] hw/arm/raspi: Remove deprecated raspi2/raspi3 aliases
Posted by Philippe Mathieu-Daudé 2 years, 7 months ago
On 9/15/21 2:34 AM, John Snow wrote:
> On Fri, Aug 27, 2021 at 2:30 PM Philippe Mathieu-Daudé <f4bug@amsat.org
> <mailto:f4bug@amsat.org>> wrote:
> 
>     On 8/27/21 8:01 PM, Willian Rampazzo wrote:
>     > Hi, Phil,
>     >
>     > On Thu, Aug 26, 2021 at 1:49 PM Philippe Mathieu-Daudé
>     <f4bug@amsat.org <mailto:f4bug@amsat.org>> wrote:
>     >>
>     >> Hi Peter,
>     >>
>     >> On 7/9/21 6:00 PM, Peter Maydell wrote:
>     >>> On Fri, 9 Jul 2021 at 16:33, Peter Maydell
>     <peter.maydell@linaro.org <mailto:peter.maydell@linaro.org>> wrote:
>     >>>>
>     >>>> On Thu, 8 Jul 2021 at 15:55, Philippe Mathieu-Daudé
>     <f4bug@amsat.org <mailto:f4bug@amsat.org>> wrote:
>     >>>>>
>     >>>>> Since v1:
>     >>>>> - renamed tests (Peter)
>     >>>>>
>     >>>>> Philippe Mathieu-Daudé (2):
>     >>>>>   tests: Remove uses of deprecated raspi2/raspi3 machine names
>     >>>>>   hw/arm/raspi: Remove deprecated raspi2/raspi3 aliases
>     >>>>
>     >>>>
>     >>>>
>     >>>> Applied to target-arm.next, thanks.
>     >>>
>     >>> I found that this seems to break 'make check':
>     >>>
>     >>>  (09/52)
>     tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_arm_raspi2_initrd:
>     >>> ERROR: Could not perform graceful shutdown (40.38 s)
>     >>
>     >> I can not reproduce. Maybe something got changed in Python/Avocado
>     >> since... I'm going to simply respin (updating 6.1 -> 6.2).
>     >
>     > I also could not reproduce. I checked and nothing changed on the
>     > Avocado side. The version is still the same on the QEMU side.
> 
>     Thanks for double-checking!
> 
> 
> Sorry for the long silence.
> 
> Did you get this sorted out? I don't recall changing the QEMUMachine
> code upstream lately (Though I have been tinkering with it a lot in my
> own branches) -- was the root cause of the failure discovered?

No. Peter tested again and it passed, then this eventually got merged.