github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-06 12:06:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #467 from jongwu/multidev

Browse Source 
qemu: remove multidev in fsdev parameter on arm64
This commit is contained in:
Julio Montes 2020-07-30 08:07:59 -05:00 committed by GitHub
commit b94b46db08
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -464,12 +464,21 @@ func generic9PVolume(volume types.Volume, nestedRun bool) govmmQemu.FSDevice {
}
}
func genericAppend9PVolume(devices []govmmQemu.Device, volume types.Volume, nestedRun bool) (govmmQemu.FSDevice, error) {
d := generic9PVolume(volume, nestedRun)
return d, nil
}
func (q *qemuArchBase) append9PVolume(devices []govmmQemu.Device, volume types.Volume) ([]govmmQemu.Device, error) {
if volume.MountTag == "" || volume.HostPath == "" {
return devices, nil
}
d := generic9PVolume(volume, q.nestedRun)
d, err := genericAppend9PVolume(devices, volume, q.nestedRun)
if err != nil {
return nil, err
}
devices = append(devices, d)
return devices, nil
}

12
src/runtime/virtcontainers/qemu_arm64.go
View File

@ -11,6 +11,7 @@ import (
"time"
govmmQemu "github.com/intel/govmm/qemu"
"github.com/kata-containers/kata-containers/src/runtime/virtcontainers/types"
)
type qemuArm64 struct {
@ -107,3 +108,14 @@ func (q *qemuArm64) setIgnoreSharedMemoryMigrationCaps(_ context.Context, _ *gov
func (q *qemuArm64) appendIOMMU(devices []govmmQemu.Device) ([]govmmQemu.Device, error) {
return devices, fmt.Errorf("Arm64 architecture does not support vIOMMU")
}
func (q *qemuArm64) append9PVolume(devices []govmmQemu.Device, volume types.Volume) ([]govmmQemu.Device, error) {
d, err := genericAppend9PVolume(devices, volume, q.nestedRun)
if err != nil {
return nil, err
}
d.Multidev = ""
devices = append(devices, d)
return devices, nil
}