lxd/instance: Add support for armhf vm's on arm64 hosts

Signed-off-by: Kadin Sayani <kadin.sayani@canonical.com>
canonical · Sep 10, 2024 · 0df5c94 · 0df5c94
1 parent 94110ee
commit 0df5c94
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/lxd/instance/drivers/driver_qemu.go b/lxd/instance/drivers/driver_qemu.go
@@ -2007,7 +2007,7 @@ func (d *qemu) qemuArchConfig(arch int) (path string, bus string, err error) {
 		}
 
 		return path, "pcie", nil
-	} else if arch == osarch.ARCH_64BIT_ARMV8_LITTLE_ENDIAN {
+	} else if arch == osarch.ARCH_32BIT_ARMV7_LITTLE_ENDIAN || arch == osarch.ARCH_32BIT_ARMV8_LITTLE_ENDIAN || arch == osarch.ARCH_64BIT_ARMV8_LITTLE_ENDIAN {
 		path, err := exec.LookPath(basePath + "qemu-system-aarch64")
 		if err != nil {
 			return "", "", err

diff --git a/lxd/instance/drivers/driver_qemu_templates.go b/lxd/instance/drivers/driver_qemu_templates.go
@@ -74,6 +74,10 @@ func qemuMachineType(architecture int) string {
 	switch architecture {
 	case osarch.ARCH_64BIT_INTEL_X86:
 		machineType = "q35"
+	case osarch.ARCH_32BIT_ARMV7_LITTLE_ENDIAN:
+		machineType = "virt"
+	case osarch.ARCH_32BIT_ARMV8_LITTLE_ENDIAN:
+		machineType = "virt"
 	case osarch.ARCH_64BIT_ARMV8_LITTLE_ENDIAN:
 		machineType = "virt"
 	case osarch.ARCH_64BIT_POWERPC_LITTLE_ENDIAN: