0048fa6c80
A bunch of fixes all over the place. All of ACPI refactoring has been merged. Legacy pci commands have been dropped. virtio header cleanup initial patches from virtio-1.0 branch Signed-off-by: Michael S. Tsirkin <mst@redhat.com> -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJU/CoXAAoJECgfDbjSjVRpX7EH/RMmgtsDO4wvqJu++lHvkB/q kSaXZYTpJTo0i5JE7n2brwuXA4902tTg9g5TMUpGPh9Pt2QRg7RTgGC1vqZyOBos MPw+4BO2v66S6qgX7bOf222z7r64cHTY7pLkQlrfD4usPlu2eusZ64UTW6Ru51fW WF9E9aunbl+HnuCGq6Iez3sCLscTBJpU/lEr6oSyHhuq3aa0CjjraEeV0E/QcwJG HTUeFymL8NFvlXZblsLI++VOv7Mxpi6yiCQ5XoKpFgGMvidwo41Aso6gB3ySGxOd w8O3Nbu77Iw/StDRNCg/5/GapabMKh2bE4UCsYY5OS63ZtD0fl0CCblhzm/ZFPw= =LY/j -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging pci, pc, virtio fixes and cleanups A bunch of fixes all over the place. All of ACPI refactoring has been merged. Legacy pci commands have been dropped. virtio header cleanup initial patches from virtio-1.0 branch Signed-off-by: Michael S. Tsirkin <mst@redhat.com> * remotes/mst/tags/for_upstream: (130 commits) acpi: drop unused code aml-build: comment fix acpi-build: fix typo in comment acpi: update generated files vhost user:support vhost user nic for non msi guests aml-build: fix build for glib < 2.22 acpi: update generated files Makefile.target: binary depends on config-devices acpi-test-data: update after pci rewrite acpi, mem-hotplug: use PC_DIMM_SLOT_PROP in acpi_memory_plug_cb(). pci-hotplug-old: Has been dead for five major releases, bury pci: Give a few helpers internal linkage acpi: make build_*() routines static to aml-build.c pc: acpi: remove not used anymore ssdt-[misc|pcihp].hex.generated blobs pc: acpi-build: drop template patching and create PCI bus tree dynamically tests: ACPI: update pc/SSDT.bridge due to new alg of PCI tree creation pc: acpi-build: simplify PCI bus tree generation tests: add ACPI blobs for qemu with bridge cases tests: bios-tables-test: add support for testing bridges tests: ACPI test blobs update due to PCI0._CRS changes ... Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Conflicts: hw/pci/pci-hotplug-old.c
48 lines
841 B
Makefile
48 lines
841 B
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_VMMOUSE=y
|
|
CONFIG_SERIAL=y
|
|
CONFIG_PARALLEL=y
|
|
CONFIG_I8254=y
|
|
CONFIG_PCSPK=y
|
|
CONFIG_PCKBD=y
|
|
CONFIG_FDC=y
|
|
CONFIG_ACPI=y
|
|
CONFIG_APM=y
|
|
CONFIG_I8257=y
|
|
CONFIG_IDE_ISA=y
|
|
CONFIG_IDE_PIIX=y
|
|
CONFIG_NE2000_ISA=y
|
|
CONFIG_PIIX_PCI=y
|
|
CONFIG_HPET=y
|
|
CONFIG_APPLESMC=y
|
|
CONFIG_I8259=y
|
|
CONFIG_PFLASH_CFI01=y
|
|
CONFIG_TPM_TIS=$(CONFIG_TPM)
|
|
CONFIG_MC146818RTC=y
|
|
CONFIG_PAM=y
|
|
CONFIG_PCI_PIIX=y
|
|
CONFIG_WDT_IB700=y
|
|
CONFIG_XEN_I386=$(CONFIG_XEN)
|
|
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_ICC_BUS=y
|
|
CONFIG_PVPANIC=y
|
|
CONFIG_MEM_HOTPLUG=y
|
|
CONFIG_XIO3130=y
|
|
CONFIG_IOH3420=y
|
|
CONFIG_I82801B11=y
|