github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-04 02:56:18 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #559 from sboeuf/enable_virt_machine_type

Browse Source 
virtcontainers: qemu: x86: Support "virt" machine type
This commit is contained in:
Graham Whaley 2018-08-09 09:19:26 +01:00 committed by GitHub
commit e863e55cdb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
virtcontainers/qemu_amd64.go
View File

@ -67,6 +67,10 @@ var supportedQemuMachines = []govmmQemu.Machine{
Type: QemuQ35, Type: QemuQ35,
Options: defaultQemuMachineOptions, Options: defaultQemuMachineOptions,
}, },
{
Type: QemuVirt,
Options: defaultQemuMachineOptions,
},
} }
// MaxQemuVCPUs returns the maximum number of vCPUs supported // MaxQemuVCPUs returns the maximum number of vCPUs supported

4
virtcontainers/qemu_arch_base.go
View File

@ -131,10 +131,10 @@ const (
// QemuQ35 is the QEMU Q35 machine type for amd64 // QemuQ35 is the QEMU Q35 machine type for amd64
QemuQ35 = "q35" QemuQ35 = "q35"
// QemuVirt is the QEMU virt machine type for aarch64 // QemuVirt is the QEMU virt machine type for aarch64 or amd64
QemuVirt = "virt" QemuVirt = "virt"
// QemuPseries is a QEMU virt machine type for for ppc64le // QemuPseries is a QEMU virt machine type for ppc64le
QemuPseries = "pseries" QemuPseries = "pseries"
) )