| Message ID | 20220210103806.19659-3-juergh@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | [SRU,I/raspi,1/1] UBUNTU: [Config] raspi: Set VIRTIO_PCI=m | expand |
Applied to F/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 | 4 ++-- > debian.raspi/config/config.common.ubuntu | 3 ++- > 2 files changed, 4 insertions(+), 3 deletions(-) > > diff --git a/debian.raspi/config/annotations b/debian.raspi/config/annotations > index 0932f06da2c7..4501b0057146 100644 > --- a/debian.raspi/config/annotations > +++ b/debian.raspi/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/config/config.common.ubuntu b/debian.raspi/config/config.common.ubuntu > index b219551934ed..0ca5e98c5a1b 100644 > --- a/debian.raspi/config/config.common.ubuntu > +++ b/debian.raspi/config/config.common.ubuntu > @@ -7873,7 +7873,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
diff --git a/debian.raspi/config/annotations b/debian.raspi/config/annotations index 0932f06da2c7..4501b0057146 100644 --- a/debian.raspi/config/annotations +++ b/debian.raspi/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/config/config.common.ubuntu b/debian.raspi/config/config.common.ubuntu index b219551934ed..0ca5e98c5a1b 100644 --- a/debian.raspi/config/config.common.ubuntu +++ b/debian.raspi/config/config.common.ubuntu @@ -7873,7 +7873,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
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 | 4 ++-- debian.raspi/config/config.common.ubuntu | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-)