[azure][PATCH] UBUNTU: [Config] CONFIG_HYPERV_STORAGE=y

[Marcelo Henrique Cerri]

BugLink: http://bugs.launchpad.net/bugs/1690136

Make the modules hv_vmbus and hv_storvsc built-in in the Azure kernel.

Currently it's not possible to boot Azure instances without an initrd.
The flexibility of booting an instance without an initrd is important to
reduce boot time.

Signed-off-by: Marcelo Henrique Cerri <marcelo.cerri at canonical.com>
---
 debian.azure/abi/4.10.0-1004.4/amd64/azure.modules | 3 ---
 debian.azure/config/config.common.ubuntu           | 6 +++---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/debian.azure/abi/4.10.0-1004.4/amd64/azure.modules b/debian.azure/abi/4.10.0-1004.4/amd64/azure.modules
index 59f09d8b21d2..1f10007ca1a5 100644
--- a/debian.azure/abi/4.10.0-1004.4/amd64/azure.modules
+++ b/debian.azure/abi/4.10.0-1004.4/amd64/azure.modules
@@ -231,9 +231,7 @@ hid-generic
 hid-hyperv
 hv_balloon
 hv_netvsc
-hv_storvsc
 hv_utils
-hv_vmbus
 hyperv_fb
 hyperv-keyboard
 i2c-algo-bit
@@ -621,7 +619,6 @@ scsi_dh_alua
 scsi_dh_emc
 scsi_dh_hp_sw
 scsi_dh_rdac
-scsi_transport_fc
 scsi_transport_iscsi
 scsi_transport_sas
 scsi_transport_spi
diff --git a/debian.azure/config/config.common.ubuntu b/debian.azure/config/config.common.ubuntu
index 67e136c1f0b7..2b70297c3442 100644
--- a/debian.azure/config/config.common.ubuntu
+++ b/debian.azure/config/config.common.ubuntu
@@ -1939,12 +1939,12 @@ CONFIG_HW_RANDOM_INTEL=m
 CONFIG_HW_RANDOM_TIMERIOMEM=m
 CONFIG_HW_RANDOM_TPM=m
 CONFIG_HW_RANDOM_VIA=m
-CONFIG_HYPERV=m
+CONFIG_HYPERV=y
 CONFIG_HYPERVISOR_GUEST=y
 CONFIG_HYPERV_BALLOON=m
 CONFIG_HYPERV_KEYBOARD=m
 CONFIG_HYPERV_NET=m
-CONFIG_HYPERV_STORAGE=m
+CONFIG_HYPERV_STORAGE=y
 CONFIG_HYPERV_UTILS=m
 CONFIG_HZ=250
 # CONFIG_HZ_100 is not set
@@ -4268,7 +4268,7 @@ CONFIG_SCSI_EATA_MAX_TAGS=16
 CONFIG_SCSI_EATA_TAGGED_QUEUE=y
 CONFIG_SCSI_ENCLOSURE=m
 CONFIG_SCSI_ESAS2R=m
-CONFIG_SCSI_FC_ATTRS=m
+CONFIG_SCSI_FC_ATTRS=y
 CONFIG_SCSI_FLASHPOINT=y
 CONFIG_SCSI_FUTURE_DOMAIN=m
 CONFIG_SCSI_GDTH=m
-- 
2.7.4