From 2c9001d86762b84f3b27b01c538f0f51c22c6d7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= Date: Sun, 5 May 2024 12:12:48 +0200 Subject: [PATCH] Change cpuType default to null MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Avoid issues with converting null strings in a map value Change order to alphabetical, to match the "limactl info" Signed-off-by: Anders F Björklund --- examples/default.yaml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/examples/default.yaml b/examples/default.yaml index 45cf27b4b9e..22cab6d85cb 100644 --- a/examples/default.yaml +++ b/examples/default.yaml @@ -252,15 +252,12 @@ containerd: # Specify desired QEMU CPU type for each arch. # You can see what options are available for host emulation with: `qemu-system-$(arch) -cpu help`. # Setting of instructions is supported like this: "qemu64,+ssse3". +# 🟢 Builtin default: hard-coded arch map with type (see the output of `limactl info | jq .defaultTemplate.cpuType`) cpuType: - # 🟢 Builtin default: "cortex-a72" (or "host" when running on aarch64 host) - aarch64: null - # 🟢 Builtin default: "cortex-a7" (or "host" when running on armv7l host) - armv7l: null - # 🟢 Builtin default: "qemu64" (or "host,-pdpe1gb" when running on x86_64 host) - x86_64: null - # 🟢 Builtin default: "rv64" (or "host" when running on riscv64 host) - riscv64: null + # aarch64: "cortex-a72" # (or "host" when running on aarch64 host) + # armv7l: "cortex-a7" # (or "host" when running on armv7l host) + # riscv64: "rv64" # (or "host" when running on riscv64 host) + # x86_64: "qemu64" # (or "host,-pdpe1gb" when running on x86_64 host) rosetta: # Enable Rosetta for Linux (EXPERIMENTAL).