On 05/24/2018 02:39 AM, Mark Cave-Ayland wrote: > Commit 72d3d8f052 "hw/isa/superio: Add a keyboard/mouse controller (8042)" > added an 8042 keyboard device to the PC87312 superio device to replace that > being used by the prep machine. > > Unfortunately this commit didn't do the same for the 40p machine which broke > the keyboard by registering two 8042 keyboard devices at the same address.
Oops sorry... I have this fixed in the following up series after SuperIO cleanup, which is SouthBridge cleanup, involving a good rework of the PIIX and I82378 chipsets, using Hervé Poussineau patches. But I have 2 more prioritary series to finish before returning to this one :/ > Resolve this by similarly removing the 8042 keyboard from the 40p machine as > done for the prep machine in commit 72d3d8f052. > > Signed-off-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk> Reviewed-by: Philippe Mathieu-Daudé <f4...@amsat.org> Thanks for fixing this (too bad there are no keyboard qtests and this got unnoticed). > --- > hw/ppc/prep.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c > index a1e7219db6..be4db6a687 100644 > --- a/hw/ppc/prep.c > +++ b/hw/ppc/prep.c > @@ -770,7 +770,6 @@ static void ibm_40p_init(MachineState *machine) > > /* add some more devices */ > if (defaults_enabled()) { > - isa_create_simple(isa_bus, TYPE_I8042); > m48t59 = NVRAM(isa_create_simple(isa_bus, "isa-m48t59")); > > dev = DEVICE(isa_create(isa_bus, "cs4231a")); >
signature.asc
Description: OpenPGP digital signature