github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-30 17:22:33 +00:00
Code Issues Projects Releases Wiki Activity

runtime: remove wrong qemu-system-x86_64 option

Browse Source 
qemu-system-x86_64 does not support "-machine virt".
(this is only supported by arm,aarch64)
<https://people.redhat.com/~cohuck/2022/01/05/qemu-machine-types.html>

Fixes: #11229

Signed-off-by: Shunsuke Kimura <pbrehpuum@gmail.com>
This commit is contained in:
Shunsuke Kimura 2025-05-02 04:12:14 +09:00
parent 049a4ef3a8
commit 3dba8ddd98
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/runtime/virtcontainers/qemu_amd64.go
View File

@ -72,10 +72,6 @@ var supportedQemuMachines = []govmmQemu.Machine{
Type: QemuQ35, Type: QemuQ35,
Options: defaultQemuMachineOptions, Options: defaultQemuMachineOptions,
}, },
{
Type: QemuVirt,
Options: defaultQemuMachineOptions,
},
{ {
Type: QemuMicrovm, Type: QemuMicrovm,
Options: defaultQemuMachineOptions, Options: defaultQemuMachineOptions,
@ -169,8 +165,7 @@ func newQemuArch(config HypervisorConfig) (qemuArch, error) {
func (q *qemuAmd64) capabilities(hConfig HypervisorConfig) types.Capabilities { func (q *qemuAmd64) capabilities(hConfig HypervisorConfig) types.Capabilities {
var caps types.Capabilities var caps types.Capabilities
if q.qemuMachine.Type == QemuQ35 || if q.qemuMachine.Type == QemuQ35 {
q.qemuMachine.Type == QemuVirt {
caps.SetBlockDeviceHotplugSupport() caps.SetBlockDeviceHotplugSupport()
caps.SetNetworkDeviceHotplugSupported() caps.SetNetworkDeviceHotplugSupported()
} }

2
src/runtime/virtcontainers/qemu_arch_base.go
View File

@ -221,7 +221,7 @@ const (
// QemuMicrovm is the QEMU microvm machine type for amd64 // QemuMicrovm is the QEMU microvm machine type for amd64
QemuMicrovm = "microvm" QemuMicrovm = "microvm"
// QemuVirt is the QEMU virt machine type for aarch64 or amd64 // QemuVirt is the QEMU virt machine type for aarch64 or arm
QemuVirt = "virt" QemuVirt = "virt"
// QemuPseries is a QEMU virt machine type for ppc64le // QemuPseries is a QEMU virt machine type for ppc64le