Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lxd/instance/drivers/driver_qemu.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
tomponline marked this conversation as resolved.
Show resolved Hide resolved
path, err := exec.LookPath(basePath + "qemu-system-aarch64")
if err != nil {
return "", "", err
Expand Down
2 changes: 1 addition & 1 deletion lxd/instance/drivers/driver_qemu_templates.go
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ func qemuMachineType(architecture int) string {
switch architecture {
case osarch.ARCH_64BIT_INTEL_X86:
machineType = "q35"
case osarch.ARCH_64BIT_ARMV8_LITTLE_ENDIAN:
case osarch.ARCH_32BIT_ARMV7_LITTLE_ENDIAN, osarch.ARCH_32BIT_ARMV8_LITTLE_ENDIAN, osarch.ARCH_64BIT_ARMV8_LITTLE_ENDIAN:
machineType = "virt"
case osarch.ARCH_64BIT_POWERPC_LITTLE_ENDIAN:
machineType = "pseries"
Expand Down
Loading