[focal:linux-azure][PATCH] UBUNTU: [Config] azure: CONFIG_PCI_HYPERV=y

[Marcelo Henrique Cerri]

BugLink: https://bugs.launchpad.net/bugs/1908571

Set CONFIG_PCI_HYPERV as built-in to allow instances to boot directly
from NVME disks.

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

diff --git a/debian.azure/abi/5.4.0-1036.38/amd64/azure.modules b/debian.azure/abi/5.4.0-1036.38/amd64/azure.modules
index 998d560d8c46..a1f0cc65d394 100644
--- a/debian.azure/abi/5.4.0-1036.38/amd64/azure.modules
+++ b/debian.azure/abi/5.4.0-1036.38/amd64/azure.modules
@@ -1390,8 +1390,6 @@ pcf50633
 pcf50633-adc
 pcf50633-gpio
 pcf8591
-pci-hyperv
-pci-hyperv-intf
 pci-pf-stub
 pci-stub
 pci200syn
diff --git a/debian.azure/config/annotations b/debian.azure/config/annotations
index 5a2c7cfd40d4..54e63b01179b 100644
--- a/debian.azure/config/annotations
+++ b/debian.azure/config/annotations
@@ -23,7 +23,10 @@ CONFIG_INFINIBAND_IPOIB                            policy<{'amd64': 'm'}>
 CONFIG_INFINIBAND_IPOIB                            mark<ENFORCED> note<LP:#1837397>
 
 CONFIG_BLK_DEV_NVME                                policy<{'amd64': 'y'}>
-CONFIG_BLK_DEV_NVME                                mark<ENFORCED> note<LP:#1793386>
+CONFIG_BLK_DEV_NVME                                mark<ENFORCED> note<LP:#1793386> note<LP:#1908571>
+
+CONFIG_PCI_HYPERV                                  policy<{'amd64': 'y'}>
+CONFIG_PCI_HYPERV                                  mark<ENFORCED> note<LP:#1908571>
 
 CONFIG_EDAC_DECODE_MCE                             policy<{'amd64': 'y'}>
 CONFIG_EDAC_DECODE_MCE                             mark<ENFORCED> note<LP:#1793386>
diff --git a/debian.azure/config/config.common.ubuntu b/debian.azure/config/config.common.ubuntu
index f0924a1f45d1..6ee373d32c50 100644
--- a/debian.azure/config/config.common.ubuntu
+++ b/debian.azure/config/config.common.ubuntu
@@ -3719,8 +3719,8 @@ CONFIG_PCI_ENDPOINT=y
 CONFIG_PCI_ENDPOINT_CONFIGFS=y
 # CONFIG_PCI_ENDPOINT_TEST is not set
 # CONFIG_PCI_EPF_TEST is not set
-CONFIG_PCI_HYPERV=m
-CONFIG_PCI_HYPERV_INTERFACE=m
+CONFIG_PCI_HYPERV=y
+CONFIG_PCI_HYPERV_INTERFACE=y
 CONFIG_PCI_IOV=y
 CONFIG_PCI_LABEL=y
 CONFIG_PCI_LOCKLESS_CONFIG=y
-- 
2.25.1