[PULL 00/12] Q800 patches

Laurent Vivier posted 12 patches 2 years, 6 months ago
Failed in applying to current master (apply log)
There is a newer version of this series
include/hw/misc/mac_via.h | 101 ++++---
hw/m68k/q800.c            |  38 +--
hw/misc/mac_via.c         | 547 ++++++++++++++++++--------------------
3 files changed, 328 insertions(+), 358 deletions(-)
[PULL 00/12] Q800 patches
Posted by Laurent Vivier 2 years, 6 months ago
The following changes since commit abf7aee72ea66944a62962603e4c2381f5e473e7:

  Merge remote-tracking branch 'remotes/thuth-gitlab/tags/s390x-pull-request-2021-09-07' into staging (2021-09-07 17:46:13 +0100)

are available in the Git repository at:

  git://github.com/vivier/qemu-m68k.git tags/q800-pull-request

for you to fetch changes up to dde602ae539910c3579952834b713e2f360ec34a:

  mac_via: add qdev gpios for nubus slot interrupts to VIA2 (2021-09-08 15:37:41 +0200)

----------------------------------------------------------------
q800 pull request 20210908

mac_via: remove MAC_VIA device and prepare for Nubus IRQs

----------------------------------------------------------------

Mark Cave-Ayland (12):
  mac_via: introduce new VMStateDescription for q800 VIA1 and VIA2
  mac_via: move last_b variable into q800 VIA1 VMStateDescription
  mac_via: move PRAM contents and block backend to MOS6522Q800VIA1State
  mac_via: move PRAM/RTC variables to MOS6522Q800VIA1State
  mac_via: move ADB variables to MOS6522Q800VIA1State
  mac_via: move q800 VIA1 timer variables to q800 VIA1
    VMStateDescription
  mac_via: move VIA1 reset logic from mac_via_reset() to
    mos6522_q800_via1_reset()
  mac_via: move VIA1 realize logic from mac_via_realize() to
    mos6522_q800_via1_realize()
  mac_via: remove mac_via device
  mac_via: remove explicit viaN prefix from VIA IRQ gpios
  mac_via: rename VIA2_IRQ_SLOT_BIT to VIA2_IRQ_NUBUS_BIT
  mac_via: add qdev gpios for nubus slot interrupts to VIA2

 include/hw/misc/mac_via.h | 101 ++++---
 hw/m68k/q800.c            |  38 +--
 hw/misc/mac_via.c         | 547 ++++++++++++++++++--------------------
 3 files changed, 328 insertions(+), 358 deletions(-)

-- 
2.31.1


Re: [PULL 00/12] Q800 patches
Posted by Peter Maydell 2 years, 6 months ago
On Wed, 8 Sept 2021 at 16:40, Laurent Vivier <laurent@vivier.eu> wrote:
>
> The following changes since commit abf7aee72ea66944a62962603e4c2381f5e473e7:
>
>   Merge remote-tracking branch 'remotes/thuth-gitlab/tags/s390x-pull-request-2021-09-07' into staging (2021-09-07 17:46:13 +0100)
>
> are available in the Git repository at:
>
>   git://github.com/vivier/qemu-m68k.git tags/q800-pull-request
>
> for you to fetch changes up to dde602ae539910c3579952834b713e2f360ec34a:
>
>   mac_via: add qdev gpios for nubus slot interrupts to VIA2 (2021-09-08 15:37:41 +0200)
>
> ----------------------------------------------------------------
> q800 pull request 20210908
>
> mac_via: remove MAC_VIA device and prepare for Nubus IRQs
>


Applied, thanks.

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

-- PMM