hw/i386: turn off vmport if CONFIG_VMPORT is disabled
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 <julio.montes@intel.com> Message-Id: <20190712160257.18270-1-julio.montes@intel.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
60ae0b91fe
commit
97fd1ea8c1
|
@ -51,6 +51,7 @@ config PC_ACPI
|
||||||
config I440FX
|
config I440FX
|
||||||
bool
|
bool
|
||||||
imply E1000_PCI
|
imply E1000_PCI
|
||||||
|
imply VMPORT
|
||||||
select PC_PCI
|
select PC_PCI
|
||||||
select PC_ACPI
|
select PC_ACPI
|
||||||
select ACPI_SMBUS
|
select ACPI_SMBUS
|
||||||
|
@ -58,7 +59,6 @@ config I440FX
|
||||||
select IDE_PIIX
|
select IDE_PIIX
|
||||||
select DIMM
|
select DIMM
|
||||||
select SMBIOS
|
select SMBIOS
|
||||||
select VMPORT
|
|
||||||
select VMMOUSE
|
select VMMOUSE
|
||||||
select FW_CFG_DMA
|
select FW_CFG_DMA
|
||||||
|
|
||||||
|
@ -77,6 +77,7 @@ config Q35
|
||||||
imply VTD
|
imply VTD
|
||||||
imply AMD_IOMMU
|
imply AMD_IOMMU
|
||||||
imply E1000E_PCI_EXPRESS
|
imply E1000E_PCI_EXPRESS
|
||||||
|
imply VMPORT
|
||||||
select PC_PCI
|
select PC_PCI
|
||||||
select PC_ACPI
|
select PC_ACPI
|
||||||
select PCI_EXPRESS_Q35
|
select PCI_EXPRESS_Q35
|
||||||
|
@ -84,7 +85,6 @@ config Q35
|
||||||
select AHCI_ICH9
|
select AHCI_ICH9
|
||||||
select DIMM
|
select DIMM
|
||||||
select SMBIOS
|
select SMBIOS
|
||||||
select VMPORT
|
|
||||||
select VMMOUSE
|
select VMMOUSE
|
||||||
select FW_CFG_DMA
|
select FW_CFG_DMA
|
||||||
|
|
||||||
|
|
|
@ -83,6 +83,7 @@
|
||||||
#include "hw/mem/memory-device.h"
|
#include "hw/mem/memory-device.h"
|
||||||
#include "sysemu/replay.h"
|
#include "sysemu/replay.h"
|
||||||
#include "qapi/qmp/qerror.h"
|
#include "qapi/qmp/qerror.h"
|
||||||
|
#include "config-devices.h"
|
||||||
|
|
||||||
/* debug PC/ISA interrupts */
|
/* debug PC/ISA interrupts */
|
||||||
//#define DEBUG_IRQ
|
//#define DEBUG_IRQ
|
||||||
|
@ -2793,7 +2794,11 @@ static void pc_machine_initfn(Object *obj)
|
||||||
|
|
||||||
pcms->max_ram_below_4g = 0; /* use default */
|
pcms->max_ram_below_4g = 0; /* use default */
|
||||||
pcms->smm = ON_OFF_AUTO_AUTO;
|
pcms->smm = ON_OFF_AUTO_AUTO;
|
||||||
|
#ifdef CONFIG_VMPORT
|
||||||
pcms->vmport = ON_OFF_AUTO_AUTO;
|
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 */
|
/* acpi build is enabled by default if machine supports it */
|
||||||
pcms->acpi_build_enabled = PC_MACHINE_GET_CLASS(pcms)->has_acpi_build;
|
pcms->acpi_build_enabled = PC_MACHINE_GET_CLASS(pcms)->has_acpi_build;
|
||||||
pcms->smbus_enabled = true;
|
pcms->smbus_enabled = true;
|
||||||
|
|
Loading…
Reference in a new issue