qemu-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 26fcbf: q800: fix up minor spacing issues in


From: Richard Henderson
Subject: [Qemu-commits] [qemu/qemu] 26fcbf: q800: fix up minor spacing issues in hw_compat_q80...
Date: Thu, 22 Jun 2023 06:17:52 -0700

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 26fcbf00226115bc58cf5bf3c6d3aa24d5d9b01c
      
https://github.com/qemu/qemu/commit/26fcbf00226115bc58cf5bf3c6d3aa24d5d9b01c
  Author: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
  Date:   2023-06-22 (Thu, 22 Jun 2023)

  Changed paths:
    M hw/m68k/q800.c

  Log Message:
  -----------
  q800: fix up minor spacing issues in hw_compat_q800 GlobalProperty array

Ensure there is a space before the final closing brace for all global
properties.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20230621085353.113233-2-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: cbba124319812657975ba0bcd17dbf6793494884
      
https://github.com/qemu/qemu/commit/cbba124319812657975ba0bcd17dbf6793494884
  Author: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
  Date:   2023-06-22 (Thu, 22 Jun 2023)

  Changed paths:
    M hw/m68k/q800.c

  Log Message:
  -----------
  q800: add missing space after parent object in GLUEState

This brings GLUEState in line with our current QOM guidelines.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20230621085353.113233-3-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: a8019229c489a51508099d38ec54e035dee94234
      
https://github.com/qemu/qemu/commit/a8019229c489a51508099d38ec54e035dee94234
  Author: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
  Date:   2023-06-22 (Thu, 22 Jun 2023)

  Changed paths:
    M MAINTAINERS
    M hw/m68k/q800.c
    A include/hw/m68k/q800.h

  Log Message:
  -----------
  q800: introduce Q800MachineState

This provides an overall container and owner for Machine-related objects such
as MemoryRegions.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20230621085353.113233-4-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: 1a514d3a8a9b058701f0b8693067e44b08e924f2
      
https://github.com/qemu/qemu/commit/1a514d3a8a9b058701f0b8693067e44b08e924f2
  Author: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
  Date:   2023-06-22 (Thu, 22 Jun 2023)

  Changed paths:
    M hw/m68k/q800.c

  Log Message:
  -----------
  q800: rename q800_init() to q800_machine_init()

This will enable us later to distinguish between QOM initialisation and machine
initialisation.

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


  Commit: 36e2e338b34e9ac6b86102ef81571277613903e2
      
https://github.com/qemu/qemu/commit/36e2e338b34e9ac6b86102ef81571277613903e2
  Author: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
  Date:   2023-06-22 (Thu, 22 Jun 2023)

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

  Log Message:
  -----------
  q800: move CPU object into Q800MachineState

Also change the instantiation of the CPU to use object_initialize_child()
followed by a separate realisation.
Restrict valid CPU types to m68040.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20230621085353.113233-6-mark.cave-ayland@ilande.co.uk>
[lv: update commit message]
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: 0b9b41fb8b4879d4dd3d2ce0a13493541c2d8d66
      
https://github.com/qemu/qemu/commit/0b9b41fb8b4879d4dd3d2ce0a13493541c2d8d66
  Author: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
  Date:   2023-06-22 (Thu, 22 Jun 2023)

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

  Log Message:
  -----------
  q800: move ROM memory region to Q800MachineState

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20230621085353.113233-7-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: 8e0932802f5fd6d8c5c12080d144f01b09863c3c
      
https://github.com/qemu/qemu/commit/8e0932802f5fd6d8c5c12080d144f01b09863c3c
  Author: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
  Date:   2023-06-22 (Thu, 22 Jun 2023)

  Changed paths:
    M MAINTAINERS
    M hw/m68k/meson.build
    A hw/m68k/q800-glue.c
    M hw/m68k/q800.c
    A include/hw/m68k/q800-glue.h

  Log Message:
  -----------
  q800: move GLUE device into separate q800-glue.c file

This will allow the q800-glue.h header to be included separately so that the
GLUE device can be referenced externally.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20230621085353.113233-8-mark.cave-ayland@ilande.co.uk>
[lv: update comment]
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: 101b4764c7312dff04db8bf277eda875f7c00fa3
      
https://github.com/qemu/qemu/commit/101b4764c7312dff04db8bf277eda875f7c00fa3
  Author: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
  Date:   2023-06-22 (Thu, 22 Jun 2023)

  Changed paths:
    M hw/m68k/q800-glue.c

  Log Message:
  -----------
  q800-glue.c: switch TypeInfo registration to use DEFINE_TYPES() macro

The use of the DEFINE_TYPES() macro will soon be recommended over the use of
calling type_init() directly.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20230621085353.113233-9-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: 1ecc6ec1ffbf5c209233be137f04344ec4eac6b5
      
https://github.com/qemu/qemu/commit/1ecc6ec1ffbf5c209233be137f04344ec4eac6b5
  Author: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
  Date:   2023-06-22 (Thu, 22 Jun 2023)

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

  Log Message:
  -----------
  q800: move GLUE device to Q800MachineState

Also change the instantiation of the GLUE device to use 
object_initialize_child().

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20230621085353.113233-10-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: 7527c52fd0472dbe06cc1f2f3b7979e202995ea2
      
https://github.com/qemu/qemu/commit/7527c52fd0472dbe06cc1f2f3b7979e202995ea2
  Author: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
  Date:   2023-06-22 (Thu, 22 Jun 2023)

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

  Log Message:
  -----------
  q800: introduce mac-io container memory region

Move all devices from the IO region to within the container in preparation
for updating the IO aliasing mechanism.

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


  Commit: f18a2886328d92c617a08692157d2b3f68477548
      
https://github.com/qemu/qemu/commit/f18a2886328d92c617a08692157d2b3f68477548
  Author: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
  Date:   2023-06-22 (Thu, 22 Jun 2023)

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

  Log Message:
  -----------
  q800: reimplement mac-io region aliasing using IO memory region

The current use of aliased memory regions causes us 2 problems: firstly the
output of "info qom-tree" is absolutely huge and difficult to read, and
secondly we have already reached the internal limit for memory regions as
adding any new memory region into the mac-io region causes QEMU to assert
with "phys_section_add: Assertion `map->sections_nb < TARGET_PAGE_SIZE'
failed".

Implement the mac-io region aliasing using a single IO memory region that
applies IO_SLICE_MASK representing the maximum size of the aliased region and
then forwarding the access to the existing mac-io memory region using the
address space API.

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


  Commit: 6d32c0643f263da92d24af4c87c86ea2c0f7f251
      
https://github.com/qemu/qemu/commit/6d32c0643f263da92d24af4c87c86ea2c0f7f251
  Author: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
  Date:   2023-06-22 (Thu, 22 Jun 2023)

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

  Log Message:
  -----------
  q800: move VIA1 device to Q800MachineState

Also change the instantiation of the VIA1 device to use 
object_initialize_child().

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20230621085353.113233-13-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: d7942e166ae2da7f70a55365470177d9e71cca3f
      
https://github.com/qemu/qemu/commit/d7942e166ae2da7f70a55365470177d9e71cca3f
  Author: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
  Date:   2023-06-22 (Thu, 22 Jun 2023)

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

  Log Message:
  -----------
  q800: move VIA2 device to Q800MachineState

Also change the instantiation of the VIA2 device to use 
object_initialize_child().

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20230621085353.113233-14-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: 2db48d0364f9bbc0d22370fc26debfaa4adca31f
      
https://github.com/qemu/qemu/commit/2db48d0364f9bbc0d22370fc26debfaa4adca31f
  Author: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
  Date:   2023-06-22 (Thu, 22 Jun 2023)

  Changed paths:
    M hw/net/dp8393x.c
    A include/hw/net/dp8393x.h

  Log Message:
  -----------
  hw/net/dp8393x.c: move TYPE_DP8393X and dp8393xState into dp8393x.h

This is to enable them to be used outside of dp8393x.c.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
CC: Jason Wang <jasowang@redhat.com>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20230621085353.113233-15-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: 804ae67ee6fc3ff5a6c82edba7ed4cbdd33de091
      
https://github.com/qemu/qemu/commit/804ae67ee6fc3ff5a6c82edba7ed4cbdd33de091
  Author: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
  Date:   2023-06-22 (Thu, 22 Jun 2023)

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

  Log Message:
  -----------
  q800: move dp8393x device to Q800MachineState

Also change the instantiation of the dp8393x device to use 
object_initialize_child().

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
CC: Jason Wang <jasowang@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20230621085353.113233-16-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: 836126c77326d9a7b629063c9caa9deff3a26aed
      
https://github.com/qemu/qemu/commit/836126c77326d9a7b629063c9caa9deff3a26aed
  Author: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
  Date:   2023-06-22 (Thu, 22 Jun 2023)

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

  Log Message:
  -----------
  q800: move ESCC device to Q800MachineState

Also change the instantiation of the ESCC device to use 
object_initialize_child().

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20230621085353.113233-17-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: 1a7a3f004cb9a4913b2a5eb8b1c8dd178db3bee9
      
https://github.com/qemu/qemu/commit/1a7a3f004cb9a4913b2a5eb8b1c8dd178db3bee9
  Author: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
  Date:   2023-06-22 (Thu, 22 Jun 2023)

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

  Log Message:
  -----------
  q800: move escc_orgate device to Q800MachineState

Also change the instantiation of the escc_orgate device to use 
object_initialize_child().

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20230621085353.113233-18-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: e78d17ca7d1dbfbe0a312e1ed40694d1485c763b
      
https://github.com/qemu/qemu/commit/e78d17ca7d1dbfbe0a312e1ed40694d1485c763b
  Author: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
  Date:   2023-06-22 (Thu, 22 Jun 2023)

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

  Log Message:
  -----------
  q800: move ESP device to Q800MachineState

Also change the instantiation of the ESP device to use 
object_initialize_child().

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20230621085353.113233-19-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: 01f35a4f1cfa34a998d0bc11dbdefa7dd26d2c7b
      
https://github.com/qemu/qemu/commit/01f35a4f1cfa34a998d0bc11dbdefa7dd26d2c7b
  Author: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
  Date:   2023-06-22 (Thu, 22 Jun 2023)

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

  Log Message:
  -----------
  q800: move SWIM device to Q800MachineState

Also change the instantiation of the SWIM device to use 
object_initialize_child().

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20230621085353.113233-20-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: 36df1c5a635c11e5514ac561ed90a9c459cdbff2
      
https://github.com/qemu/qemu/commit/36df1c5a635c11e5514ac561ed90a9c459cdbff2
  Author: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
  Date:   2023-06-22 (Thu, 22 Jun 2023)

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

  Log Message:
  -----------
  q800: move mac-nubus-bridge device to Q800MachineState

Also change the instantiation of the mac-nubus-bridge device to use
object_initialize_child() and map the Nubus address space using
memory_region_add_subregion() instead of sysbus_mmio_map().

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20230621085353.113233-21-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: 464085e8f6776a0ca5a2677cf8b93b25c8a94da4
      
https://github.com/qemu/qemu/commit/464085e8f6776a0ca5a2677cf8b93b25c8a94da4
  Author: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
  Date:   2023-06-22 (Thu, 22 Jun 2023)

  Changed paths:
    M hw/m68k/q800.c

  Log Message:
  -----------
  q800: don't access Nubus bus directly from the mac-nubus-bridge device

Instead use the qdev_get_child_bus() function which is intended for this exact
purpose.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20230621085353.113233-22-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: 7a1f3acb3f41a6bc896c1d7d1749336c21eb8cee
      
https://github.com/qemu/qemu/commit/7a1f3acb3f41a6bc896c1d7d1749336c21eb8cee
  Author: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
  Date:   2023-06-22 (Thu, 22 Jun 2023)

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

  Log Message:
  -----------
  q800: move macfb device to Q800MachineState

Also change the instantiation of the macfb device to use 
object_initialize_child().

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20230621085353.113233-23-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: ce47d531c33c35eca985f2dffc340c09433690fa
      
https://github.com/qemu/qemu/commit/ce47d531c33c35eca985f2dffc340c09433690fa
  Author: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
  Date:   2023-06-22 (Thu, 22 Jun 2023)

  Changed paths:
    M hw/misc/mac_via.c

  Log Message:
  -----------
  mac_via: fix rtc command decoding from PRAM addresses 0x0 to 0xf

A comparison between the rtc command table included in the comment and the code
itself shows that the decoding for PRAM addresses 0x0 to 0xf is being done on
the raw command, and not the shifted version held in value.

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


  Commit: 532009054b45d75a3cf7ba9c31921add669d290d
      
https://github.com/qemu/qemu/commit/532009054b45d75a3cf7ba9c31921add669d290d
  Author: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
  Date:   2023-06-22 (Thu, 22 Jun 2023)

  Changed paths:
    M hw/misc/mac_via.c

  Log Message:
  -----------
  mac_via: fix rtc command decoding for the PRAM seconds registers

Analysis of the MacOS toolbox ROM code shows that on startup it attempts 2
separate reads of the seconds registers with commands 0x9d...0x91 followed by
0x8d..0x81 without resetting the command to its initial value. The PRAM seconds
value is only accepted when the values of the 2 separate reads match.

>From this we conclude that bit 4 of the rtc command is not decoded or we don't
care about its value when reading the PRAM seconds registers. Implement this
decoding change so that both reads return successfully which allows the MacOS
toolbox ROM to correctly set the date/time.

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


  Commit: b455ce4c2f300c8ba47cba7232dd03261368a4cb
      
https://github.com/qemu/qemu/commit/b455ce4c2f300c8ba47cba7232dd03261368a4cb
  Author: Richard Henderson <richard.henderson@linaro.org>
  Date:   2023-06-22 (Thu, 22 Jun 2023)

  Changed paths:
    M MAINTAINERS
    M hw/m68k/meson.build
    A hw/m68k/q800-glue.c
    M hw/m68k/q800.c
    M hw/misc/mac_via.c
    M hw/net/dp8393x.c
    A include/hw/m68k/q800-glue.h
    A include/hw/m68k/q800.h
    A include/hw/net/dp8393x.h

  Log Message:
  -----------
  Merge tag 'q800-for-8.1-pull-request' of https://github.com/vivier/qemu-m68k 
into staging

Q800 branch pull request 20230622

Cleanup to introduce support of MacOS Classic

# -----BEGIN PGP SIGNATURE-----
#
# iQJGBAABCAAwFiEEzS913cjjpNwuT1Fz8ww4vT8vvjwFAmST/loSHGxhdXJlbnRA
# dml2aWVyLmV1AAoJEPMMOL0/L748dQcQAKjU2vMketVOc5jXCtF7Jej/F6j21kpk
# Wmt/XuR8FDeohHVyWvQ1quxcewn6DfA+aPx1xqnn0nRBcnuqT/g4IHdXFzwMUxMo
# R3CSUHhMbT/tv8gkbn0q+vg1DffGRr65tc+UUOSkyIttF0Lw6ZgZSoUIcUN4zCvk
# zx+Z8T7UEJl/EMGGe6awS2cuCZcFB4pdLzkKUKOrAtaJ35eBnBPTClfijHwW7c+5
# tsiH/O/AenRP4oxYu/r4Z2tsYTSIkU8a5MAFQNxEIuupbrLDYixoV3yS7NuR9Ylg
# KurOLqdNIlW4vhH2080JijMm1JeX9oXboPc5XMe69v+jFEcdBbpKLvd8ryIhG9SA
# RItGkTJDOBp9ALho9rdQDH/W3JxSDX3ohsDVdn8e3nCR9UBRIlO/OFrLS73siHcD
# mOatC1mMjZwo+6/liTQwhKvCjSkQp+vh7bw/+zhyprmHkkZXs9FASr8EGLrryq4G
# 5wV0qIyNmRrpRXBGcMKGlnmXZ4CZ1XqcGL9xvG5VYVImcjJMEJBBs2aNYLrW1d4Q
# 8FkuqeFunRIf5LcG2EMBgBnIBA28Rgm5AtUMAeu6N8kM5oLYG8mFPOevvN4Da8Mp
# Fluyjtl4vT6xwqV4l0dGcxYtHnV98j7oXXuKx7g2L5ko7l7ZpfrNbkgF9bD4VnWv
# 7HTL0KK8nLEs
# =f/mF
# -----END PGP SIGNATURE-----
# gpg: Signature made Thu 22 Jun 2023 09:55:06 AM CEST
# gpg:                using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
# gpg:                issuer "laurent@vivier.eu"
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [undefined]
# gpg:                 aka "Laurent Vivier <laurent@vivier.eu>" [undefined]
# gpg:                 aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" 
[undefined]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C

* tag 'q800-for-8.1-pull-request' of https://github.com/vivier/qemu-m68k: (24 
commits)
  mac_via: fix rtc command decoding for the PRAM seconds registers
  mac_via: fix rtc command decoding from PRAM addresses 0x0 to 0xf
  q800: move macfb device to Q800MachineState
  q800: don't access Nubus bus directly from the mac-nubus-bridge device
  q800: move mac-nubus-bridge device to Q800MachineState
  q800: move SWIM device to Q800MachineState
  q800: move ESP device to Q800MachineState
  q800: move escc_orgate device to Q800MachineState
  q800: move ESCC device to Q800MachineState
  q800: move dp8393x device to Q800MachineState
  hw/net/dp8393x.c: move TYPE_DP8393X and dp8393xState into dp8393x.h
  q800: move VIA2 device to Q800MachineState
  q800: move VIA1 device to Q800MachineState
  q800: reimplement mac-io region aliasing using IO memory region
  q800: introduce mac-io container memory region
  q800: move GLUE device to Q800MachineState
  q800-glue.c: switch TypeInfo registration to use DEFINE_TYPES() macro
  q800: move GLUE device into separate q800-glue.c file
  q800: move ROM memory region to Q800MachineState
  q800: move CPU object into Q800MachineState
  ...

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>


Compare: https://github.com/qemu/qemu/compare/67fe6ae41da6...b455ce4c2f30



reply via email to

[Prev in Thread] Current Thread [Next in Thread]