3788c7b6e5
* SCSI fix to pass maximum transfer size (Daniel Barboza) * chardev fixes and improved iothread support (Daniel Berrangé, Peter) * checkpatch tweak (Eric) * make help tweak (Marc-André) * make more PCI NICs available with -net or -nic (myself) * change default q35 NIC to e1000e (myself) * SCSI support for NDOB bit (myself) * membarrier system call support (myself) * SuperIO refactoring (Philippe) * miscellaneous cleanups and fixes (Thomas) -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQEcBAABAgAGBQJapqaMAAoJEL/70l94x66DQoUH/Rvg+a8giz/SrEA4P8D3Cb2z 4GNbNUUoy4oU0ltD5IAMskMwpOsvl1batE0D+pKIlfO9NV4+Cj2kpgo0p9TxoYqM VCby3wRtx27zb5nVytC6M++iIKXmeEMqXmFw61I6umddNPSl4IR3hiHEE0DM+7dV UPIOvJeEiazyQaw3Iw+ZctNn8dDBKc/+6oxP9xRcYTaZ6hB4G9RZkqGNNSLcJkk7 R0UotdjzIZhyWMOkjIwlpTF4sWv8gsYUV4bPYKMYho5B0Obda2dBM3I1kpA8yDa/ xZ5lheOaAVBZvM5aMIcaQPa65MO9hLyXFmhMOgyfpJhLBBz6Qpa4OLLI6DeTN+0= =UAgA -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging * Record-replay lockstep execution, log dumper and fixes (Alex, Pavel) * SCSI fix to pass maximum transfer size (Daniel Barboza) * chardev fixes and improved iothread support (Daniel Berrangé, Peter) * checkpatch tweak (Eric) * make help tweak (Marc-André) * make more PCI NICs available with -net or -nic (myself) * change default q35 NIC to e1000e (myself) * SCSI support for NDOB bit (myself) * membarrier system call support (myself) * SuperIO refactoring (Philippe) * miscellaneous cleanups and fixes (Thomas) # gpg: Signature made Mon 12 Mar 2018 16:10:52 GMT # gpg: using RSA key BFFBD25F78C7AE83 # gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" # gpg: aka "Paolo Bonzini <pbonzini@redhat.com>" # Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4 E2F7 7E15 100C CD36 69B1 # Subkey fingerprint: F133 3857 4B66 2389 866C 7682 BFFB D25F 78C7 AE83 * remotes/bonzini/tags/for-upstream: (69 commits) tcg: fix cpu_io_recompile replay: update documentation replay: save vmstate of the asynchronous events replay: don't process async events when warping the clock scripts/replay-dump.py: replay log dumper replay: avoid recursive call of checkpoints replay: check return values of fwrite replay: push replay_mutex_lock up the call tree replay: don't destroy mutex at exit replay: make locking visible outside replay code replay/replay-internal.c: track holding of replay_lock replay/replay.c: bump REPLAY_VERSION again replay: save prior value of the host clock replay: added replay log format description replay: fix save/load vm for non-empty queue replay: fixed replay_enable_events replay: fix processing async events cpu-exec: fix exception_index handling hw/i386/pc: Factor out the superio code hw/alpha/dp264: Use the TYPE_SMC37C669_SUPERIO ... Signed-off-by: Peter Maydell <peter.maydell@linaro.org> # Conflicts: # default-configs/i386-softmmu.mak # default-configs/x86_64-softmmu.mak
69 lines
1.2 KiB
Makefile
69 lines
1.2 KiB
Makefile
# Default configuration for i386-softmmu
|
|
|
|
include pci.mak
|
|
include sound.mak
|
|
include usb.mak
|
|
CONFIG_QXL=$(CONFIG_SPICE)
|
|
CONFIG_VGA_ISA=y
|
|
CONFIG_VGA_CIRRUS=y
|
|
CONFIG_VMWARE_VGA=y
|
|
CONFIG_VMXNET3_PCI=y
|
|
CONFIG_VIRTIO_VGA=y
|
|
CONFIG_VMMOUSE=y
|
|
CONFIG_IPMI=y
|
|
CONFIG_IPMI_LOCAL=y
|
|
CONFIG_IPMI_EXTERN=y
|
|
CONFIG_ISA_IPMI_KCS=y
|
|
CONFIG_ISA_IPMI_BT=y
|
|
CONFIG_SERIAL=y
|
|
CONFIG_SERIAL_ISA=y
|
|
CONFIG_PARALLEL=y
|
|
CONFIG_I8254=y
|
|
CONFIG_PCSPK=y
|
|
CONFIG_PCKBD=y
|
|
CONFIG_FDC=y
|
|
CONFIG_ACPI=y
|
|
CONFIG_ACPI_X86=y
|
|
CONFIG_ACPI_X86_ICH=y
|
|
CONFIG_ACPI_MEMORY_HOTPLUG=y
|
|
CONFIG_ACPI_CPU_HOTPLUG=y
|
|
CONFIG_APM=y
|
|
CONFIG_I8257=y
|
|
CONFIG_IDE_ISA=y
|
|
CONFIG_IDE_PIIX=y
|
|
CONFIG_NE2000_ISA=y
|
|
CONFIG_HPET=y
|
|
CONFIG_APPLESMC=y
|
|
CONFIG_I8259=y
|
|
CONFIG_PFLASH_CFI01=y
|
|
CONFIG_TPM_TIS=$(CONFIG_TPM)
|
|
CONFIG_TPM_CRB=$(CONFIG_TPM)
|
|
CONFIG_MC146818RTC=y
|
|
CONFIG_PCI_PIIX=y
|
|
CONFIG_WDT_IB700=y
|
|
CONFIG_ISA_DEBUG=y
|
|
CONFIG_ISA_TESTDEV=y
|
|
CONFIG_VMPORT=y
|
|
CONFIG_SGA=y
|
|
CONFIG_LPC_ICH9=y
|
|
CONFIG_PCI_Q35=y
|
|
CONFIG_APIC=y
|
|
CONFIG_IOAPIC=y
|
|
CONFIG_PVPANIC=y
|
|
CONFIG_MEM_HOTPLUG=y
|
|
CONFIG_NVDIMM=y
|
|
CONFIG_ACPI_NVDIMM=y
|
|
CONFIG_PCIE_PORT=y
|
|
CONFIG_XIO3130=y
|
|
CONFIG_IOH3420=y
|
|
CONFIG_I82801B11=y
|
|
CONFIG_SMBIOS=y
|
|
CONFIG_HYPERV_TESTDEV=$(CONFIG_KVM)
|
|
CONFIG_PXB=y
|
|
CONFIG_ACPI_VMGENID=y
|
|
CONFIG_FW_CFG_DMA=y
|
|
CONFIG_I2C=y
|
|
CONFIG_SEV=$(CONFIG_KVM)
|
|
CONFIG_VTD=y
|
|
CONFIG_AMD_IOMMU=y
|