Merge pull request #2494 from rn/qarm64

cmd: On KVM/aarch64 add gic_version=host
This commit is contained in:
Rolf Neugebauer 2017-09-08 18:50:59 +01:00 committed by GitHub
commit 61c74e2e72

View File

@ -504,10 +504,8 @@ func buildQemuCmdline(config QemuConfig) (QemuConfig, []string) {
if config.KVM { if config.KVM {
qemuArgs = append(qemuArgs, "-enable-kvm") qemuArgs = append(qemuArgs, "-enable-kvm")
// Remove the hardcode of virtual machine type for x86, since we will
// support aarch64 in future
if config.Arch == "aarch64" { if config.Arch == "aarch64" {
qemuArgs = append(qemuArgs, "-machine", "virt") qemuArgs = append(qemuArgs, "-machine", "virt,gic_version=host")
} else { } else {
qemuArgs = append(qemuArgs, "-machine", "q35,accel=kvm:tcg") qemuArgs = append(qemuArgs, "-machine", "q35,accel=kvm:tcg")
} }