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

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

Hide file tree

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

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: