[PULL 00/24] s390x and misc patches for 8.0-rc1

Thomas Huth posted 24 patches 1 year ago
MAINTAINERS                                 |    6 +-
tests/tcg/s390x/pgm-specification.mak       |   15 +
include/crypto/aes.h                        |    8 +-
include/crypto/desrfb.h                     |   16 +-
include/disas/dis-asm.h                     |   68 +-
include/elf.h                               | 1800 +++++++++++++--------------
include/exec/cpu-all.h                      |    2 +-
include/hw/acpi/acpi.h                      |    4 +-
include/hw/elf_ops.h                        |   42 +-
include/hw/pci/pci_bridge.h                 |   10 +-
include/hw/pcmcia.h                         |   32 +-
include/hw/scsi/scsi.h                      |    2 +-
include/hw/sd/sd.h                          |    8 +-
include/hw/virtio/virtio.h                  |    2 +-
include/qemu/bitmap.h                       |   52 +-
include/qemu/compiler.h                     |    4 +-
include/qemu/osdep.h                        |    2 +-
include/qemu/uri.h                          |   32 +-
pc-bios/optionrom/optionrom.h               |  262 ++--
target/s390x/cpu.h                          |   11 +
target/s390x/tcg/insn-data.h.inc            |   46 +-
chardev/baum.c                              |   66 +-
hw/char/parallel.c                          |   24 +-
hw/char/serial.c                            |   68 +-
hw/core/loader.c                            |   42 +-
hw/dma/etraxfs_dma.c                        |  834 ++++++-------
hw/gpio/max7310.c                           |   22 +-
hw/input/ads7846.c                          |   54 +-
hw/rtc/m48t59.c                             |  150 +--
hw/rtc/twl92230.c                           |  160 +--
hw/scsi/scsi-bus.c                          |    4 +-
hw/sd/sd.c                                  |  184 +--
hw/watchdog/wdt_ib700.c                     |    2 +-
softmmu/physmem.c                           |    2 +-
target/s390x/cpu.c                          |   26 +
target/s390x/tcg/excp_helper.c              |    7 +-
target/s390x/tcg/mem_helper.c               |   14 +-
target/s390x/tcg/translate.c                |   79 +-
tests/tcg/s390x/ex-relative-long.c          |  156 +++
tests/tcg/s390x/pgm-specification-user.c    |   37 +
tests/tcg/s390x/rxsbg.c                     |   46 +
tests/unit/test-blockjob.c                  |    9 +-
tests/unit/test-rcu-list.c                  |    2 +-
util/bitops.c                               |    8 +-
util/envlist.c                              |  202 +--
tests/tcg/s390x/Makefile.softmmu-target     |   20 +-
tests/tcg/s390x/Makefile.target             |   12 +
tests/tcg/s390x/br-odd.S                    |   16 +
tests/tcg/s390x/cgrl-unaligned.S            |   16 +
tests/tcg/s390x/clrl-unaligned.S            |   16 +
tests/tcg/s390x/crl-unaligned.S             |   16 +
tests/tcg/s390x/ex-odd.S                    |   17 +
tests/tcg/s390x/exrl-ssm-early.S            |   43 +
tests/tcg/s390x/lgrl-unaligned.S            |   16 +
tests/tcg/s390x/llgfrl-unaligned.S          |   16 +
tests/tcg/s390x/lpsw.S                      |   36 +
tests/tcg/s390x/lpswe-early.S               |   38 +
tests/tcg/s390x/lpswe-unaligned.S           |   18 +
tests/tcg/s390x/lrl-unaligned.S             |   16 +
tests/tcg/s390x/pgm-specification-softmmu.S |   40 +
tests/tcg/s390x/softmmu.ld                  |   20 +
tests/tcg/s390x/ssm-early.S                 |   41 +
tests/tcg/s390x/stgrl-unaligned.S           |   16 +
tests/tcg/s390x/stosm-early.S               |   41 +
tests/tcg/s390x/strl-unaligned.S            |   16 +
65 files changed, 2952 insertions(+), 2140 deletions(-)
create mode 100644 tests/tcg/s390x/pgm-specification.mak
create mode 100644 tests/tcg/s390x/ex-relative-long.c
create mode 100644 tests/tcg/s390x/pgm-specification-user.c
create mode 100644 tests/tcg/s390x/rxsbg.c
create mode 100644 tests/tcg/s390x/br-odd.S
create mode 100644 tests/tcg/s390x/cgrl-unaligned.S
create mode 100644 tests/tcg/s390x/clrl-unaligned.S
create mode 100644 tests/tcg/s390x/crl-unaligned.S
create mode 100644 tests/tcg/s390x/ex-odd.S
create mode 100644 tests/tcg/s390x/exrl-ssm-early.S
create mode 100644 tests/tcg/s390x/lgrl-unaligned.S
create mode 100644 tests/tcg/s390x/llgfrl-unaligned.S
create mode 100644 tests/tcg/s390x/lpsw.S
create mode 100644 tests/tcg/s390x/lpswe-early.S
create mode 100644 tests/tcg/s390x/lpswe-unaligned.S
create mode 100644 tests/tcg/s390x/lrl-unaligned.S
create mode 100644 tests/tcg/s390x/pgm-specification-softmmu.S
create mode 100644 tests/tcg/s390x/softmmu.ld
create mode 100644 tests/tcg/s390x/ssm-early.S
create mode 100644 tests/tcg/s390x/stgrl-unaligned.S
create mode 100644 tests/tcg/s390x/stosm-early.S
create mode 100644 tests/tcg/s390x/strl-unaligned.S
[PULL 00/24] s390x and misc patches for 8.0-rc1
Posted by Thomas Huth 1 year ago
 Hi Peter!

The following changes since commit 74c581b6452394e591f13beba9fea2ec0688e2f5:

  Merge tag 'trivial-branch-for-8.0-pull-request' of https://gitlab.com/laurent_vivier/qemu into staging (2023-03-17 14:22:01 +0000)

are available in the Git repository at:

  https://gitlab.com/thuth/qemu.git tags/pull-request-2023-03-20

for you to fetch changes up to 48805df9c22a0700fba4b3b548fafaa21726ca68:

  replace TABs with spaces (2023-03-20 12:43:50 +0100)

----------------------------------------------------------------
* Mark Nios II as orphan
* Many s390x emulation fixes
* Disable flaky complete_in_standby blockjob unit test
* White space cleanups in various files

----------------------------------------------------------------
Bernhard Beschow (1):
      qemu/osdep: Switch position of "extern" and "G_NORETURN"

Ilya Leoshkevich (19):
      target/s390x: Fix LPSW
      target/s390x: Implement Early Exception Recognition
      tests/tcg/s390x: Add PSW modification tests
      target/s390x: Fix R[NOX]SBG with T=1
      tests/tcg/s390x: Add rxsbg.c
      target/s390x: Fix EXECUTE of relative long instructions
      tests/tcg/s390x: Add ex-relative-long.c
      target/s390x: Handle branching to odd addresses
      target/s390x: Handle EXECUTE of odd addresses
      target/s390x: Handle LGRL from non-aligned addresses
      target/s390x: Handle LRL and LGFRL from non-aligned addresses
      target/s390x: Handle LLGFRL from non-aligned addresses
      target/s390x: Handle CRL and CGFRL with non-aligned addresses
      target/s390x: Handle CGRL and CLGRL with non-aligned addresses
      target/s390x: Handle CLRL and CLGFRL with non-aligned addresses
      target/s390x: Handle STRL to non-aligned addresses
      target/s390x: Handle STGRL to non-aligned addresses
      target/s390x: Update do_unaligned_access() comment
      tests/tcg/s390x: Test unaligned accesses

Peter Maydell (1):
      tests/unit/test-blockjob: Disable complete_in_standby test

Thomas Huth (2):
      MAINTAINERS: Mark the Nios II CPU as orphan
      target/s390x/tcg/mem_helper: Remove bad assert() statement

Yeqi Fu (1):
      replace TABs with spaces

 MAINTAINERS                                 |    6 +-
 tests/tcg/s390x/pgm-specification.mak       |   15 +
 include/crypto/aes.h                        |    8 +-
 include/crypto/desrfb.h                     |   16 +-
 include/disas/dis-asm.h                     |   68 +-
 include/elf.h                               | 1800 +++++++++++++--------------
 include/exec/cpu-all.h                      |    2 +-
 include/hw/acpi/acpi.h                      |    4 +-
 include/hw/elf_ops.h                        |   42 +-
 include/hw/pci/pci_bridge.h                 |   10 +-
 include/hw/pcmcia.h                         |   32 +-
 include/hw/scsi/scsi.h                      |    2 +-
 include/hw/sd/sd.h                          |    8 +-
 include/hw/virtio/virtio.h                  |    2 +-
 include/qemu/bitmap.h                       |   52 +-
 include/qemu/compiler.h                     |    4 +-
 include/qemu/osdep.h                        |    2 +-
 include/qemu/uri.h                          |   32 +-
 pc-bios/optionrom/optionrom.h               |  262 ++--
 target/s390x/cpu.h                          |   11 +
 target/s390x/tcg/insn-data.h.inc            |   46 +-
 chardev/baum.c                              |   66 +-
 hw/char/parallel.c                          |   24 +-
 hw/char/serial.c                            |   68 +-
 hw/core/loader.c                            |   42 +-
 hw/dma/etraxfs_dma.c                        |  834 ++++++-------
 hw/gpio/max7310.c                           |   22 +-
 hw/input/ads7846.c                          |   54 +-
 hw/rtc/m48t59.c                             |  150 +--
 hw/rtc/twl92230.c                           |  160 +--
 hw/scsi/scsi-bus.c                          |    4 +-
 hw/sd/sd.c                                  |  184 +--
 hw/watchdog/wdt_ib700.c                     |    2 +-
 softmmu/physmem.c                           |    2 +-
 target/s390x/cpu.c                          |   26 +
 target/s390x/tcg/excp_helper.c              |    7 +-
 target/s390x/tcg/mem_helper.c               |   14 +-
 target/s390x/tcg/translate.c                |   79 +-
 tests/tcg/s390x/ex-relative-long.c          |  156 +++
 tests/tcg/s390x/pgm-specification-user.c    |   37 +
 tests/tcg/s390x/rxsbg.c                     |   46 +
 tests/unit/test-blockjob.c                  |    9 +-
 tests/unit/test-rcu-list.c                  |    2 +-
 util/bitops.c                               |    8 +-
 util/envlist.c                              |  202 +--
 tests/tcg/s390x/Makefile.softmmu-target     |   20 +-
 tests/tcg/s390x/Makefile.target             |   12 +
 tests/tcg/s390x/br-odd.S                    |   16 +
 tests/tcg/s390x/cgrl-unaligned.S            |   16 +
 tests/tcg/s390x/clrl-unaligned.S            |   16 +
 tests/tcg/s390x/crl-unaligned.S             |   16 +
 tests/tcg/s390x/ex-odd.S                    |   17 +
 tests/tcg/s390x/exrl-ssm-early.S            |   43 +
 tests/tcg/s390x/lgrl-unaligned.S            |   16 +
 tests/tcg/s390x/llgfrl-unaligned.S          |   16 +
 tests/tcg/s390x/lpsw.S                      |   36 +
 tests/tcg/s390x/lpswe-early.S               |   38 +
 tests/tcg/s390x/lpswe-unaligned.S           |   18 +
 tests/tcg/s390x/lrl-unaligned.S             |   16 +
 tests/tcg/s390x/pgm-specification-softmmu.S |   40 +
 tests/tcg/s390x/softmmu.ld                  |   20 +
 tests/tcg/s390x/ssm-early.S                 |   41 +
 tests/tcg/s390x/stgrl-unaligned.S           |   16 +
 tests/tcg/s390x/stosm-early.S               |   41 +
 tests/tcg/s390x/strl-unaligned.S            |   16 +
 65 files changed, 2952 insertions(+), 2140 deletions(-)
 create mode 100644 tests/tcg/s390x/pgm-specification.mak
 create mode 100644 tests/tcg/s390x/ex-relative-long.c
 create mode 100644 tests/tcg/s390x/pgm-specification-user.c
 create mode 100644 tests/tcg/s390x/rxsbg.c
 create mode 100644 tests/tcg/s390x/br-odd.S
 create mode 100644 tests/tcg/s390x/cgrl-unaligned.S
 create mode 100644 tests/tcg/s390x/clrl-unaligned.S
 create mode 100644 tests/tcg/s390x/crl-unaligned.S
 create mode 100644 tests/tcg/s390x/ex-odd.S
 create mode 100644 tests/tcg/s390x/exrl-ssm-early.S
 create mode 100644 tests/tcg/s390x/lgrl-unaligned.S
 create mode 100644 tests/tcg/s390x/llgfrl-unaligned.S
 create mode 100644 tests/tcg/s390x/lpsw.S
 create mode 100644 tests/tcg/s390x/lpswe-early.S
 create mode 100644 tests/tcg/s390x/lpswe-unaligned.S
 create mode 100644 tests/tcg/s390x/lrl-unaligned.S
 create mode 100644 tests/tcg/s390x/pgm-specification-softmmu.S
 create mode 100644 tests/tcg/s390x/softmmu.ld
 create mode 100644 tests/tcg/s390x/ssm-early.S
 create mode 100644 tests/tcg/s390x/stgrl-unaligned.S
 create mode 100644 tests/tcg/s390x/stosm-early.S
 create mode 100644 tests/tcg/s390x/strl-unaligned.S
Re: [PULL 00/24] s390x and misc patches for 8.0-rc1
Posted by Thomas Huth 1 year ago
On 20/03/2023 14.03, Thomas Huth wrote:
>   Hi Peter!
> 
> The following changes since commit 74c581b6452394e591f13beba9fea2ec0688e2f5:
> 
>    Merge tag 'trivial-branch-for-8.0-pull-request' of https://gitlab.com/laurent_vivier/qemu into staging (2023-03-17 14:22:01 +0000)
> 
> are available in the Git repository at:
> 
>    https://gitlab.com/thuth/qemu.git tags/pull-request-2023-03-20
> 
> for you to fetch changes up to 48805df9c22a0700fba4b3b548fafaa21726ca68:
> 
>    replace TABs with spaces (2023-03-20 12:43:50 +0100)

  Hi Peter,

FYI, since you likely did not put this into your CI branch yet, I did a 
small fix on top: I replaced the patch that fixes osdep.h with the one by 
Philippe, since it was slightly better (removing the "extern" keyword 
instead of swapping it).

New commit ID for the tag is now: c29e73f7e65299ed9261abce3950710d89c64724

I hope that's ok, if not, please let me know.

  Thomas
Re: [PULL 00/24] s390x and misc patches for 8.0-rc1
Posted by Peter Maydell 1 year ago
On Mon, 20 Mar 2023 at 14:02, Thomas Huth <thuth@redhat.com> wrote:
>
> On 20/03/2023 14.03, Thomas Huth wrote:
> >   Hi Peter!
> >
> > The following changes since commit 74c581b6452394e591f13beba9fea2ec0688e2f5:
> >
> >    Merge tag 'trivial-branch-for-8.0-pull-request' of https://gitlab.com/laurent_vivier/qemu into staging (2023-03-17 14:22:01 +0000)
> >
> > are available in the Git repository at:
> >
> >    https://gitlab.com/thuth/qemu.git tags/pull-request-2023-03-20
> >
> > for you to fetch changes up to 48805df9c22a0700fba4b3b548fafaa21726ca68:
> >
> >    replace TABs with spaces (2023-03-20 12:43:50 +0100)
>
>   Hi Peter,
>
> FYI, since you likely did not put this into your CI branch yet, I did a
> small fix on top: I replaced the patch that fixes osdep.h with the one by
> Philippe, since it was slightly better (removing the "extern" keyword
> instead of swapping it).
>
> New commit ID for the tag is now: c29e73f7e65299ed9261abce3950710d89c64724
>
> I hope that's ok, if not, please let me know.

Ah, I've already merged the old tag into staging for the CI
run. I could drop it and re-do, but we'd burn another lot of
CI minutes on it. Is that worth doing?

thanks
-- PMM
Re: [PULL 00/24] s390x and misc patches for 8.0-rc1
Posted by Philippe Mathieu-Daudé 1 year ago
On 20/3/23 16:10, Peter Maydell wrote:
> On Mon, 20 Mar 2023 at 14:02, Thomas Huth <thuth@redhat.com> wrote:
>>
>> On 20/03/2023 14.03, Thomas Huth wrote:
>>>    Hi Peter!
>>>
>>> The following changes since commit 74c581b6452394e591f13beba9fea2ec0688e2f5:
>>>
>>>     Merge tag 'trivial-branch-for-8.0-pull-request' of https://gitlab.com/laurent_vivier/qemu into staging (2023-03-17 14:22:01 +0000)
>>>
>>> are available in the Git repository at:
>>>
>>>     https://gitlab.com/thuth/qemu.git tags/pull-request-2023-03-20
>>>
>>> for you to fetch changes up to 48805df9c22a0700fba4b3b548fafaa21726ca68:
>>>
>>>     replace TABs with spaces (2023-03-20 12:43:50 +0100)
>>
>>    Hi Peter,
>>
>> FYI, since you likely did not put this into your CI branch yet, I did a
>> small fix on top: I replaced the patch that fixes osdep.h with the one by
>> Philippe, since it was slightly better (removing the "extern" keyword
>> instead of swapping it).
>>
>> New commit ID for the tag is now: c29e73f7e65299ed9261abce3950710d89c64724
>>
>> I hope that's ok, if not, please let me know.
> 
> Ah, I've already merged the old tag into staging for the CI
> run. I could drop it and re-do, but we'd burn another lot of
> CI minutes on it. Is that worth doing?

Nah, what is worth is getting CI green and saving minutes :)
Re: [PULL 00/24] s390x and misc patches for 8.0-rc1
Posted by Thomas Huth 1 year ago
On 20/03/2023 16.27, Philippe Mathieu-Daudé wrote:
> On 20/3/23 16:10, Peter Maydell wrote:
>> On Mon, 20 Mar 2023 at 14:02, Thomas Huth <thuth@redhat.com> wrote:
>>>
>>> On 20/03/2023 14.03, Thomas Huth wrote:
>>>>    Hi Peter!
>>>>
>>>> The following changes since commit 
>>>> 74c581b6452394e591f13beba9fea2ec0688e2f5:
>>>>
>>>>     Merge tag 'trivial-branch-for-8.0-pull-request' of 
>>>> https://gitlab.com/laurent_vivier/qemu into staging (2023-03-17 14:22:01 
>>>> +0000)
>>>>
>>>> are available in the Git repository at:
>>>>
>>>>     https://gitlab.com/thuth/qemu.git tags/pull-request-2023-03-20
>>>>
>>>> for you to fetch changes up to 48805df9c22a0700fba4b3b548fafaa21726ca68:
>>>>
>>>>     replace TABs with spaces (2023-03-20 12:43:50 +0100)
>>>
>>>    Hi Peter,
>>>
>>> FYI, since you likely did not put this into your CI branch yet, I did a
>>> small fix on top: I replaced the patch that fixes osdep.h with the one by
>>> Philippe, since it was slightly better (removing the "extern" keyword
>>> instead of swapping it).
>>>
>>> New commit ID for the tag is now: c29e73f7e65299ed9261abce3950710d89c64724
>>>
>>> I hope that's ok, if not, please let me know.
>>
>> Ah, I've already merged the old tag into staging for the CI
>> run. I could drop it and re-do, but we'd burn another lot of
>> CI minutes on it. Is that worth doing?
> 
> Nah, what is worth is getting CI green and saving minutes :)

Agreed, it was a rather cosmetic change - and I'm pretty sure Philippe will 
fix it in the 8.1 cycle instead :-)

  Thomas


Re: [PULL 00/24] s390x and misc patches for 8.0-rc1
Posted by Peter Maydell 1 year ago
On Mon, 20 Mar 2023 at 13:03, Thomas Huth <thuth@redhat.com> wrote:
>
>  Hi Peter!
>
> The following changes since commit 74c581b6452394e591f13beba9fea2ec0688e2f5:
>
>   Merge tag 'trivial-branch-for-8.0-pull-request' of https://gitlab.com/laurent_vivier/qemu into staging (2023-03-17 14:22:01 +0000)
>
> are available in the Git repository at:
>
>   https://gitlab.com/thuth/qemu.git tags/pull-request-2023-03-20
>
> for you to fetch changes up to 48805df9c22a0700fba4b3b548fafaa21726ca68:
>
>   replace TABs with spaces (2023-03-20 12:43:50 +0100)
>
> ----------------------------------------------------------------
> * Mark Nios II as orphan
> * Many s390x emulation fixes
> * Disable flaky complete_in_standby blockjob unit test
> * White space cleanups in various files
>
> ----------------------------------------------------------------


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/8.0
for any user-visible changes.

-- PMM