[MANTIC][PATCH] UBUNTU: [Config] set VIRTIO_BLK=y for default qemu/openstack boot

[Dimitri John Ledkov]

Default qemu & openstack virtio models use virtio-blk, instead of
virtio-scsi. Until this is true, keep both virtio-blk & virtio-scsi as
builtin.

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

Signed-off-by: Dimitri John Ledkov <dimitri.ledkov at canonical.com>
---
 debian.master/config/annotations | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 8fbb18e64e..f359d014e4 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -726,8 +726,8 @@ CONFIG_VFIO_PCI                                 note<'LP: #1636733'>
 CONFIG_VIDEO_VIMC                               policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}>
 CONFIG_VIDEO_VIMC                               note<'LP: #1831482'>
 
-CONFIG_VIRTIO_BLK                               policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': 'm'}>
-CONFIG_VIRTIO_BLK                               note<'KVM paravirt support -- not autoloadable'>
+CONFIG_VIRTIO_BLK                               policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}>
+CONFIG_VIRTIO_BLK                               note<'LP: #2030745'>
 
 CONFIG_VIRTIO_MMIO                              policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'n'}>
 CONFIG_VIRTIO_MMIO                              note<'LP: #1557689'>
-- 
2.34.1