diff mbox

[SRU,I/raspi,1/1] UBUNTU: [Config] raspi: Set VIRTIO_PCI=m

Message ID 20220210103806.19659-2-juergh@canonical.com
State New
Headers show

Commit Message

Juerg Haefliger Feb. 10, 2022, 10:38 a.m. UTC 
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@canonical.com>
---
 debian.raspi/config/annotations          | 2 ++
 debian.raspi/config/config.common.ubuntu | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

Comments

Juerg Haefliger Feb. 10, 2022, 4:59 p.m. UTC | #1 
Applied to I/raspi master-next branch.

...Juerg


> 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@canonical.com>
> ---
>  debian.raspi/config/annotations          | 2 ++
>  debian.raspi/config/config.common.ubuntu | 3 ++-
>  2 files changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/debian.raspi/config/annotations b/debian.raspi/config/annotations
> index a9dcab5c622e..f3f37e64d6ce 100644
> --- a/debian.raspi/config/annotations
> +++ b/debian.raspi/config/annotations
> @@ -4,6 +4,8 @@
>  
>  include "../../debian.master/config/annotations"
>  
> +CONFIG_VIRTIO_PCI				policy<{'*': 'm'}> mark<ENFORCED> note<LP: #1959102>
> +
>  CONFIG_HUGETLBFS				policy<{'arm64': 'y', 'armhf': 'y', 'armhf-raspi-nolpae': '-'}> mark<ENFORCED> note<LP: #1933627>
>  CONFIG_CGROUP_HUGETLB				policy<{'arm64': 'y', 'armhf': 'y', 'armhf-raspi-nolpae': '-'}> mark<ENFORCED> note<LP: #1933627>
>  
> diff --git a/debian.raspi/config/config.common.ubuntu b/debian.raspi/config/config.common.ubuntu
> index 55b53ce32da1..563f66106bd2 100644
> --- a/debian.raspi/config/config.common.ubuntu
> +++ b/debian.raspi/config/config.common.ubuntu
> @@ -8733,7 +8733,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_PCI_LIB=m
>  # CONFIG_VIRTIO_PMEM is not set
>  CONFIG_VIRTIO_VDPA=m
Juerg Haefliger Feb. 10, 2022, 5 p.m. UTC | #2 
Applied to I/raspi master-next branch.

...Juerg


> 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@canonical.com>
> ---
>  debian.raspi/config/annotations          | 2 ++
>  debian.raspi/config/config.common.ubuntu | 3 ++-
>  2 files changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/debian.raspi/config/annotations b/debian.raspi/config/annotations
> index a9dcab5c622e..f3f37e64d6ce 100644
> --- a/debian.raspi/config/annotations
> +++ b/debian.raspi/config/annotations
> @@ -4,6 +4,8 @@
>  
>  include "../../debian.master/config/annotations"
>  
> +CONFIG_VIRTIO_PCI				policy<{'*': 'm'}> mark<ENFORCED> note<LP: #1959102>
> +
>  CONFIG_HUGETLBFS				policy<{'arm64': 'y', 'armhf': 'y', 'armhf-raspi-nolpae': '-'}> mark<ENFORCED> note<LP: #1933627>
>  CONFIG_CGROUP_HUGETLB				policy<{'arm64': 'y', 'armhf': 'y', 'armhf-raspi-nolpae': '-'}> mark<ENFORCED> note<LP: #1933627>
>  
> diff --git a/debian.raspi/config/config.common.ubuntu b/debian.raspi/config/config.common.ubuntu
> index 55b53ce32da1..563f66106bd2 100644
> --- a/debian.raspi/config/config.common.ubuntu
> +++ b/debian.raspi/config/config.common.ubuntu
> @@ -8733,7 +8733,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_PCI_LIB=m
>  # CONFIG_VIRTIO_PMEM is not set
>  CONFIG_VIRTIO_VDPA=m
diff mbox

Patch

diff --git a/debian.raspi/config/annotations b/debian.raspi/config/annotations
index a9dcab5c622e..f3f37e64d6ce 100644
--- a/debian.raspi/config/annotations
+++ b/debian.raspi/config/annotations
@@ -4,6 +4,8 @@ 
 
 include "../../debian.master/config/annotations"
 
+CONFIG_VIRTIO_PCI				policy<{'*': 'm'}> mark<ENFORCED> note<LP: #1959102>
+
 CONFIG_HUGETLBFS				policy<{'arm64': 'y', 'armhf': 'y', 'armhf-raspi-nolpae': '-'}> mark<ENFORCED> note<LP: #1933627>
 CONFIG_CGROUP_HUGETLB				policy<{'arm64': 'y', 'armhf': 'y', 'armhf-raspi-nolpae': '-'}> mark<ENFORCED> note<LP: #1933627>
 
diff --git a/debian.raspi/config/config.common.ubuntu b/debian.raspi/config/config.common.ubuntu
index 55b53ce32da1..563f66106bd2 100644
--- a/debian.raspi/config/config.common.ubuntu
+++ b/debian.raspi/config/config.common.ubuntu
@@ -8733,7 +8733,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_PCI_LIB=m
 # CONFIG_VIRTIO_PMEM is not set
 CONFIG_VIRTIO_VDPA=m