On Tue, 10 Jan 2023, Mark Cave-Ayland wrote:
> On 04/01/2023 21:59, BALATON Zoltan wrote:
>
>> Setting emulated machine type with a property called "via" is
>> confusing users so deprecate the "via" option in favour of newly added
>> explicit machine types. The default via=cuda option is not a valid
>> config (no real Mac has this combination of hardware) so no machine
>> type could be defined for that therefore it is kept for backwards
>> compatibility with older QEMU versions for now but other options
>> resembling real machines are deprecated.
>>
>> Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
>
> I believe that people do use -M mac99,via=cuda to run some rare versions of
> MacOS in QEMU (I think possibly OS X DP and Workgroup Server?), so we would
> want to keep this option somewhere.
The idea is that after previous patches we now have machine types for all
other via option values (that also match real Mac machines) other than
via=cude but that is the default for mac99 so after the reprecation period
when the via option is removed mac99 (which is the same as mac99,via=cuda)
can remain for this use case (and for backward compatibility) until the
other machines are fixed to not need this any more. So all via options are
still available but as different machine types.
My 2 cents about naming:
It seems less important how the machines are named when their name is not covering their definition. F.i. the powermac3,1 never had adb, could not be equipped with a G3 cpu, did not run at 900Mhz. The closest possible qemu-options based definition of a powermac3,1 (via=pmu) will not run Mac OS 9.0.4 ;-) due to the 2 USB devices problem. To run that via=cuda is already needed.
>> ---
>> hw/ppc/mac_newworld.c | 9 +++++++++
>> 1 file changed, 9 insertions(+)
>>
>> diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
>> index f07c37328b..adf185bd3a 100644
>> --- a/hw/ppc/mac_newworld.c
>> +++ b/hw/ppc/mac_newworld.c
>> @@ -169,6 +169,15 @@ static void ppc_core99_init(MachineState *machine)
>> if (PPC_INPUT(env) == PPC_FLAGS_INPUT_970) {
>> warn_report("mac99 with G5 CPU is deprecated, "
>> "use powermac7_3 instead");
>> + } else {
>> + if (core99_machine->via_config == CORE99_VIA_CONFIG_PMU) {
>> + warn_report("mac99,via=pmu is deprecated, "
>> + "use powermac3_1 instead");
>> + }
>> + if (core99_machine->via_config == CORE99_VIA_CONFIG_PMU_ADB) {
>> + warn_report("mac99,via=pmu-adb is deprecated, "
>> + "use powerbook3_2 instead");
>> + }
>> }
>> }
>> /* allocate RAM */
>
>
> ATB,
>
> Mark.
>
>