[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v2] hw/i386: turn off vmport if CONFIG_VMPORT is
From: |
Paolo Bonzini |
Subject: |
Re: [Qemu-devel] [PATCH v2] hw/i386: turn off vmport if CONFIG_VMPORT is disabled |
Date: |
Fri, 12 Jul 2019 19:45:17 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.7.2 |
On 12/07/19 18:02, Julio Montes wrote:
> vmport device is not included when CONFIG_VMPORT is disabled, hence
> QEMU fails with the following error:
>
> `Unknown device 'vmport' for bus 'ISA': unknown.`
>
> v2: imply VMPORT (Paolo Bonzini )
>
> Signed-off-by: Julio Montes <address@hidden>
> ---
> hw/i386/Kconfig | 4 ++--
> hw/i386/pc.c | 5 +++++
> 2 files changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig
> index 4ddf2a9c55..b9c96ac361 100644
> --- a/hw/i386/Kconfig
> +++ b/hw/i386/Kconfig
> @@ -51,6 +51,7 @@ config PC_ACPI
> config I440FX
> bool
> imply E1000_PCI
> + imply VMPORT
> select PC_PCI
> select PC_ACPI
> select ACPI_SMBUS
> @@ -58,7 +59,6 @@ config I440FX
> select IDE_PIIX
> select DIMM
> select SMBIOS
> - select VMPORT
> select VMMOUSE
> select FW_CFG_DMA
>
> @@ -77,6 +77,7 @@ config Q35
> imply VTD
> imply AMD_IOMMU
> imply E1000E_PCI_EXPRESS
> + imply VMPORT
> select PC_PCI
> select PC_ACPI
> select PCI_EXPRESS_Q35
> @@ -84,7 +85,6 @@ config Q35
> select AHCI_ICH9
> select DIMM
> select SMBIOS
> - select VMPORT
> select VMMOUSE
> select FW_CFG_DMA
>
> diff --git a/hw/i386/pc.c b/hw/i386/pc.c
> index c33ce47578..549c437050 100644
> --- a/hw/i386/pc.c
> +++ b/hw/i386/pc.c
> @@ -83,6 +83,7 @@
> #include "hw/mem/memory-device.h"
> #include "sysemu/replay.h"
> #include "qapi/qmp/qerror.h"
> +#include "config-devices.h"
>
> /* debug PC/ISA interrupts */
> //#define DEBUG_IRQ
> @@ -2793,7 +2794,11 @@ static void pc_machine_initfn(Object *obj)
>
> pcms->max_ram_below_4g = 0; /* use default */
> pcms->smm = ON_OFF_AUTO_AUTO;
> +#ifdef CONFIG_VMPORT
> pcms->vmport = ON_OFF_AUTO_AUTO;
> +#else
> + pcms->vmport = ON_OFF_AUTO_OFF;
> +#endif /* CONFIG_VMPORT */
> /* acpi build is enabled by default if machine supports it */
> pcms->acpi_build_enabled = PC_MACHINE_GET_CLASS(pcms)->has_acpi_build;
> pcms->smbus_enabled = true;
> --
> 2.17.2
>
Queued, thanks.
Paolo