[Qemu-commits] [qemu/qemu] 5c00ac: vga: merge conditionals on shift control register

[Peter Maydell]

  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: 5c00acebb6fb92ff169b322c9e74d06d8b922232
      
https://github.com/qemu/qemu/commit/5c00acebb6fb92ff169b322c9e74d06d8b922232
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2024-04-02 (Tue, 02 Apr 2024)

  Changed paths:
    M hw/display/vga.c

  Log Message:
  -----------
  vga: merge conditionals on shift control register

There are two sets of conditionals using the shift control bits: one to
verify the palette and adjust disp_width, one to compute the "v" and
"bits" variables.  Merge them into one, with the extra benefit that
we now have the "bits" value available early and can use it to
compute region_end.

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 3826a372e4aafac1dba9ba3434e7c2f76775de42
      
https://github.com/qemu/qemu/commit/3826a372e4aafac1dba9ba3434e7c2f76775de42
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2024-04-02 (Tue, 02 Apr 2024)

  Changed paths:
    M hw/display/vga.c

  Log Message:
  -----------
  vga: move computation of dirty memory region later

Move the computation of region_start and region_end after the value of
"bits" is known.  This makes it possible to distinguish modes that
support horizontal pel panning from modes that do not.

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 3b6d2b1962b23295c463f010ff88eb5a594f2ef9
      
https://github.com/qemu/qemu/commit/3b6d2b1962b23295c463f010ff88eb5a594f2ef9
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2024-04-02 (Tue, 02 Apr 2024)

  Changed paths:
    M hw/display/vga.c

  Log Message:
  -----------
  vga: adjust dirty memory region if pel panning is active

When pel panning is active, one more byte is read from each of the VGA
memory planes.  This has to be accounted in the computation of region_end,
otherwise vga_draw_graphic() fails an assertion:

qemu-system-i386: ../system/physmem.c:946: 
cpu_physical_memory_snapshot_get_dirty: Assertion `start + length <= snap->end' 
failed.

Reported-by: Helge Konetzka <hk@zapateado.de>
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2244
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 1d1ee7e0a1b7041804e8c5f8c2453fdc2df0407e
      
https://github.com/qemu/qemu/commit/1d1ee7e0a1b7041804e8c5f8c2453fdc2df0407e
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2024-04-02 (Tue, 02 Apr 2024)

  Changed paths:
    M hw/display/vga.c

  Log Message:
  -----------
  vga: do not treat horiz pel panning value of 8 as "enabled"

Horizontal pel panning bit 3 is only used in text mode.  In graphics
mode, it can be treated as if it was zero, thus not extending the
dirty memory region.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: e497e6a55786a62ffe009a3fe2fa6d40e6080210
      
https://github.com/qemu/qemu/commit/e497e6a55786a62ffe009a3fe2fa6d40e6080210
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2024-04-02 (Tue, 02 Apr 2024)

  Changed paths:
    M hw/scsi/lsi53c895a.c

  Log Message:
  -----------
  lsi53c895a: avoid out of bounds access to s->msg[]

If no bytes are there to process in the message in phase,
the input data latch (s->sidl) is set to s->msg[-1].  Just
do nothing since no DMA is performed.

Reported-by: Chuhong Yuan <hslester96@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 8fc4bdc537d901c200e43122e32bcb40dc8fed37
      
https://github.com/qemu/qemu/commit/8fc4bdc537d901c200e43122e32bcb40dc8fed37
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2024-04-02 (Tue, 02 Apr 2024)

  Changed paths:
    M hw/i386/pc_q35.c

  Log Message:
  -----------
  pc_q35: remove unnecessary m->alias assignment

The assignment is already inherited from pc-q35-8.2.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: e5c6528dce86d7a9ada7ecf02fcb7b8560955131
      
https://github.com/qemu/qemu/commit/e5c6528dce86d7a9ada7ecf02fcb7b8560955131
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2024-04-02 (Tue, 02 Apr 2024)

  Changed paths:
    M VERSION

  Log Message:
  -----------
  Update version for v9.0.0-rc2 release

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


  Commit: 786fd793b81410fb2a28914315e2f05d2ff6733b
      
https://github.com/qemu/qemu/commit/786fd793b81410fb2a28914315e2f05d2ff6733b
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2024-04-03 (Wed, 03 Apr 2024)

  Changed paths:
    M hw/display/vga.c
    M hw/i386/pc_q35.c
    M hw/scsi/lsi53c895a.c

  Log Message:
  -----------
  Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging

* lsi53c895a: fix assertion failure with invalid Block Move
* vga: fix assertion failure with 4- and 16-color modes
* remove unnecessary assignment

# -----BEGIN PGP SIGNATURE-----
#
# iQFIBAABCAAyFiEE8TM4V0tmI4mGbHaCv/vSX3jHroMFAmYNKboUHHBib256aW5p
# QHJlZGhhdC5jb20ACgkQv/vSX3jHroNMDgf/Wgw+qNkNooAhEH1V5l0xdyiF4QQU
# stz4kcKdWkQB5dsVy8utC3nN2baRFPgj6Utr2e8FqzxGuY8qYL3olh8k1ygiFiFz
# joSOxAlBuRUOsJq90EJUyGeFykJ/F/neJ2n6VjOtKyry9c8PnInjmuNMFYsxeLow
# j1VF6defALut/8wvxPm5WmfFzS1Hv3I9k/GqKSlAjNpY2COlibshEoNFuZZtpfeI
# JnUL5oB+sICoZH2/mM5a9Nv2z0NCHAwKF7alXVjfHWvdaRQO6bLlraDmPXmh0ZMY
# MsoULMQaeZCtC0vfc8XJZj/C/s2iO14gfqA23/mfGCLalyo7l1yh4e6JyQ==
# =xDOl
# -----END PGP SIGNATURE-----
# gpg: Signature made Wed 03 Apr 2024 11:04:42 BST
# gpg:                using RSA key F13338574B662389866C7682BFFBD25F78C7AE83
# gpg:                issuer "pbonzini@redhat.com"
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [full]
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>" [full]
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4  E2F7 7E15 100C CD36 69B1
#      Subkey fingerprint: F133 3857 4B66 2389 866C  7682 BFFB D25F 78C7 AE83

* tag 'for-upstream' of https://gitlab.com/bonzini/qemu:
  pc_q35: remove unnecessary m->alias assignment
  lsi53c895a: avoid out of bounds access to s->msg[]
  vga: do not treat horiz pel panning value of 8 as "enabled"
  vga: adjust dirty memory region if pel panning is active
  vga: move computation of dirty memory region later
  vga: merge conditionals on shift control register

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


Compare: https://github.com/qemu/qemu/compare/5456f2e235a2...786fd793b814

To unsubscribe from these emails, change your notification settings at 
https://github.com/qemu/qemu/settings/notifications