[Qemu-commits] [qemu/qemu] 214bdf: hw: m68k: Add virt compat machine type for 7.0

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 214bdf8e7199a34fe6f46ac7a83b61d8cc3f8ad0
      
https://github.com/qemu/qemu/commit/214bdf8e7199a34fe6f46ac7a83b61d8cc3f8ad0
  Author: Laurent Vivier <laurent@vivier.eu>
  Date:   2022-01-09 (Sun, 09 Jan 2022)

  Changed paths:
    M hw/m68k/virt.c

  Log Message:
  -----------
  hw: m68k: Add virt compat machine type for 7.0

Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Message-Id: <20211218114340.1856757-1-laurent@vivier.eu>


  Commit: 0969e00b3933a10a481f5bc13c834bf1abbc438d
      
https://github.com/qemu/qemu/commit/0969e00b3933a10a481f5bc13c834bf1abbc438d
  Author: Laurent Vivier <laurent@vivier.eu>
  Date:   2022-01-09 (Sun, 09 Jan 2022)

  Changed paths:
    M hw/m68k/q800.c

  Log Message:
  -----------
  q800: fix segfault with invalid MacROM

"qemu-system-m68k -M q800 -bios /dev/null" crashes with a segfault
in q800_init().
This happens because the code doesn't check that rom_ptr() returned
a non-NULL pointer .

To avoid NULL pointer, don't allow 0 sized file and use bios_size with
rom_ptr().

Resolves: https://gitlab.com/qemu-project/qemu/-/issues/756
Reported-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Message-Id: <20220107105049.961489-1-laurent@vivier.eu>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: 4e136629f003d0f5be2985b15176acbec2c5a344
      
https://github.com/qemu/qemu/commit/4e136629f003d0f5be2985b15176acbec2c5a344
  Author: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
  Date:   2022-01-09 (Sun, 09 Jan 2022)

  Changed paths:
    M hw/display/macfb.c

  Log Message:
  -----------
  macfb: fix VRAM dirty memory region logging

The macfb VRAM memory region was configured with coalescing rather than dirty
memory logging enabled, causing some areas of the screen not to redraw after
a full screen update.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Fixes: 8ac919a065 ("hw/m68k: add Nubus macfb video card")
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20220108164147.30813-1-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: 31144eb6393b66b06a13e8a6ad0e730f9e82d4c6
      
https://github.com/qemu/qemu/commit/31144eb6393b66b06a13e8a6ad0e730f9e82d4c6
  Author: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
  Date:   2022-01-09 (Sun, 09 Jan 2022)

  Changed paths:
    M target/m68k/op_helper.c

  Log Message:
  -----------
  target/m68k: don't word align SP in stack frame if 
M68K_FEATURE_UNALIGNED_DATA feature enabled

Commit a9431a03f7 ("target/m68k: add M68K_FEATURE_UNALIGNED_DATA feature") added
a new feature for processors from the 68020 onwards which do not require data
accesses to be word aligned.

Unfortunately the original commit missed an additional case whereby the SP is
still word aligned when setting up an additional format 1 stack frame so add the
necessary M68K_FEATURE_UNALIGNED_DATA feature guard.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Fixes: a9431a03f7 ("target/m68k: add M68K_FEATURE_UNALIGNED_DATA feature")
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20220108180453.18680-1-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: de3f5223fa4cf8bfc5e3fe1fd495ddf468edcdf7
      
https://github.com/qemu/qemu/commit/de3f5223fa4cf8bfc5e3fe1fd495ddf468edcdf7
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2022-01-10 (Mon, 10 Jan 2022)

  Changed paths:
    M hw/display/macfb.c
    M hw/m68k/q800.c
    M hw/m68k/virt.c
    M target/m68k/op_helper.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/vivier/tags/m68k-for-7.0-pull-request' 
into staging

M68k pull request 20220109

Add virt compat machine type for 7.0
fix q800 -bios parameter
fix VRAM refresh
fix M68K_FEATURE_UNALIGNED_DATA feature

# gpg: Signature made Sun 09 Jan 2022 11:41:19 GMT
# gpg:                using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
# gpg:                issuer "laurent@vivier.eu"
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg:                 aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg:                 aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" 
[full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C

* remotes/vivier/tags/m68k-for-7.0-pull-request:
  target/m68k: don't word align SP in stack frame if 
M68K_FEATURE_UNALIGNED_DATA feature enabled
  macfb: fix VRAM dirty memory region logging
  q800: fix segfault with invalid MacROM
  hw: m68k: Add virt compat machine type for 7.0

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


Compare: https://github.com/qemu/qemu/compare/df722e33d5da...de3f5223fa4c