diff options
| author | Mark Cave-Ayland | 2018-05-24 07:39:58 +0200 |
|---|---|---|
| committer | David Gibson | 2018-06-12 01:33:52 +0200 |
| commit | 7cb00357c155240bae3b17eaa00415087b004c52 (patch) | |
| tree | 5fbe204e36596299a9394b61118f64ec388b9564 /hw | |
| parent | 40p: remove pci_allow_0_address = true from 40p machine class (diff) | |
| download | qemu-7cb00357c155240bae3b17eaa00415087b004c52.tar.gz qemu-7cb00357c155240bae3b17eaa00415087b004c52.tar.xz qemu-7cb00357c155240bae3b17eaa00415087b004c52.zip | |
prep: fix keyboard for the 40p machine
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.
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-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Hervé Poussineau <hpoussin@reactos.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/ppc/prep.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c index dbbe749bde..5ed0bcd862 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")); |