[SRU][B/raspi-5.4][PATCH 1/1] UBUNTU: [Config] raspi-bionic: Set VIRTIO_PCI=m

[Juerg Haefliger]

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

Enable the VIRTIO_PCI module which is required for ADT and autopkgtest.

Signed-off-by: Juerg Haefliger <juergh at canonical.com>
---
 debian.raspi-bionic/config/annotations          | 4 ++--
 debian.raspi-bionic/config/config.common.ubuntu | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian.raspi-bionic/config/annotations b/debian.raspi-bionic/config/annotations
index e580fae6c16b..5fd79a3f3af5 100644
--- a/debian.raspi-bionic/config/annotations
+++ b/debian.raspi-bionic/config/annotations
@@ -7667,14 +7667,14 @@ CONFIG_VME_USER                                 policy<{'amd64': 'm', 'arm64': '
 CONFIG_VME_PIO2                                 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm'}>
 
 # Menu: Device Drivers >> Virtio drivers
-CONFIG_VIRTIO_PCI                               policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
+CONFIG_VIRTIO_PCI                               policy<{'amd64': 'y', 'arm64': 'm', 'armhf': 'm', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_VIRTIO_PCI_LEGACY                        policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_VIRTIO_BALLOON                           policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_VIRTIO_INPUT                             policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm'}>
 CONFIG_VIRTIO_MMIO                              policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'n'}>
 CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES              policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y'}>
 #
-CONFIG_VIRTIO_PCI                               mark<review>
+CONFIG_VIRTIO_PCI                               mark<ENFORCED> note<LP: #1959102>
 CONFIG_VIRTIO_MMIO                              note<LP:1557689>
 
 # Menu: Device Drivers >> Virtualization drivers
diff --git a/debian.raspi-bionic/config/config.common.ubuntu b/debian.raspi-bionic/config/config.common.ubuntu
index 4f1a6050cb7f..f1b0550c2334 100644
--- a/debian.raspi-bionic/config/config.common.ubuntu
+++ b/debian.raspi-bionic/config/config.common.ubuntu
@@ -7863,7 +7863,8 @@ CONFIG_VIRTIO_MENU=y
 CONFIG_VIRTIO_MMIO=y
 # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
 CONFIG_VIRTIO_NET=m
-# CONFIG_VIRTIO_PCI is not set
+CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_PCI_LEGACY=y
 # CONFIG_VIRTIO_PMEM is not set
 CONFIG_VIRTIO_VSOCKETS=m
 CONFIG_VIRTIO_VSOCKETS_COMMON=m
-- 
2.32.0