[Qemu-commits] [qemu/qemu] 17de3d: mac_via: introduce new VMStateDescrip

qemu-commits
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [qemu/qemu] 17de3d: mac_via: introduce new VMStateDescrip

From:	Peter Maydell
Subject:	[Qemu-commits] [qemu/qemu] 17de3d: mac_via: introduce new VMStateDescription for q800...
Date:	Fri, 10 Sep 2021 05:21:06 -0700
  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 17de3d578710368381b897654e1b7b77f43be875
      
https://github.com/qemu/qemu/commit/17de3d578710368381b897654e1b7b77f43be875
  Author: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
  Date:   2021-09-08 (Wed, 08 Sep 2021)

  Changed paths:
    M hw/misc/mac_via.c

  Log Message:
  -----------
  mac_via: introduce new VMStateDescription for q800 VIA1 and VIA2

Move the parent mos6522 objects from vmstate_mac_via into the new 
VMStateDescription
structures to begin the process of splitting MacVIAState into separate VIA1 and
VIA2 devices.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20210830102447.10806-2-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: ae6f236f4fcb61eb0e3761bab034cd562accf509
      
https://github.com/qemu/qemu/commit/ae6f236f4fcb61eb0e3761bab034cd562accf509
  Author: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
  Date:   2021-09-08 (Wed, 08 Sep 2021)

  Changed paths:
    M hw/misc/mac_via.c

  Log Message:
  -----------
  mac_via: move last_b variable into q800 VIA1 VMStateDescription

This variable is already present in MOS6522Q800VIA1State and can be moved
immediately into the q800 VIA1 VMStateDescription.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20210830102447.10806-3-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: 8064d7bb54cf4e4b7bacb2020bbe2e2132aa7407
      
https://github.com/qemu/qemu/commit/8064d7bb54cf4e4b7bacb2020bbe2e2132aa7407
  Author: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
  Date:   2021-09-08 (Wed, 08 Sep 2021)

  Changed paths:
    M hw/misc/mac_via.c
    M include/hw/misc/mac_via.h

  Log Message:
  -----------
  mac_via: move PRAM contents and block backend to MOS6522Q800VIA1State

The PRAM contents are accessed using clock and data pins on q800 VIA1 port B
and so can be moved to MOS6522Q800VIA1State.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20210830102447.10806-4-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: 741258b06cd5fa834fc826c8f308fc18fe1dab35
      
https://github.com/qemu/qemu/commit/741258b06cd5fa834fc826c8f308fc18fe1dab35
  Author: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
  Date:   2021-09-08 (Wed, 08 Sep 2021)

  Changed paths:
    M hw/misc/mac_via.c
    M include/hw/misc/mac_via.h

  Log Message:
  -----------
  mac_via: move PRAM/RTC variables to MOS6522Q800VIA1State

The PRAM/RTC is accessed using clock and data pins on q800 VIA1 port B and so
can be moved to MOS6522Q800VIA1State.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20210830102447.10806-5-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: 5f083d4224d8927b1ce9b0f6d0eaf661c9bd5d51
      
https://github.com/qemu/qemu/commit/5f083d4224d8927b1ce9b0f6d0eaf661c9bd5d51
  Author: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
  Date:   2021-09-08 (Wed, 08 Sep 2021)

  Changed paths:
    M hw/m68k/q800.c
    M hw/misc/mac_via.c
    M include/hw/misc/mac_via.h

  Log Message:
  -----------
  mac_via: move ADB variables to MOS6522Q800VIA1State

The ADB is accessed using clock and data pins on q800 VIA1 port B and so can be
moved to MOS6522Q800VIA1State.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20210830102447.10806-6-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: 84e944b2afba1e4e2a40619516ac2ea2996671d4
      
https://github.com/qemu/qemu/commit/84e944b2afba1e4e2a40619516ac2ea2996671d4
  Author: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
  Date:   2021-09-08 (Wed, 08 Sep 2021)

  Changed paths:
    M hw/misc/mac_via.c

  Log Message:
  -----------
  mac_via: move q800 VIA1 timer variables to q800 VIA1 VMStateDescription

These variables are already present in MOS6522Q800VIA1State and so it is just
the VMStateDescription move that is needed.

With this change the mac_via VMStateDescription is now empty and can be removed
completely.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20210830102447.10806-7-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: 14562b375b82584bde32a77b0ce02c93de903bcb
      
https://github.com/qemu/qemu/commit/14562b375b82584bde32a77b0ce02c93de903bcb
  Author: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
  Date:   2021-09-08 (Wed, 08 Sep 2021)

  Changed paths:
    M hw/misc/mac_via.c

  Log Message:
  -----------
  mac_via: move VIA1 reset logic from mac_via_reset() to 
mos6522_q800_via1_reset()

After this change mac_via_reset() is now empty and can be removed.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20210830102447.10806-8-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: 846ae7c63666a4a798377c889920fb5e8dc6c1e6
      
https://github.com/qemu/qemu/commit/846ae7c63666a4a798377c889920fb5e8dc6c1e6
  Author: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
  Date:   2021-09-08 (Wed, 08 Sep 2021)

  Changed paths:
    M hw/misc/mac_via.c

  Log Message:
  -----------
  mac_via: move VIA1 realize logic from mac_via_realize() to 
mos6522_q800_via1_realize()

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20210830102447.10806-9-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: 02a68a3e6588b4bea4e1abbf16aa9949c084e8bc
      
https://github.com/qemu/qemu/commit/02a68a3e6588b4bea4e1abbf16aa9949c084e8bc
  Author: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
  Date:   2021-09-08 (Wed, 08 Sep 2021)

  Changed paths:
    M hw/m68k/q800.c
    M hw/misc/mac_via.c
    M include/hw/misc/mac_via.h

  Log Message:
  -----------
  mac_via: remove mac_via device

Remove the mac_via device and wire up both q800 VIA1 and VIA2 directly for the
m68k q800 machine.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20210830102447.10806-10-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: 323f984908e9e76d482959296f13a8c3921a0250
      
https://github.com/qemu/qemu/commit/323f984908e9e76d482959296f13a8c3921a0250
  Author: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
  Date:   2021-09-08 (Wed, 08 Sep 2021)

  Changed paths:
    M hw/m68k/q800.c
    M hw/misc/mac_via.c

  Log Message:
  -----------
  mac_via: remove explicit viaN prefix from VIA IRQ gpios

Now that q800 VIA1 and VIA2 are completely separate devices there is no need to
add a specific device prefix to ensure that the IRQ lines remain separate.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20210830102447.10806-11-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: 812f06995bfe47aa7d6d358cee456e722032687b
      
https://github.com/qemu/qemu/commit/812f06995bfe47aa7d6d358cee456e722032687b
  Author: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
  Date:   2021-09-08 (Wed, 08 Sep 2021)

  Changed paths:
    M include/hw/misc/mac_via.h

  Log Message:
  -----------
  mac_via: rename VIA2_IRQ_SLOT_BIT to VIA2_IRQ_NUBUS_BIT

Also improve the alignment of the shifted constants.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20210830102447.10806-12-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: dde602ae539910c3579952834b713e2f360ec34a
      
https://github.com/qemu/qemu/commit/dde602ae539910c3579952834b713e2f360ec34a
  Author: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
  Date:   2021-09-08 (Wed, 08 Sep 2021)

  Changed paths:
    M hw/misc/mac_via.c
    M include/hw/misc/mac_via.h

  Log Message:
  -----------
  mac_via: add qdev gpios for nubus slot interrupts to VIA2

These will soon be required to enable nubus devices to support interrupts.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20210830102447.10806-13-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: 6d1272d3ef81aa33e97ca5c69707cbcad953cbdb
      
https://github.com/qemu/qemu/commit/6d1272d3ef81aa33e97ca5c69707cbcad953cbdb
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2021-09-10 (Fri, 10 Sep 2021)

  Changed paths:
    M hw/m68k/q800.c
    M hw/misc/mac_via.c
    M include/hw/misc/mac_via.h

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

q800 pull request 20210908

mac_via: remove MAC_VIA device and prepare for Nubus IRQs

# gpg: Signature made Wed 08 Sep 2021 16:35:03 BST
# 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/q800-pull-request:
  mac_via: add qdev gpios for nubus slot interrupts to VIA2
  mac_via: rename VIA2_IRQ_SLOT_BIT to VIA2_IRQ_NUBUS_BIT
  mac_via: remove explicit viaN prefix from VIA IRQ gpios
  mac_via: remove mac_via device
  mac_via: move VIA1 realize logic from mac_via_realize() to 
mos6522_q800_via1_realize()
  mac_via: move VIA1 reset logic from mac_via_reset() to 
mos6522_q800_via1_reset()
  mac_via: move q800 VIA1 timer variables to q800 VIA1 VMStateDescription
  mac_via: move ADB variables to MOS6522Q800VIA1State
  mac_via: move PRAM/RTC variables to MOS6522Q800VIA1State
  mac_via: move PRAM contents and block backend to MOS6522Q800VIA1State
  mac_via: move last_b variable into q800 VIA1 VMStateDescription
  mac_via: introduce new VMStateDescription for q800 VIA1 and VIA2

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


Compare: https://github.com/qemu/qemu/compare/500f1f3e81ad...6d1272d3ef81
[Prev in Thread]
Current Thread
[Next in Thread]
[Qemu-commits] [qemu/qemu] 17de3d: mac_via: introduce new VMStateDescription for q800..., Peter Maydell, 2021/09/10
- [Qemu-commits] [qemu/qemu] 17de3d: mac_via: introduce new VMStateDescription for q800..., Peter Maydell <=
Prev by Date: [Qemu-commits] [qemu/qemu] 17de3d: mac_via: introduce new VMStateDescription for q800...
Next by Date: [Qemu-commits] [qemu/qemu] 47db24: ps2: use the whole ps2 buffer but keep queue size
Previous by thread: [Qemu-commits] [qemu/qemu] 17de3d: mac_via: introduce new VMStateDescription for q800...
Next by thread: [Qemu-commits] [qemu/qemu] 47db24: ps2: use the whole ps2 buffer but keep queue size
Index(es):
- Date
- Thread