Don't read VMOpts.VZ struct from cidata directly #3992
Conversation
|
Still need to fix VMOpts.VZ in the templates: It is a bit over-engineered at the moment, since the docker templates don't set VMOpts. |
afbjorklund
force-pushed
the
vmopts-rosetta
branch
2 times, most recently
from
6dd9aad to
8c936aa
Compare
| @@ -118,7 +118,7 @@ func setupEnv(instConfigEnv map[string]string, propagateProxyEnv bool, slirpGate | |||
| return env, nil | |||
| } | |||
|
|
|||
| func templateArgs(ctx context.Context, bootScripts bool, instDir, name string, instConfig *limatype.LimaYAML, udpDNSLocalPort, tcpDNSLocalPort, vsockPort int, virtioPort string) (*TemplateArgs, error) { | |||
| func templateArgs(ctx context.Context, bootScripts bool, instDir, name string, instConfig *limatype.LimaYAML, udpDNSLocalPort, tcpDNSLocalPort, vsockPort int, virtioPort string, rosettaEnabled, rosettaBinFmt bool) (*TemplateArgs, error) { | |||
There was a problem hiding this comment.
Will this be changed again when #3899 comes in the future?
There was a problem hiding this comment.
Possibly, but not until the deprecated fields are gone from the top
| rosettaEnabled := limaDriver.Info().Features.RosettaEnabled | ||
| rosettaBinFmt := limaDriver.Info().Features.RosettaBinFmt | ||
| // Disable Rosetta in Plain mode | ||
| if *inst.Config.Plain { |
There was a problem hiding this comment.
If the hostagent could query the plain mode config to the driver, wouldn't the hostagent be able to pass them to the functions that process the template without touching the contents of the config?
There was a problem hiding this comment.
Yes, it would be possible to move the logic from the hostagent to the guest and the boot scripts and have them read $LIMA_CIDATA_PLAIN instead (if one is willing to make them more "smart" like that)
There was a problem hiding this comment.
Also, should the hostagent be able to receive the template string used for lima.env from the driver?
There was a problem hiding this comment.
The lima.env is not handled by the driver, it is hostagent that creates the cidata (which includes lima.env)
This is supposed to be provided by the driver, and passed to the hostagent as features. The cidata and hostagent doesn't know VZ. Note: this also excludes the VMOpts.VZ from default and override, similar to the change made to VMOpts.QEMU already. It is unknown. Signed-off-by: Anders F Björklund <[email protected]>
afbjorklund
force-pushed
the
vmopts-rosetta
branch
from
8c936aa to
e2f09da
Compare
This is supposed to be provided by the driver, and passed to the
hostagent as features. The cidata and hostagent doesn't know VZ.
Note: this also excludes the VMOpts.VZ from default and override,
similar to the change made to VMOpts.QEMU already. It is unknown.