diff mbox series

[v2,17/23] hw/i386: also turn off VMMOUSE is VMPORT is disabled

Message ID 20190717134335.15351-18-alex.bennee@linaro.org
State Superseded
Headers show
Series testing/next for 4.1-rc2 (win, travis, iotests) | expand

Commit Message

Alex Bennée July 17, 2019, 1:43 p.m. UTC
Commit 97fd1ea8c1 broke the build for --without-default-devices as
VMMOUSE depends on VMPORT.

Fixes: 97fd1ea8c1
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

---
 hw/i386/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

-- 
2.20.1

Comments

Thomas Huth July 17, 2019, 4:02 p.m. UTC | #1
On 17/07/2019 15.43, Alex Bennée wrote:
> Commit 97fd1ea8c1 broke the build for --without-default-devices as

> VMMOUSE depends on VMPORT.

> 

> Fixes: 97fd1ea8c1

> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

> ---

>  hw/i386/Kconfig | 4 ++--

>  1 file changed, 2 insertions(+), 2 deletions(-)

> 

> diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig

> index b9c96ac361e..6350438036f 100644

> --- a/hw/i386/Kconfig

> +++ b/hw/i386/Kconfig

> @@ -52,6 +52,7 @@ config I440FX

>      bool

>      imply E1000_PCI

>      imply VMPORT

> +    imply VMMOUSE

>      select PC_PCI

>      select PC_ACPI

>      select ACPI_SMBUS

> @@ -59,7 +60,6 @@ config I440FX

>      select IDE_PIIX

>      select DIMM

>      select SMBIOS

> -    select VMMOUSE

>      select FW_CFG_DMA

>  

>  config ISAPC

> @@ -78,6 +78,7 @@ config Q35

>      imply AMD_IOMMU

>      imply E1000E_PCI_EXPRESS

>      imply VMPORT

> +    imply VMMOUSE

>      select PC_PCI

>      select PC_ACPI

>      select PCI_EXPRESS_Q35

> @@ -85,7 +86,6 @@ config Q35

>      select AHCI_ICH9

>      select DIMM

>      select SMBIOS

> -    select VMMOUSE

>      select FW_CFG_DMA

>  

>  config VTD

> 


Reviewed-by: Thomas Huth <thuth@redhat.com>
Philippe Mathieu-Daudé July 22, 2019, 8:02 p.m. UTC | #2
On 7/17/19 3:43 PM, Alex Bennée wrote:
> Commit 97fd1ea8c1 broke the build for --without-default-devices as

> VMMOUSE depends on VMPORT.

> 

> Fixes: 97fd1ea8c1

> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

> ---

>  hw/i386/Kconfig | 4 ++--

>  1 file changed, 2 insertions(+), 2 deletions(-)

> 

> diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig

> index b9c96ac361e..6350438036f 100644

> --- a/hw/i386/Kconfig

> +++ b/hw/i386/Kconfig

> @@ -52,6 +52,7 @@ config I440FX

>      bool

>      imply E1000_PCI

>      imply VMPORT

> +    imply VMMOUSE

>      select PC_PCI

>      select PC_ACPI

>      select ACPI_SMBUS

> @@ -59,7 +60,6 @@ config I440FX

>      select IDE_PIIX

>      select DIMM

>      select SMBIOS

> -    select VMMOUSE

>      select FW_CFG_DMA

>  

>  config ISAPC

> @@ -78,6 +78,7 @@ config Q35

>      imply AMD_IOMMU

>      imply E1000E_PCI_EXPRESS

>      imply VMPORT

> +    imply VMMOUSE

>      select PC_PCI

>      select PC_ACPI

>      select PCI_EXPRESS_Q35

> @@ -85,7 +86,6 @@ config Q35

>      select AHCI_ICH9

>      select DIMM

>      select SMBIOS

> -    select VMMOUSE

>      select FW_CFG_DMA

>  

>  config VTD

> 


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

Patch

diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig
index b9c96ac361e..6350438036f 100644
--- a/hw/i386/Kconfig
+++ b/hw/i386/Kconfig
@@ -52,6 +52,7 @@  config I440FX
     bool
     imply E1000_PCI
     imply VMPORT
+    imply VMMOUSE
     select PC_PCI
     select PC_ACPI
     select ACPI_SMBUS
@@ -59,7 +60,6 @@  config I440FX
     select IDE_PIIX
     select DIMM
     select SMBIOS
-    select VMMOUSE
     select FW_CFG_DMA
 
 config ISAPC
@@ -78,6 +78,7 @@  config Q35
     imply AMD_IOMMU
     imply E1000E_PCI_EXPRESS
     imply VMPORT
+    imply VMMOUSE
     select PC_PCI
     select PC_ACPI
     select PCI_EXPRESS_Q35
@@ -85,7 +86,6 @@  config Q35
     select AHCI_ICH9
     select DIMM
     select SMBIOS
-    select VMMOUSE
     select FW_CFG_DMA
 
 config VTD