[PATCH] hw/input: Do not enable CONFIG_PCKBD by default

[PATCH] hw/input: Do not enable CONFIG_PCKBD by default

[Thomas Huth]

The i8042 device is part of the chipset of a machine, so it should
be selected by the machines or chipsets (e.g. SuperIO chipsets),
and not be enabled by default.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 hw/input/Kconfig | 1 -
 hw/isa/Kconfig   | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/input/Kconfig b/hw/input/Kconfig
index 287f08887b..a2f25725be 100644
--- a/hw/input/Kconfig
+++ b/hw/input/Kconfig
@@ -7,7 +7,6 @@ config LM832X
 
 config PCKBD
     bool
-    default y
     select PS2
     depends on ISA_BUS
 
diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig
index 8a38813cc1..c7f07854f7 100644
--- a/hw/isa/Kconfig
+++ b/hw/isa/Kconfig
@@ -16,6 +16,7 @@ config I82378
 config ISA_SUPERIO
     bool
     select ISA_BUS
+    select PCKBD
 
 config PC87312
     bool
-- 
2.18.1

Re: [PATCH] hw/input: Do not enable CONFIG_PCKBD by default

[Laurent Vivier]

Le 15/01/2020 à 12:37, Thomas Huth a écrit :
> The i8042 device is part of the chipset of a machine, so it should
> be selected by the machines or chipsets (e.g. SuperIO chipsets),
> and not be enabled by default.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  hw/input/Kconfig | 1 -
>  hw/isa/Kconfig   | 1 +
>  2 files changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/hw/input/Kconfig b/hw/input/Kconfig
> index 287f08887b..a2f25725be 100644
> --- a/hw/input/Kconfig
> +++ b/hw/input/Kconfig
> @@ -7,7 +7,6 @@ config LM832X
>  
>  config PCKBD
>      bool
> -    default y
>      select PS2
>      depends on ISA_BUS
>  
> diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig
> index 8a38813cc1..c7f07854f7 100644
> --- a/hw/isa/Kconfig
> +++ b/hw/isa/Kconfig
> @@ -16,6 +16,7 @@ config I82378
>  config ISA_SUPERIO
>      bool
>      select ISA_BUS
> +    select PCKBD
>  
>  config PC87312
>      bool
> 

It is also used by R4K but the Kconfig already includes it, so:

Reviewed-by: Laurent Vivier <laurent@vivier.eu>

Re: [PATCH] hw/input: Do not enable CONFIG_PCKBD by default

[Philippe Mathieu-Daudé]

On 1/15/20 12:46 PM, Laurent Vivier wrote:
> Le 15/01/2020 à 12:37, Thomas Huth a écrit :
>> The i8042 device is part of the chipset of a machine, so it should
>> be selected by the machines or chipsets (e.g. SuperIO chipsets),
>> and not be enabled by default.

The sentence "The i8042 device is part of the chipset of a machine" 
sounds odd to me.

Maybe simply use "The i8042 PS/2 Controller should not be enabled by 
default. It has to be selected by machines or chipsets (e.g. SuperIO 
chipsets)."

>>
>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>> ---
>>   hw/input/Kconfig | 1 -
>>   hw/isa/Kconfig   | 1 +
>>   2 files changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/hw/input/Kconfig b/hw/input/Kconfig
>> index 287f08887b..a2f25725be 100644
>> --- a/hw/input/Kconfig
>> +++ b/hw/input/Kconfig
>> @@ -7,7 +7,6 @@ config LM832X
>>   
>>   config PCKBD
>>       bool
>> -    default y
>>       select PS2
>>       depends on ISA_BUS
>>   
>> diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig
>> index 8a38813cc1..c7f07854f7 100644
>> --- a/hw/isa/Kconfig
>> +++ b/hw/isa/Kconfig
>> @@ -16,6 +16,7 @@ config I82378
>>   config ISA_SUPERIO
>>       bool
>>       select ISA_BUS
>> +    select PCKBD
>>   
>>   config PC87312
>>       bool
>>
> 
> It is also used by R4K but the Kconfig already includes it, so:

I believe R4K should 'select ISA_SUPERIO' but we don't have specs and 
this machine is deprecated, so I didn't bother improving it.

> 
> Reviewed-by: Laurent Vivier <laurent@vivier.eu>
> 

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Re: [PATCH] hw/input: Do not enable CONFIG_PCKBD by default

[Paolo Bonzini]

On 15/01/20 12:37, Thomas Huth wrote:
> The i8042 device is part of the chipset of a machine, so it should
> be selected by the machines or chipsets (e.g. SuperIO chipsets),
> and not be enabled by default.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  hw/input/Kconfig | 1 -
>  hw/isa/Kconfig   | 1 +
>  2 files changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/hw/input/Kconfig b/hw/input/Kconfig
> index 287f08887b..a2f25725be 100644
> --- a/hw/input/Kconfig
> +++ b/hw/input/Kconfig
> @@ -7,7 +7,6 @@ config LM832X
>  
>  config PCKBD
>      bool
> -    default y
>      select PS2
>      depends on ISA_BUS
>  
> diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig
> index 8a38813cc1..c7f07854f7 100644
> --- a/hw/isa/Kconfig
> +++ b/hw/isa/Kconfig
> @@ -16,6 +16,7 @@ config I82378
>  config ISA_SUPERIO
>      bool
>      select ISA_BUS
> +    select PCKBD
>  
>  config PC87312
>      bool
> 

Since you CCed qemu-trivial,

Acked-by: Paolo Bonzini <pbonzini@redhat.com>