The following changes since commit 9f0369efb0f2a200f18b1aacd2ef493e22da5351:

  Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (2022-03-08 22:27:34 +0000)

are available in the Git repository at:

  git://github.com/mcayland/qemu.git tags/q800-updates-for-7.0-20220309

for you to fetch changes up to a7a2208862bee2bc4fe55adfd947dc4a15ad0216:

  esp: recreate ESPState current_req after migration (2022-03-09 09:29:10 +0000)

----------------------------------------------------------------
q800-updates-for-7.0 queue

[MCA: this is the current q800 patch queue for 7.0 which I'm picking up on
behalf of Laurent]

----------------------------------------------------------------
Mark Cave-Ayland (22):
      mos6522: add defines for IFR bit flags
      mac_via: use IFR bit flag constants for VIA1 IRQs
      mac_via: use IFR bit flag constants for VIA2 IRQs
      mos6522: switch over to use qdev gpios for IRQs
      mos6522: remove update_irq() and set_sr_int() methods from MOS6522DeviceClass
      mos6522: use device_class_set_parent_reset() to propagate reset to parent
      mos6522: add register names to register read/write trace events
      mos6522: add "info via" HMP command for debugging
      mos6522: record last_irq_levels in mos6522_set_irq()
      mac_via: make SCSI_DATA (DRQ) bit live rather than latched
      mos6522: implement edge-triggering for CA1/2 and CB1/2 control line IRQs
      macio/pmu.c: remove redundant code
      macfb: add VMStateDescription for MacfbNubusState and MacfbSysBusState
      macfb: don't use special irq_state and irq_mask variables in MacfbState
      macfb: increase number of registers saved in MacfbState
      macfb: add VMStateDescription fields for display type and VBL timer
      macfb: set initial value of mode control registers in macfb_common_realize()
      esp: introduce esp_set_pdma_cb() function
      esp: introduce esp_pdma_cb() function
      esp: convert ESPState pdma_cb from a function pointer to an integer
      esp: include the current PDMA callback in the migration stream
      esp: recreate ESPState current_req after migration

 hmp-commands-info.hx         |  15 +++
 hw/display/macfb.c           |  57 +++++++++--
 hw/m68k/q800.c               |   9 +-
 hw/misc/mac_via.c            |  87 +++++++----------
 hw/misc/macio/cuda.c         |   8 +-
 hw/misc/macio/pmu.c          |  40 +-------
 hw/misc/mos6522.c            | 226 ++++++++++++++++++++++++++++++++++++++++---
 hw/misc/trace-events         |   4 +-
 hw/scsi/esp.c                |  87 +++++++++++++++--
 include/hw/display/macfb.h   |   5 +-
 include/hw/misc/mac_via.h    |  46 ++++-----
 include/hw/misc/macio/pmu.h  |   2 -
 include/hw/misc/mos6522.h    |  46 +++++++--
 include/hw/scsi/esp.h        |  11 ++-
 include/monitor/hmp-target.h |   1 +
 15 files changed, 474 insertions(+), 170 deletions(-)

On Wed, 9 Mar 2022 at 11:08, Mark Cave-Ayland
<mark.cave-ayland@ilande.co.uk> wrote:
>
> The following changes since commit 9f0369efb0f2a200f18b1aacd2ef493e22da5351:
>
>   Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (2022-03-08 22:27:34 +0000)
>
> are available in the Git repository at:
>
>   git://github.com/mcayland/qemu.git tags/q800-updates-for-7.0-20220309
>
> for you to fetch changes up to a7a2208862bee2bc4fe55adfd947dc4a15ad0216:
>
>   esp: recreate ESPState current_req after migration (2022-03-09 09:29:10 +0000)
>
> ----------------------------------------------------------------
> q800-updates-for-7.0 queue
>
> [MCA: this is the current q800 patch queue for 7.0 which I'm picking up on
> behalf of Laurent]
>


Applied, thanks.

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

-- PMM

Le 09/03/2022 à 12:08, Mark Cave-Ayland a écrit :
> The following changes since commit 9f0369efb0f2a200f18b1aacd2ef493e22da5351:
> 
>    Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (2022-03-08 22:27:34 +0000)
> 
> are available in the Git repository at:
> 
>    git://github.com/mcayland/qemu.git tags/q800-updates-for-7.0-20220309
> 
> for you to fetch changes up to a7a2208862bee2bc4fe55adfd947dc4a15ad0216:
> 
>    esp: recreate ESPState current_req after migration (2022-03-09 09:29:10 +0000)
> 
> ----------------------------------------------------------------
> q800-updates-for-7.0 queue
> 
> [MCA: this is the current q800 patch queue for 7.0 which I'm picking up on
> behalf of Laurent]

Thank you.

Laurent