diff --git a/qemu/default-configs/arm-softmmu.mak b/qemu/default-configs/arm-softmmu.mak
new file mode 100644
index 0000000000..abf4309ee6
--- /dev/null
+++ b/qemu/default-configs/arm-softmmu.mak
@@ -0,0 +1,216 @@
+# Default configuration for arm-softmmu
+
+CONFIG_VGA=y
+CONFIG_NAND=y
+CONFIG_ECC=y
+CONFIG_SERIAL=y
+CONFIG_PTIMER=y
+CONFIG_MAX7310=y
+CONFIG_WM8750=y
+CONFIG_TWL92230=y
+CONFIG_TSC2005=y
+CONFIG_LM832X=y
+CONFIG_TMP105=y
+CONFIG_TMP421=y
+CONFIG_PCA9552=y
+CONFIG_STELLARIS=y
+CONFIG_STELLARIS_INPUT=y
+CONFIG_STELLARIS_ENET=y
+CONFIG_SSD0303=y
+CONFIG_SSD0323=y
+CONFIG_DDC=y
+CONFIG_SII9022=y
+CONFIG_ADS7846=y
+CONFIG_MAX111X=y
+CONFIG_SSI=y
+CONFIG_SSI_SD=y
+CONFIG_SSI_M25P80=y
+CONFIG_LAN9118=y
+CONFIG_SMC91C111=y
+CONFIG_ALLWINNER_EMAC=y
+CONFIG_IMX_FEC=y
+CONFIG_FTGMAC100=y
+CONFIG_DS1338=y
+CONFIG_PFLASH_CFI01=y
+CONFIG_PFLASH_CFI02=y
+CONFIG_MICRODRIVE=y
+CONFIG_USB=y
+CONFIG_USB_MUSB=y
+CONFIG_USB_EHCI_SYSBUS=y
+CONFIG_PLATFORM_BUS=y
+CONFIG_VIRTIO_MMIO=y
+
+CONFIG_ARM11MPCORE=y
+CONFIG_A9MPCORE=y
+CONFIG_A15MPCORE=y
+
+CONFIG_ARM_V7M=y
+CONFIG_NETDUINO2=y
+
+CONFIG_ARM_GIC=y
+CONFIG_ARM_GIC_KVM=$(CONFIG_KVM)
+CONFIG_ARM_TIMER=y
+CONFIG_ARM_MPTIMER=y
+CONFIG_A9_GTIMER=y
+CONFIG_PL011=y
+CONFIG_PL022=y
+CONFIG_PL031=y
+CONFIG_PL041=y
+CONFIG_PL050=y
+CONFIG_PL061=y
+CONFIG_PL080=y
+CONFIG_PL110=y
+CONFIG_PL181=y
+CONFIG_PL190=y
+CONFIG_PL310=y
+CONFIG_PL330=y
+CONFIG_CADENCE=y
+CONFIG_XGMAC=y
+CONFIG_EXYNOS4=y
+CONFIG_PXA2XX=y
+CONFIG_I2C=y
+CONFIG_BITBANG_I2C=y
+CONFIG_FRAMEBUFFER=y
+CONFIG_XILINX_SPIPS=y
+CONFIG_ZYNQ_DEVCFG=y
+
+CONFIG_ARM11SCU=y
+CONFIG_A9SCU=y
+CONFIG_DIGIC=y
+CONFIG_MARVELL_88W8618=y
+CONFIG_OMAP=y
+CONFIG_TSC210X=y
+CONFIG_BLIZZARD=y
+CONFIG_ONENAND=y
+CONFIG_TUSB6010=y
+CONFIG_IMX=y
+CONFIG_MAINSTONE=y
+CONFIG_MPS2=y
+CONFIG_MUSCA=y
+CONFIG_NSERIES=y
+CONFIG_RASPI=y
+CONFIG_REALVIEW=y
+CONFIG_ZAURUS=y
+CONFIG_ZYNQ=y
+CONFIG_STM32F2XX_TIMER=y
+CONFIG_STM32F2XX_USART=y
+CONFIG_STM32F2XX_SYSCFG=y
+CONFIG_STM32F2XX_ADC=y
+CONFIG_STM32F2XX_SPI=y
+CONFIG_STM32F205_SOC=y
+CONFIG_NRF51_SOC=y
+
+CONFIG_CMSDK_APB_TIMER=y
+CONFIG_CMSDK_APB_DUALTIMER=y
+CONFIG_CMSDK_APB_UART=y
+CONFIG_CMSDK_APB_WATCHDOG=y
+
+CONFIG_MPS2_FPGAIO=y
+CONFIG_MPS2_SCC=y
+
+CONFIG_TZ_MPC=y
+CONFIG_TZ_MSC=y
+CONFIG_TZ_PPC=y
+CONFIG_ARMSSE=y
+CONFIG_IOTKIT_SECCTL=y
+CONFIG_IOTKIT_SYSCTL=y
+CONFIG_IOTKIT_SYSINFO=y
+CONFIG_ARMSSE_CPUID=y
+
+CONFIG_VERSATILE=y
+CONFIG_VERSATILE_PCI=y
+CONFIG_VERSATILE_I2C=y
+
+CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=y
+CONFIG_VFIO_PLATFORM=y
+CONFIG_VFIO_XGMAC=y
+CONFIG_VFIO_AMD_XGBE=y
+
+CONFIG_INTEGRATOR=y
+CONFIG_INTEGRATOR_DEBUG=y
+
+CONFIG_ALLWINNER_A10_PIT=y
+CONFIG_ALLWINNER_A10_PIC=y
+CONFIG_ALLWINNER_A10=y
+
+CONFIG_FSL_IMX6=y
+CONFIG_FSL_IMX31=y
+CONFIG_FSL_IMX25=y
+CONFIG_FSL_IMX7=y
+CONFIG_FSL_IMX6UL=y
+
+CONFIG_IMX_I2C=y
+
+CONFIG_PCIE_PORT=y
+CONFIG_XIO3130=y
+CONFIG_IOH3420=y
+CONFIG_I82801B11=y
+CONFIG_ACPI=y
+CONFIG_ARM_VIRT=y
+CONFIG_SMBIOS=y
+CONFIG_ASPEED_SOC=y
+CONFIG_SMBUS_EEPROM=y
+CONFIG_GPIO_KEY=y
+CONFIG_MSF2=y
+CONFIG_FW_CFG_DMA=y
+CONFIG_XILINX_AXI=y
+CONFIG_PCI_EXPRESS_DESIGNWARE=y
+
+CONFIG_STRONGARM=y
+CONFIG_HIGHBANK=y
+CONFIG_MUSICPAL=y
+CONFIG_MEM_DEVICE=y
+CONFIG_DIMM=y
+CONFIG_NVDIMM=y
+CONFIG_ACPI_NVDIMM=y
+
+CONFIG_PCI=y
+# For now, CONFIG_IDE_CORE requires ISA, so we enable it here
+CONFIG_ISA_BUS=y
+CONFIG_VIRTIO_PCI=y
+include virtio.mak
+CONFIG_USB_UHCI=y
+CONFIG_USB_OHCI=y
+CONFIG_USB_EHCI=y
+CONFIG_USB_XHCI=y
+CONFIG_USB_XHCI_NEC=y
+CONFIG_NE2000_PCI=n
+CONFIG_EEPRO100_PCI=n
+CONFIG_PCNET_PCI=n
+CONFIG_PCNET_COMMON=n
+CONFIG_AC97=n
+CONFIG_HDA=y
+CONFIG_ES1370=n
+CONFIG_SCSI=y
+CONFIG_LSI_SCSI_PCI=y
+CONFIG_VMW_PVSCSI_SCSI_PCI=n
+CONFIG_MEGASAS_SCSI_PCI=n
+CONFIG_MPTSAS_SCSI_PCI=n
+CONFIG_RTL8139_PCI=n
+CONFIG_E1000_PCI=n
+CONFIG_E1000E_PCI_EXPRESS=n
+CONFIG_IDE_CORE=y
+CONFIG_IDE_QDEV=y
+CONFIG_IDE_PCI=y
+CONFIG_AHCI=y
+CONFIG_ESP=n
+CONFIG_ESP_PCI=n
+CONFIG_SERIAL_ISA=y
+CONFIG_SERIAL_PCI=y
+CONFIG_CAN_BUS=y
+CONFIG_CAN_SJA1000=y
+CONFIG_CAN_PCI=y
+CONFIG_IPACK=n
+CONFIG_WDT_IB6300ESB=n
+CONFIG_PCI_TESTDEV=n
+CONFIG_NVME_PCI=y
+CONFIG_SD=y
+CONFIG_SDHCI=n
+CONFIG_EDU=n
+CONFIG_VGA_PCI=y
+CONFIG_BOCHS_DISPLAY=n
+CONFIG_IVSHMEM_DEVICE=n
+CONFIG_ROCKER=n
+CONFIG_VFIO=$(CONFIG_LINUX)
+CONFIG_VFIO_PCI=y
+CONFIG_PCI_GENERIC=y
diff --git a/qemu/default-configs/arm-softmmu.mak.virt b/qemu/default-configs/arm-softmmu.mak.virt
new file mode 100644
index 0000000000..ad8b6716b3
--- /dev/null
+++ b/qemu/default-configs/arm-softmmu.mak.virt
@@ -0,0 +1,216 @@
+# Default configuration for arm-softmmu
+
+CONFIG_VGA=y
+CONFIG_NAND=y
+CONFIG_ECC=y
+CONFIG_SERIAL=y
+CONFIG_PTIMER=y
+CONFIG_MAX7310=y
+CONFIG_WM8750=y
+CONFIG_TWL92230=y
+CONFIG_TSC2005=y
+CONFIG_LM832X=y
+CONFIG_TMP105=y
+CONFIG_TMP421=y
+CONFIG_PCA9552=y
+CONFIG_STELLARIS=n
+CONFIG_STELLARIS_INPUT=y
+CONFIG_STELLARIS_ENET=y
+CONFIG_SSD0303=y
+CONFIG_SSD0323=y
+CONFIG_DDC=y
+CONFIG_SII9022=y
+CONFIG_ADS7846=y
+CONFIG_MAX111X=y
+CONFIG_SSI=y
+CONFIG_SSI_SD=y
+CONFIG_SSI_M25P80=y
+CONFIG_LAN9118=y
+CONFIG_SMC91C111=y
+CONFIG_ALLWINNER_EMAC=y
+CONFIG_IMX_FEC=y
+CONFIG_FTGMAC100=y
+CONFIG_DS1338=y
+CONFIG_PFLASH_CFI01=y
+CONFIG_PFLASH_CFI02=y
+CONFIG_MICRODRIVE=y
+CONFIG_USB=y
+CONFIG_USB_MUSB=y
+CONFIG_USB_EHCI_SYSBUS=y
+CONFIG_PLATFORM_BUS=y
+CONFIG_VIRTIO_MMIO=y
+
+CONFIG_ARM11MPCORE=y
+CONFIG_A9MPCORE=y
+CONFIG_A15MPCORE=y
+
+CONFIG_ARM_V7M=y
+CONFIG_NETDUINO2=n
+
+CONFIG_ARM_GIC=y
+CONFIG_ARM_GIC_KVM=$(CONFIG_KVM)
+CONFIG_ARM_TIMER=y
+CONFIG_ARM_MPTIMER=y
+CONFIG_A9_GTIMER=y
+CONFIG_PL011=y
+CONFIG_PL022=n
+CONFIG_PL031=y
+CONFIG_PL041=n
+CONFIG_PL050=n
+CONFIG_PL061=y
+CONFIG_PL080=y
+CONFIG_PL110=n
+CONFIG_PL181=n
+CONFIG_PL190=y
+CONFIG_PL310=y
+CONFIG_PL330=y
+CONFIG_CADENCE=y
+CONFIG_XGMAC=y
+CONFIG_EXYNOS4=n
+CONFIG_PXA2XX=n
+CONFIG_I2C=y
+CONFIG_BITBANG_I2C=y
+CONFIG_FRAMEBUFFER=y
+CONFIG_XILINX_SPIPS=y
+CONFIG_ZYNQ_DEVCFG=y
+
+CONFIG_ARM11SCU=y
+CONFIG_A9SCU=y
+CONFIG_DIGIC=n
+CONFIG_MARVELL_88W8618=y
+CONFIG_OMAP=y
+CONFIG_TSC210X=y
+CONFIG_BLIZZARD=y
+CONFIG_ONENAND=y
+CONFIG_TUSB6010=y
+CONFIG_IMX=y
+CONFIG_MAINSTONE=n
+CONFIG_MPS2=n
+CONFIG_MUSCA=n
+CONFIG_NSERIES=n
+CONFIG_RASPI=n
+CONFIG_REALVIEW=n
+CONFIG_ZAURUS=y
+CONFIG_ZYNQ=n
+CONFIG_STM32F2XX_TIMER=y
+CONFIG_STM32F2XX_USART=y
+CONFIG_STM32F2XX_SYSCFG=y
+CONFIG_STM32F2XX_ADC=y
+CONFIG_STM32F2XX_SPI=y
+CONFIG_STM32F205_SOC=n
+CONFIG_NRF51_SOC=n
+
+CONFIG_CMSDK_APB_TIMER=y
+CONFIG_CMSDK_APB_DUALTIMER=y
+CONFIG_CMSDK_APB_UART=y
+CONFIG_CMSDK_APB_WATCHDOG=y
+
+CONFIG_MPS2_FPGAIO=y
+CONFIG_MPS2_SCC=y
+
+CONFIG_TZ_MPC=y
+CONFIG_TZ_MSC=y
+CONFIG_TZ_PPC=y
+CONFIG_ARMSSE=y
+CONFIG_IOTKIT_SECCTL=y
+CONFIG_IOTKIT_SYSCTL=y
+CONFIG_IOTKIT_SYSINFO=y
+CONFIG_ARMSSE_CPUID=y
+
+CONFIG_VERSATILE=n
+CONFIG_VERSATILE_PCI=y
+CONFIG_VERSATILE_I2C=y
+
+CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=y
+CONFIG_VFIO=$(CONFIG_LINUX)
+CONFIG_VFIO_PLATFORM=y
+CONFIG_VFIO_XGMAC=y
+CONFIG_VFIO_AMD_XGBE=y
+
+CONFIG_INTEGRATOR=n
+CONFIG_INTEGRATOR_DEBUG=y
+
+CONFIG_ALLWINNER_A10_PIT=n
+CONFIG_ALLWINNER_A10_PIC=n
+CONFIG_ALLWINNER_A10=n
+
+CONFIG_FSL_IMX6=n
+CONFIG_FSL_IMX31=n
+CONFIG_FSL_IMX25=n
+CONFIG_FSL_IMX7=n
+CONFIG_FSL_IMX6UL=n
+
+CONFIG_IMX_I2C=y
+
+CONFIG_PCIE_PORT=y
+CONFIG_XIO3130=y
+CONFIG_IOH3420=y
+CONFIG_I82801B11=y
+CONFIG_ACPI=y
+CONFIG_ARM_VIRT=y
+CONFIG_SMBIOS=y
+CONFIG_ASPEED_SOC=n
+CONFIG_SMBUS_EEPROM=y
+CONFIG_GPIO_KEY=y
+CONFIG_MSF2=n
+CONFIG_FW_CFG_DMA=y
+CONFIG_XILINX_AXI=y
+CONFIG_PCI_EXPRESS_DESIGNWARE=y
+
+CONFIG_STRONGARM=n
+CONFIG_HIGHBANK=n
+CONFIG_MUSICPAL=n
+CONFIG_MEM_DEVICE=y
+CONFIG_DIMM=y
+CONFIG_NVDIMM=y
+CONFIG_ACPI_NVDIMM=y
+
+CONFIG_PCI=y
+# For now, CONFIG_IDE_CORE requires ISA, so we enable it here
+CONFIG_ISA_BUS=y
+CONFIG_VIRTIO_PCI=y
+include virtio.mak
+CONFIG_USB_UHCI=y
+CONFIG_USB_OHCI=y
+CONFIG_USB_EHCI=y
+CONFIG_USB_XHCI=y
+CONFIG_USB_XHCI_NEC=y
+CONFIG_NE2000_PCI=n
+CONFIG_EEPRO100_PCI=n
+CONFIG_PCNET_PCI=n
+CONFIG_PCNET_COMMON=n
+CONFIG_AC97=n
+CONFIG_HDA=y
+CONFIG_ES1370=n
+CONFIG_SCSI=y
+CONFIG_LSI_SCSI_PCI=y
+CONFIG_VMW_PVSCSI_SCSI_PCI=n
+CONFIG_MEGASAS_SCSI_PCI=n
+CONFIG_MPTSAS_SCSI_PCI=n
+CONFIG_RTL8139_PCI=n
+CONFIG_E1000_PCI=n
+CONFIG_E1000E_PCI_EXPRESS=n
+CONFIG_IDE_CORE=y
+CONFIG_IDE_QDEV=y
+CONFIG_IDE_PCI=y
+CONFIG_AHCI=y
+CONFIG_ESP=n
+CONFIG_ESP_PCI=n
+CONFIG_SERIAL_ISA=y
+CONFIG_SERIAL_PCI=y
+CONFIG_CAN_BUS=y
+CONFIG_CAN_SJA1000=y
+CONFIG_CAN_PCI=y
+CONFIG_IPACK=n
+CONFIG_WDT_IB6300ESB=n
+CONFIG_PCI_TESTDEV=n
+CONFIG_NVME_PCI=y
+CONFIG_SD=y
+CONFIG_SDHCI=n
+CONFIG_EDU=n
+CONFIG_VGA_PCI=y
+CONFIG_BOCHS_DISPLAY=n
+CONFIG_IVSHMEM_DEVICE=n
+CONFIG_ROCKER=n
+CONFIG_VFIO_PCI=y
+CONFIG_PCI_GENERIC=y