[azure] Revert "UBUNTU: [config] azure: disable VIRTIO drivers"
diff mbox

Message ID 1495715910-10943-1-git-send-email-marcelo.cerri@canonical.com
State New
Headers show

Commit Message

Marcelo Henrique Cerri May 25, 2017, 12:38 p.m. UTC
BugLink: https://bugs.launchpad.net/bugs/1693494

This reverts commit 44fbcb8c680873ba841fad90ff1eb3d23546eb78.

Re-enable virtio support in order to run the ADT tests with KVM.

Signed-off-by: Marcelo Henrique Cerri <marcelo.cerri@canonical.com>
---
 debian.azure/config/config.common.ubuntu | 34 ++++++++++++++++++++++++++------
 1 file changed, 28 insertions(+), 6 deletions(-)

Comments

Stefan Bader May 29, 2017, 12:49 p.m. UTC | #1

Kleber Souza May 29, 2017, 1:19 p.m. UTC | #2

Marcelo Henrique Cerri May 30, 2017, 1:46 p.m. UTC | #3

Patch
diff mbox

diff --git a/debian.azure/config/config.common.ubuntu b/debian.azure/config/config.common.ubuntu
index cefd79787b5e..14a363fdd891 100644
--- a/debian.azure/config/config.common.ubuntu
+++ b/debian.azure/config/config.common.ubuntu
@@ -448,6 +448,7 @@  CONFIG_BACKLIGHT_LCD_SUPPORT=y
 # CONFIG_BACKLIGHT_TPS65217 is not set
 # CONFIG_BACKLIGHT_WM831X is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
+CONFIG_BALLOON_COMPACTION=y
 CONFIG_BASE_FULL=y
 CONFIG_BASE_SMALL=0
 CONFIG_BATMAN_ADV=m
@@ -651,7 +652,7 @@  CONFIG_CAIF_SPI_SLAVE=m
 # CONFIG_CAIF_SPI_SYNC is not set
 CONFIG_CAIF_TTY=m
 CONFIG_CAIF_USB=m
-# CONFIG_CAIF_VIRTIO is not set
+CONFIG_CAIF_VIRTIO=m
 CONFIG_CALGARY_IOMMU=y
 CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y
 CONFIG_CAN=m
@@ -949,6 +950,7 @@  CONFIG_CRYPTO_DEV_QAT=m
 # CONFIG_CRYPTO_DEV_QAT_C62XVF is not set
 CONFIG_CRYPTO_DEV_QAT_DH895xCC=m
 CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
+CONFIG_CRYPTO_DEV_VIRTIO=m
 CONFIG_CRYPTO_DH=m
 CONFIG_CRYPTO_DRBG=y
 CONFIG_CRYPTO_DRBG_CTR=y
@@ -1264,6 +1266,7 @@  CONFIG_DRM_RADEON=m
 # CONFIG_DRM_RADEON_USERPTR is not set
 CONFIG_DRM_TTM=m
 CONFIG_DRM_VGEM=m
+CONFIG_DRM_VIRTIO_GPU=m
 # CONFIG_DRM_VMWGFX is not set
 CONFIG_DS1682=m
 CONFIG_DS1803=m
@@ -1947,6 +1950,7 @@  CONFIG_HTU21=m
 CONFIG_HT_IRQ=y
 CONFIG_HUGETLBFS=y
 CONFIG_HUGETLB_PAGE=y
+CONFIG_HVC_DRIVER=y
 CONFIG_HWLAT_TRACER=y
 CONFIG_HWMON=y
 # CONFIG_HWMON_DEBUG_CHIP is not set
@@ -1959,6 +1963,7 @@  CONFIG_HW_RANDOM_INTEL=m
 CONFIG_HW_RANDOM_TIMERIOMEM=m
 CONFIG_HW_RANDOM_TPM=m
 CONFIG_HW_RANDOM_VIA=m
+CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_HYPERV=y
 CONFIG_HYPERVISOR_GUEST=y
 CONFIG_HYPERV_BALLOON=m
@@ -2279,6 +2284,8 @@  CONFIG_INTEL_MEI_ME=m
 CONFIG_INTEL_MEI_TXE=m
 CONFIG_INTEL_MEI_WDT=m
 CONFIG_INTEL_MIC_BUS=m
+CONFIG_INTEL_MIC_CARD=m
+CONFIG_INTEL_MIC_HOST=m
 CONFIG_INTEL_MIC_X100_DMA=m
 # CONFIG_INTEL_OAKTRAIL is not set
 CONFIG_INTEL_PCH_THERMAL=m
@@ -2805,6 +2812,7 @@  CONFIG_MEMCG=y
 CONFIG_MEMCG_SWAP=y
 # CONFIG_MEMCG_SWAP_ENABLED is not set
 CONFIG_MEMORY=y
+CONFIG_MEMORY_BALLOON=y
 CONFIG_MEMORY_FAILURE=y
 CONFIG_MEMORY_HOTPLUG=y
 CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y
@@ -3131,6 +3139,7 @@  CONFIG_NETWORK_SECMARK=y
 CONFIG_NET_9P=m
 # CONFIG_NET_9P_DEBUG is not set
 CONFIG_NET_9P_RDMA=m
+CONFIG_NET_9P_VIRTIO=m
 CONFIG_NET_ACT_BPF=m
 CONFIG_NET_ACT_CONNMARK=m
 CONFIG_NET_ACT_CSUM=m
@@ -4054,7 +4063,7 @@  CONFIG_REISERFS_FS_XATTR=y
 # CONFIG_REISERFS_PROC_INFO is not set
 CONFIG_RELAY=y
 CONFIG_RELOCATABLE=y
-# CONFIG_REMOTEPROC is not set
+CONFIG_REMOTEPROC=m
 # CONFIG_RESET_ATH79 is not set
 # CONFIG_RESET_BERLIN is not set
 CONFIG_RESET_CONTROLLER=y
@@ -4353,6 +4362,7 @@  CONFIG_SCSI_UFSHCD_PCI=m
 CONFIG_SCSI_UFSHCD_PLATFORM=m
 CONFIG_SCSI_UFS_DWC_TC_PCI=m
 CONFIG_SCSI_UFS_DWC_TC_PLATFORM=m
+CONFIG_SCSI_VIRTIO=m
 CONFIG_SCSI_WD719X=m
 CONFIG_SCTP_COOKIE_HMAC_MD5=y
 CONFIG_SCTP_COOKIE_HMAC_SHA1=y
@@ -5047,14 +5057,25 @@  CONFIG_VGA_SWITCHEROO=y
 CONFIG_VHOST=m
 # CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
 CONFIG_VHOST_NET=m
+CONFIG_VHOST_RING=m
 CONFIG_VHOST_SCSI=m
-# CONFIG_VHOST_VSOCK is not set
+CONFIG_VHOST_VSOCK=m
 CONFIG_VIA_FIR=m
 CONFIG_VIA_WDT=m
 # CONFIG_VIDEO_ADV_DEBUG is not set
 # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-# CONFIG_VIRTIO_MMIO is not set
-# CONFIG_VIRTIO_PCI is not set
+CONFIG_VIRTIO=y
+CONFIG_VIRTIO_BALLOON=y
+CONFIG_VIRTIO_BLK=m
+CONFIG_VIRTIO_CONSOLE=y
+CONFIG_VIRTIO_INPUT=m
+CONFIG_VIRTIO_MMIO=y
+CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
+CONFIG_VIRTIO_NET=m
+CONFIG_VIRTIO_PCI=y
+CONFIG_VIRTIO_PCI_LEGACY=y
+CONFIG_VIRTIO_VSOCKETS=m
+CONFIG_VIRTIO_VSOCKETS_COMMON=m
 CONFIG_VIRTUALIZATION=y
 # CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
 CONFIG_VIRT_DRIVERS=y
@@ -5078,7 +5099,8 @@  CONFIG_VMIVME_7805=m
 # CONFIG_VMWARE_VMCI is not set
 # CONFIG_VMXNET3 is not set
 CONFIG_VM_EVENT_COUNTERS=y
-# CONFIG_VOP_BUS is not set
+CONFIG_VOP=m
+CONFIG_VOP_BUS=m
 CONFIG_VSOCKETS=m
 CONFIG_VT=y
 CONFIG_VT6655=m