The following changes since commit 6b54a31bf7b403672a798b6443b1930ae6c74dea:

  Merge remote-tracking branch 'remotes/jsnow-gitlab/tags/python-pull-request' into staging (2021-09-28 13:07:32 +0100)

are available in the Git repository at:

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

for you to fetch changes up to 5ef251416b5116bbf7723f31ddf8a6949a2ac271:

  q800: configure nubus available slots for Quadra 800 (2021-09-29 10:45:19 +0200)

----------------------------------------------------------------
Q800 Pull request 20210929

NuBus cleanup and improvement

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

Mark Cave-Ayland (20):
  nubus: add comment indicating reference documents
  nubus-device: rename slot_nb variable to slot
  nubus-device: expose separate super slot memory region
  nubus: use bitmap to manage available slots
  nubus: move slot bitmap checks from NubusDevice realize() to BusClass
    check_address()
  nubus: implement BusClass get_dev_path()
  nubus: add trace-events for empty slot accesses
  nubus: generate bus error when attempting to access empty slots
  macfb: don't register declaration ROM
  nubus-device: remove nubus_register_rom() and
    nubus_register_format_block()
  nubus-device: add romfile property for loading declaration ROMs
  nubus: move nubus to its own 32-bit address space
  nubus-bridge: introduce separate NubusBridge structure
  mac-nubus-bridge: rename MacNubusState to MacNubusBridge
  nubus: move NubusBus from mac-nubus-bridge to nubus-bridge
  nubus-bridge: embed the NubusBus object directly within nubus-bridge
  nubus-bridge: make slot_available_mask a qdev property
  nubus: add support for slot IRQs
  q800: wire up nubus IRQs
  q800: configure nubus available slots for Quadra 800

 meson.build                         |   1 +
 hw/nubus/trace.h                    |   1 +
 include/hw/nubus/mac-nubus-bridge.h |  13 +-
 include/hw/nubus/nubus.h            |  49 +++---
 hw/display/macfb.c                  |   6 -
 hw/m68k/q800.c                      |  26 +++-
 hw/nubus/mac-nubus-bridge.c         |  34 ++++-
 hw/nubus/nubus-bridge.c             |  23 ++-
 hw/nubus/nubus-bus.c                | 120 ++++++++++++---
 hw/nubus/nubus-device.c             | 227 ++++++++--------------------
 hw/nubus/trace-events               |   7 +
 11 files changed, 278 insertions(+), 229 deletions(-)
 create mode 100644 hw/nubus/trace.h
 create mode 100644 hw/nubus/trace-events

-- 
2.31.1

On Wed, 29 Sept 2021 at 10:32, Laurent Vivier <laurent@vivier.eu> wrote:
>
> The following changes since commit 6b54a31bf7b403672a798b6443b1930ae6c74dea:
>
>   Merge remote-tracking branch 'remotes/jsnow-gitlab/tags/python-pull-request' into staging (2021-09-28 13:07:32 +0100)
>
> are available in the Git repository at:
>
>   git://github.com/vivier/qemu-m68k.git tags/q800-for-6.2-pull-request
>
> for you to fetch changes up to 5ef251416b5116bbf7723f31ddf8a6949a2ac271:
>
>   q800: configure nubus available slots for Quadra 800 (2021-09-29 10:45:19 +0200)
>
> ----------------------------------------------------------------
> Q800 Pull request 20210929
>
> NuBus cleanup and improvement
>

Applied, thanks.

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

-- PMM