diff --git a/config/linux-qemu.config b/config/linux-qemu.config
index bb493918..742f4392 100644
--- a/config/linux-qemu.config
+++ b/config/linux-qemu.config
@@ -5,6 +5,7 @@ CONFIG_KERNEL_XZ=y
 # CONFIG_CROSS_MEMORY_ATTACH is not set
 # CONFIG_USELIB is not set
 CONFIG_NO_HZ_IDLE=y
+CONFIG_HIGH_RES_TIMERS=y
 CONFIG_LOG_BUF_SHIFT=18
 CONFIG_CGROUPS=y
 CONFIG_MEMCG=y
@@ -98,6 +99,7 @@ CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=65536
+CONFIG_VIRTIO_BLK=m
 CONFIG_EEPROM_93CX6=m
 CONFIG_INTEL_MEI_ME=m
 CONFIG_INTEL_MEI_TXE=m
@@ -118,6 +120,7 @@ CONFIG_MEGARAID_MAILBOX=m
 CONFIG_MEGARAID_SAS=m
 CONFIG_SCSI_GDTH=m
 CONFIG_SCSI_ISCI=m
+CONFIG_SCSI_VIRTIO=m
 CONFIG_SCSI_DH=y
 CONFIG_ATA=m
 CONFIG_SATA_AHCI=m
@@ -130,12 +133,15 @@ CONFIG_DM_THIN_PROVISIONING=y
 CONFIG_DM_VERITY=y
 CONFIG_DM_VERITY_FEC=y
 CONFIG_NETDEVICES=y
+CONFIG_VIRTIO_NET=m
 # CONFIG_NET_VENDOR_3COM is not set
 # CONFIG_NET_VENDOR_ADAPTEC is not set
 # CONFIG_NET_VENDOR_AGERE is not set
+# CONFIG_NET_VENDOR_ALACRITECH is not set
 # CONFIG_NET_VENDOR_ALTEON is not set
 # CONFIG_NET_VENDOR_AMAZON is not set
 # CONFIG_NET_VENDOR_AMD is not set
+# CONFIG_NET_VENDOR_AQUANTIA is not set
 # CONFIG_NET_VENDOR_ARC is not set
 # CONFIG_NET_VENDOR_ATHEROS is not set
 # CONFIG_NET_CADENCE is not set
@@ -150,6 +156,7 @@ CONFIG_NETDEVICES=y
 # CONFIG_NET_VENDOR_EZCHIP is not set
 # CONFIG_NET_VENDOR_EXAR is not set
 # CONFIG_NET_VENDOR_HP is not set
+# CONFIG_NET_VENDOR_HUAWEI is not set
 CONFIG_E1000=m
 CONFIG_E1000E=m
 CONFIG_IGB=m
@@ -237,6 +244,7 @@ CONFIG_USB_EHCI_HCD=m
 CONFIG_USB_EHCI_HCD_PLATFORM=m
 CONFIG_USB_STORAGE=m
 CONFIG_RTC_CLASS=y
+CONFIG_VIRTIO_PCI=y
 # CONFIG_X86_PLATFORM_DEVICES is not set
 CONFIG_INTEL_IOMMU=y
 CONFIG_INTEL_IOMMU_SVM=y
@@ -248,9 +256,7 @@ CONFIG_GENERIC_PHY=y
 CONFIG_DMI_SYSFS=y
 CONFIG_GOOGLE_FIRMWARE=y
 CONFIG_GOOGLE_MEMCONSOLE_X86_LEGACY=y
-# CONFIG_EXT2_FS is not set
 CONFIG_EXT4_FS=y
-CONFIG_EXT4_USE_FOR_EXT2=y
 CONFIG_XFS_FS=y
 # CONFIG_DNOTIFY is not set
 # CONFIG_INOTIFY_USER is not set
@@ -358,7 +364,10 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=y
 CONFIG_CRYPTO_USER_API_RNG=y
 CONFIG_CRYPTO_USER_API_AEAD=y
 # CONFIG_CRYPTO_HW is not set
-# CONFIG_VIRTUALIZATION is not set
+CONFIG_KVM=m
+CONFIG_KVM_INTEL=m
+CONFIG_KVM_AMD=m
+CONFIG_VHOST_NET=m
 CONFIG_CRC_CCITT=m
 CONFIG_CRC_T10DIF=y
 CONFIG_CRC_ITU_T=m
diff --git a/modules/linux b/modules/linux
index f8817935..a53d48f7 100644
--- a/modules/linux
+++ b/modules/linux
@@ -95,6 +95,25 @@ linux_modules-$(CONFIG_LINUX_NVME)	+= drivers/nvme/host/nvme-core.ko
 linux_modules-$(CONFIG_LINUX_MEI)	+= drivers/misc/mei/mei.ko
 linux_modules-$(CONFIG_LINUX_MEI)	+= drivers/misc/mei/mei-me.ko
 
+# IDE drivers for qemu or legacy systems
+linux_modules-$(CONFIG_LINUX_IDE)	+= drivers/ide/ide-core.ko
+linux_modules-$(CONFIG_LINUX_IDE)	+= drivers/ide/ide-pci-generic.ko
+linux_modules-$(CONFIG_LINUX_IDE)	+= drivers/ide/ide-cd_mod.ko
+linux_modules-$(CONFIG_LINUX_IDE)	+= drivers/ide/ide-gd_mod.ko
+
+# KVM virtualization
+# Choose one of the Intel or AMD modules
+linux_modules-$(CONFIG_LINUX_KVM)	+= arch/x86/kvm/kvm.ko
+linux_modules-$(CONFIG_LINUX_KVM)	+= virt/lib/irqbypass.ko
+linux_modules-$(CONFIG_LINUX_KVM)	+= arch/x86/kvm/kvm-intel.ko
+#linux_modules-$(CONFIG_LINUX_KVM)	+= arch/x86/kvm/kvm-amd.ko
+
+# KVM virtual devices
+linux_modules-$(CONFIG_LINUX_VIRTIO)	+= drivers/vhost/vhost.ko
+linux_modules-$(CONFIG_LINUX_VIRTIO)	+= drivers/scsi/virtio_scsi.ko
+linux_modules-$(CONFIG_LINUX_VIRTIO)	+= drivers/block/virtio_blk.ko
+linux_modules-$(CONFIG_LINUX_VIRTIO)	+= drivers/net/virtio_net.ko
+
 EXTRA_FLAGS := -fdebug-prefix-map=$(pwd)=heads -gno-record-gcc-switches
 
 linux_target := \