[PATCH 1/2] lxc: remove virtio kernel configs

[PATCH 1/2] lxc: remove virtio kernel configs

[Chin Huat Ang]

The script lxc-checkconfig doesn't seem to report virtio related kernel
configs as required, so remove them from lxc.cfg instead.

Signed-off-by: Chin Huat Ang <chin.huat.ang@intel.com>
---
 recipes-kernel/linux/linux-yocto/lxc.cfg | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/recipes-kernel/linux/linux-yocto/lxc.cfg b/recipes-kernel/linux/linux-yocto/lxc.cfg
index c25d60f..e5f1edc 100644
--- a/recipes-kernel/linux/linux-yocto/lxc.cfg
+++ b/recipes-kernel/linux/linux-yocto/lxc.cfg
@@ -21,18 +21,7 @@ CONFIG_NETPRIO_CGROUP=m
 CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
 
 # Virtual drivers
-CONFIG_VIRTIO_BLK=y
-CONFIG_SCSI_VIRTIO=y
-CONFIG_VIRTIO_NET=m
 CONFIG_HVC_DRIVER=y
-CONFIG_VIRTIO_CONSOLE=y
-CONFIG_HW_RANDOM_VIRTIO=m
-CONFIG_VIRTIO=y
-CONFIG_VIRTIO_RING=y
-CONFIG_VIRTIO_PCI=y
-CONFIG_VIRTIO_BALLOON=y
-CONFIG_VIRTIO_MMIO=y
-
 
 # Base support for live boot
 CONFIG_BLK_DEV_LOOP=y
-- 
2.7.4

[PATCH 2/2] linux-yocto: add virtio kernel configs

[Chin Huat Ang]

Instead of setting virtio kernel configs in LXC fragment, just reuse
cfg/virtio.scc from yocto-kernel-cache.

Signed-off-by: Chin Huat Ang <chin.huat.ang@intel.com>
---
 recipes-kernel/linux/linux-yocto_virtualization.inc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/recipes-kernel/linux/linux-yocto_virtualization.inc b/recipes-kernel/linux/linux-yocto_virtualization.inc
index 5d3cbc6..f050b3f 100644
--- a/recipes-kernel/linux/linux-yocto_virtualization.inc
+++ b/recipes-kernel/linux/linux-yocto_virtualization.inc
@@ -14,5 +14,7 @@ KERNEL_MODULE_AUTOLOAD += "${@bb.utils.contains('DISTRO_FEATURES', 'kvm', 'kvm',
 # aufs kernel support required for xen-image-minimal
 KERNEL_FEATURES_append += "${@bb.utils.contains('DISTRO_FEATURES', 'aufs', ' features/aufs/aufs-enable.scc', '', d)}"
 
+KERNEL_FEATURES_append = " cfg/virtio.scc"
+
 # xen kernel support
 SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'xen', ' file://xen.scc', '', d)}"
-- 
2.7.4

Re: [PATCH 1/2] lxc: remove virtio kernel configs

[Bruce Ashfield]

merged

Bruce
On Sun, Dec 2, 2018 at 9:20 PM Chin Huat Ang <chin.huat.ang@intel.com> wrote:
>
> The script lxc-checkconfig doesn't seem to report virtio related kernel
> configs as required, so remove them from lxc.cfg instead.
>
> Signed-off-by: Chin Huat Ang <chin.huat.ang@intel.com>
> ---
>  recipes-kernel/linux/linux-yocto/lxc.cfg | 11 -----------
>  1 file changed, 11 deletions(-)
>
> diff --git a/recipes-kernel/linux/linux-yocto/lxc.cfg b/recipes-kernel/linux/linux-yocto/lxc.cfg
> index c25d60f..e5f1edc 100644
> --- a/recipes-kernel/linux/linux-yocto/lxc.cfg
> +++ b/recipes-kernel/linux/linux-yocto/lxc.cfg
> @@ -21,18 +21,7 @@ CONFIG_NETPRIO_CGROUP=m
>  CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
>
>  # Virtual drivers
> -CONFIG_VIRTIO_BLK=y
> -CONFIG_SCSI_VIRTIO=y
> -CONFIG_VIRTIO_NET=m
>  CONFIG_HVC_DRIVER=y
> -CONFIG_VIRTIO_CONSOLE=y
> -CONFIG_HW_RANDOM_VIRTIO=m
> -CONFIG_VIRTIO=y
> -CONFIG_VIRTIO_RING=y
> -CONFIG_VIRTIO_PCI=y
> -CONFIG_VIRTIO_BALLOON=y
> -CONFIG_VIRTIO_MMIO=y
> -
>
>  # Base support for live boot
>  CONFIG_BLK_DEV_LOOP=y
> --
> 2.7.4
>


-- 
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II