On Thu, 2 Feb 2023, BALATON Zoltan wrote:
> On Wed, 1 Feb 2023, Mark Cave-Ayland wrote:
>> On 04/01/2023 21:59, BALATON Zoltan wrote:
>>> This is the remainder of the series that were postponed to after the
>>> freeze the last time I've tried to submit them with some new patches
>>> I did meanwhile.
>>>
>>> BALATON Zoltan (7):
>>> input/adb: Only include header where needed
>>> mac_{old,new}world: Use local variable instead of qdev_get_machine()
>>> mac_{old,new}world: Pass MacOS VGA NDRV in card ROM instead of fw_cfg
>>> mac_newworld: Add machine types for different mac99 configs
>>> mac_newworld: Deprecate mac99 with G5 CPU
>>> mac_newworld: Deprecate mac99 "via" option
>>> mac_newworld: Document deprecation
>>>
>>> docs/about/deprecated.rst | 7 ++
>>> docs/system/ppc/powermac.rst | 12 ++--
>>> hw/misc/macio/cuda.c | 2 -
>>> hw/misc/macio/pmu.c | 3 -
>>> hw/misc/mos6522.c | 1 -
>>> hw/ppc/mac_newworld.c | 130 +++++++++++++++++++++++++++++++----
>>> hw/ppc/mac_oldworld.c | 21 ++----
>>> include/hw/misc/mac_via.h | 1 +
>>> include/hw/misc/macio/cuda.h | 1 +
>>> include/hw/misc/macio/pmu.h | 1 +
>>> include/hw/misc/mos6522.h | 3 +-
>>> 11 files changed, 142 insertions(+), 40 deletions(-)
>>
>> I've applied patches 1 and 2 to my qemu-macppc branch. Patch 3 isn't the
>> right solution to the problem, and the discussion as to how the New World
>> machines should be organised in future for patches 4 to 7 still hasn't been
>> clarified.
>
> Thanks, let's come back to patch 3 in the other thread. As for 4-7 the
> discussion seems to have ended and the result was that nobody really cares
> besides you and me. So make a suggestion for names instead of the machine id
> based ones I came up with and I'll change it to use those names. Whatever we
> call these is still better than what we have currently so as long as I can
> get PowerMac3,1 and PowerMac7,2 with a simple -machine option without getting
> them confused in qemu-system-ppc64 I'd go for that.
Thank you for taking care of these, now only the last patches are not yet
merged. We can postpone the NDRV patch for later but I'd appreciate if you
could make an alternative fix in OpenBIOS. I'd still want to resolve the
mac99 machine though and add new machine names and start deprecation now.
I'm waiting for your suggestion on names for these machines and preferred
partitioning of the changes in patches so I can change and resubmit these.
I'd like this to not miss the freeze which may seem far ahead but at the
speed these are reviewed and merged I wanted to get over it as soon as
possible. (Othersise this would be the second time these miss a freeze.)
Regards,
BALATON Zoltan