diff mbox series

[1/1] qemuboot: predictable network interface names

Message ID 20240205185608.1497595-1-joe.slater@windriver.com
State New
Headers show
Series [1/1] qemuboot: predictable network interface names | expand

Commit Message

Slater, Joseph Feb. 5, 2024, 6:56 p.m. UTC
From: Joe Slater <joe.slater@windriver.com>

Allow interface renaming if 'pni-names' is a distro
feature.

We do not add QB_NO_PNI to QB_CMDLINE_IP_SLIRP because
renaming was never suppressed for slirp.

Signed-off-by: Joe Slater <joe.slater@windriver.com>
---
 meta/classes-recipe/qemuboot.bbclass | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Comments

Alexandre Belloni Feb. 6, 2024, 7:11 p.m. UTC | #1
I'm pretty sure this is the cause of those failures:
https://autobuilder.yoctoproject.org/typhoon/#/builders/87/builds/6396/steps/14/logs/stdio

On 05/02/2024 10:56:08-0800, Joe Slater via lists.openembedded.org wrote:
> From: Joe Slater <joe.slater@windriver.com>
> 
> Allow interface renaming if 'pni-names' is a distro
> feature.
> 
> We do not add QB_NO_PNI to QB_CMDLINE_IP_SLIRP because
> renaming was never suppressed for slirp.
> 
> Signed-off-by: Joe Slater <joe.slater@windriver.com>
> ---
>  meta/classes-recipe/qemuboot.bbclass | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/meta/classes-recipe/qemuboot.bbclass b/meta/classes-recipe/qemuboot.bbclass
> index ff32aac902..4a2a6f1ef5 100644
> --- a/meta/classes-recipe/qemuboot.bbclass
> +++ b/meta/classes-recipe/qemuboot.bbclass
> @@ -101,8 +101,11 @@ QB_DEFAULT_FSTYPE ?= "ext4"
>  QB_RNG ?= "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0"
>  QB_OPT_APPEND ?= ""
>  QB_NETWORK_DEVICE ?= "-device virtio-net-pci,netdev=net0,mac=@MAC@"
> +
> +QB_NO_PNI ?= "${@bb.utils.contains('DISTRO_FEATURES', 'pni-names', '', 'net.ifnames=0', d)}"
>  QB_CMDLINE_IP_SLIRP ?= "ip=dhcp"
> -QB_CMDLINE_IP_TAP ?= "ip=192.168.7.@CLIENT@::192.168.7.@GATEWAY@:255.255.255.0::eth0:off:8.8.8.8 net.ifnames=0"
> +QB_CMDLINE_IP_TAP ?= "${QB_NO_PNI} ip=192.168.7.@CLIENT@::192.168.7.@GATEWAY@:255.255.255.0::eth0:off:8.8.8.8"
> +
>  QB_ROOTFS_EXTRA_OPT ?= ""
>  QB_GRAPHICS ?= ""
>  QB_NFSROOTFS_EXTRA_OPT ?= ""
> -- 
> 2.25.1
> 

> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#194963): https://lists.openembedded.org/g/openembedded-core/message/194963
> Mute This Topic: https://lists.openembedded.org/mt/104182965/3617179
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Slater, Joseph Feb. 20, 2024, 10:43 p.m. UTC | #2
Looking at qemurunner.py, it seems it will not find the ip info if net.ifnames precedes it.  I will submit a V2 of the patch.

Joe

> -----Original Message-----
> From: Alexandre Belloni <alexandre.belloni@bootlin.com>
> Sent: Tuesday, February 6, 2024 11:12 AM
> To: Slater, Joseph <joe.slater@windriver.com>
> Cc: openembedded-core@lists.openembedded.org; MacLeod, Randy
> <Randy.MacLeod@windriver.com>
> Subject: Re: [oe-core][PATCH 1/1] qemuboot: predictable network interface
> names
> 
> I'm pretty sure this is the cause of those failures:
> https://autobuilder.yoctoproject.org/typhoon/#/builders/87/builds/6396/steps/1
> 4/logs/stdio
> 
> On 05/02/2024 10:56:08-0800, Joe Slater via lists.openembedded.org wrote:
> > From: Joe Slater <joe.slater@windriver.com>
> >
> > Allow interface renaming if 'pni-names' is a distro feature.
> >
> > We do not add QB_NO_PNI to QB_CMDLINE_IP_SLIRP because renaming was
> > never suppressed for slirp.
> >
> > Signed-off-by: Joe Slater <joe.slater@windriver.com>
> > ---
> >  meta/classes-recipe/qemuboot.bbclass | 5 ++++-
> >  1 file changed, 4 insertions(+), 1 deletion(-)
> >
> > diff --git a/meta/classes-recipe/qemuboot.bbclass
> > b/meta/classes-recipe/qemuboot.bbclass
> > index ff32aac902..4a2a6f1ef5 100644
> > --- a/meta/classes-recipe/qemuboot.bbclass
> > +++ b/meta/classes-recipe/qemuboot.bbclass
> > @@ -101,8 +101,11 @@ QB_DEFAULT_FSTYPE ?= "ext4"
> >  QB_RNG ?= "-object rng-random,filename=/dev/urandom,id=rng0 -device
> virtio-rng-pci,rng=rng0"
> >  QB_OPT_APPEND ?= ""
> >  QB_NETWORK_DEVICE ?= "-device virtio-net-pci,netdev=net0,mac=@MAC@"
> > +
> > +QB_NO_PNI ?= "${@bb.utils.contains('DISTRO_FEATURES', 'pni-names', '',
> 'net.ifnames=0', d)}"
> >  QB_CMDLINE_IP_SLIRP ?= "ip=dhcp"
> > -QB_CMDLINE_IP_TAP ?=
> "ip=192.168.7.@CLIENT@::192.168.7.@GATEWAY@:255.255.255.0::eth0:off:8.
> 8.8.8 net.ifnames=0"
> > +QB_CMDLINE_IP_TAP ?= "${QB_NO_PNI}
> ip=192.168.7.@CLIENT@::192.168.7.@GATEWAY@:255.255.255.0::eth0:off:8.8.
> 8.8"
> > +
> >  QB_ROOTFS_EXTRA_OPT ?= ""
> >  QB_GRAPHICS ?= ""
> >  QB_NFSROOTFS_EXTRA_OPT ?= ""
> > --
> > 2.25.1
> >
> 
> >
> > -=-=-=-=-=-=-=-=-=-=-=-
> > Links: You receive all messages sent to this group.
> > View/Reply Online (#194963):
> https://lists.openembedded.org/g/openembedded-core/message/194963
> > Mute This Topic: https://lists.openembedded.org/mt/104182965/3617179
> > Group Owner: openembedded-core+owner@lists.openembedded.org
> > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
> [alexandre.belloni@bootlin.com]
> > -=-=-=-=-=-=-=-=-=-=-=-
> >
> 
> 
> --
> Alexandre Belloni, co-owner and COO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com
diff mbox series

Patch

diff --git a/meta/classes-recipe/qemuboot.bbclass b/meta/classes-recipe/qemuboot.bbclass
index ff32aac902..4a2a6f1ef5 100644
--- a/meta/classes-recipe/qemuboot.bbclass
+++ b/meta/classes-recipe/qemuboot.bbclass
@@ -101,8 +101,11 @@  QB_DEFAULT_FSTYPE ?= "ext4"
 QB_RNG ?= "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0"
 QB_OPT_APPEND ?= ""
 QB_NETWORK_DEVICE ?= "-device virtio-net-pci,netdev=net0,mac=@MAC@"
+
+QB_NO_PNI ?= "${@bb.utils.contains('DISTRO_FEATURES', 'pni-names', '', 'net.ifnames=0', d)}"
 QB_CMDLINE_IP_SLIRP ?= "ip=dhcp"
-QB_CMDLINE_IP_TAP ?= "ip=192.168.7.@CLIENT@::192.168.7.@GATEWAY@:255.255.255.0::eth0:off:8.8.8.8 net.ifnames=0"
+QB_CMDLINE_IP_TAP ?= "${QB_NO_PNI} ip=192.168.7.@CLIENT@::192.168.7.@GATEWAY@:255.255.255.0::eth0:off:8.8.8.8"
+
 QB_ROOTFS_EXTRA_OPT ?= ""
 QB_GRAPHICS ?= ""
 QB_NFSROOTFS_EXTRA_OPT ?= ""