| Message ID | a5147317122bb760b1184cf73829fc6fce61e611.1672868854.git.balaton@eik.bme.hu |
|---|---|
| State | New |
| Headers | show |
| Series | Misc ppc/mac machines clean up | expand |
On 4/1/23 22:59, BALATON Zoltan wrote: > Besides resolving the confusing behaviour mentioned in previous commit > this might also allow unifying qemu-system-ppc and qemu-system-ppc64 > in the future. > > Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu> > --- > hw/ppc/mac_newworld.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c > index 3f5d1ec097..f07c37328b 100644 > --- a/hw/ppc/mac_newworld.c > +++ b/hw/ppc/mac_newworld.c > @@ -165,6 +165,12 @@ static void ppc_core99_init(MachineState *machine) > qemu_register_reset(ppc_core99_reset, cpu); > } > > + if (object_property_find(OBJECT(machine), "via")) { > + if (PPC_INPUT(env) == PPC_FLAGS_INPUT_970) { > + warn_report("mac99 with G5 CPU is deprecated, " > + "use powermac7_3 instead"); "mac99 machine with G5 CPU is deprecated, prefer the powermac7_3 machine instead"? > + } > + } > /* allocate RAM */ > if (machine->ram_size > 2 * GiB) { > error_report("RAM size more than 2 GiB is not supported");
On Thu, 5 Jan 2023, Philippe Mathieu-Daudé wrote: > On 4/1/23 22:59, BALATON Zoltan wrote: >> Besides resolving the confusing behaviour mentioned in previous commit >> this might also allow unifying qemu-system-ppc and qemu-system-ppc64 >> in the future. >> >> Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu> >> --- >> hw/ppc/mac_newworld.c | 6 ++++++ >> 1 file changed, 6 insertions(+) >> >> diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c >> index 3f5d1ec097..f07c37328b 100644 >> --- a/hw/ppc/mac_newworld.c >> +++ b/hw/ppc/mac_newworld.c >> @@ -165,6 +165,12 @@ static void ppc_core99_init(MachineState *machine) >> qemu_register_reset(ppc_core99_reset, cpu); >> } >> + if (object_property_find(OBJECT(machine), "via")) { >> + if (PPC_INPUT(env) == PPC_FLAGS_INPUT_970) { >> + warn_report("mac99 with G5 CPU is deprecated, " >> + "use powermac7_3 instead"); > > "mac99 machine with G5 CPU is deprecated, prefer the powermac7_3 machine > instead"? I don't mind what the text is but this seems unnecessarily long where my version conveys the message in a more concise way. But if others prefer something else I'm OK to change it as you like. I expect these last patches may need to be repartitioned so I'm waiting for review to see what's preferred. Regards, BALATON Zoltan >> + } >> + } >> /* allocate RAM */ >> if (machine->ram_size > 2 * GiB) { >> error_report("RAM size more than 2 GiB is not supported"); > > >
diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c index 3f5d1ec097..f07c37328b 100644 --- a/hw/ppc/mac_newworld.c +++ b/hw/ppc/mac_newworld.c @@ -165,6 +165,12 @@ static void ppc_core99_init(MachineState *machine) qemu_register_reset(ppc_core99_reset, cpu); } + if (object_property_find(OBJECT(machine), "via")) { + if (PPC_INPUT(env) == PPC_FLAGS_INPUT_970) { + warn_report("mac99 with G5 CPU is deprecated, " + "use powermac7_3 instead"); + } + } /* allocate RAM */ if (machine->ram_size > 2 * GiB) { error_report("RAM size more than 2 GiB is not supported");
Besides resolving the confusing behaviour mentioned in previous commit this might also allow unifying qemu-system-ppc and qemu-system-ppc64 in the future. Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu> --- hw/ppc/mac_newworld.c | 6 ++++++ 1 file changed, 6 insertions(+)