[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Qemu-devel] [PATCH] prep: fix keyboard for the 40p machine

From: Mark Cave-Ayland
Subject: Re: [Qemu-devel] [PATCH] prep: fix keyboard for the 40p machine
Date: Thu, 24 May 2018 09:13:23 +0100
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0

On 24/05/18 06:39, 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.

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 <address@hidden>
  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"));

FWIW I see this patchset was applied just before the 2.12 release so it's probably worth a CC to qemu-stable@ once Hervé is satisfied.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]