The default value for scancode_set is already set in ps2_reset() so there is no
need to duplicate this in ps2_kbd_init().

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
---
 hw/input/ps2.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/hw/input/ps2.c b/hw/input/ps2.c
index 5990eb6f79..555abb5392 100644
--- a/hw/input/ps2.c
+++ b/hw/input/ps2.c
@@ -1227,7 +1227,6 @@ void *ps2_kbd_init(void (*update_irq)(void *, int), void *update_arg)
     trace_ps2_kbd_init(s);
     ps2->update_irq = update_irq;
     ps2->update_arg = update_arg;
-    s->scancode_set = 2;
     vmstate_register(NULL, 0, &vmstate_ps2_keyboard, s);
     qemu_input_handler_register((DeviceState *)s,
                                 &ps2_keyboard_handler);
-- 
2.20.1

On 22/5/22 20:17, Mark Cave-Ayland wrote:
> The default value for scancode_set is already set in ps2_reset() so there is no

ps2_reset -> ps2_reset_keyboard ?

> need to duplicate this in ps2_kbd_init().
> 
> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
> ---
>   hw/input/ps2.c | 1 -
>   1 file changed, 1 deletion(-)

On 22/05/2022 23:22, Philippe Mathieu-Daudé via wrote:

> On 22/5/22 20:17, Mark Cave-Ayland wrote:
>> The default value for scancode_set is already set in ps2_reset() so there is no
> 
> ps2_reset -> ps2_reset_keyboard ?

Ah yes, it's just a typo in the commit message where ps2_reset() should be changed to 
ps2_kbd_reset(). I can fix this for v2.

>> need to duplicate this in ps2_kbd_init().
>>
>> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
>> ---
>>   hw/input/ps2.c | 1 -
>>   1 file changed, 1 deletion(-)

ATB,

Mark.