From a4b208a712180cacadd46c2aa66f3207ed17f927 Mon Sep 17 00:00:00 2001 From: Kvlil Date: Fri, 12 Jan 2024 10:20:06 +0000 Subject: [PATCH] runtime: remove SharedVersions field dead code SharedVersion fiel add a versiontable property that isn't supported by upstream QEMU. This is dead code since virtcontainers isn't setting SharedVersions to true. Fixes: #7720 Signed-off-by: Kvlil --- src/runtime/pkg/govmm/qemu/qemu.go | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/src/runtime/pkg/govmm/qemu/qemu.go b/src/runtime/pkg/govmm/qemu/qemu.go index ffb464c33d..f121696c96 100644 --- a/src/runtime/pkg/govmm/qemu/qemu.go +++ b/src/runtime/pkg/govmm/qemu/qemu.go @@ -1352,15 +1352,14 @@ func (dev LoaderDevice) QemuParams(config *Config) []string { // in to the guest // nolint: govet type VhostUserDevice struct { - SocketPath string //path to vhostuser socket on host - CharDevID string - TypeDevID string //variable QEMU parameter based on value of VhostUserType - Address string //used for MAC address in net case - Tag string //virtio-fs volume id for mounting inside guest - CacheSize uint32 //virtio-fs DAX cache size in MiB - QueueSize uint32 //size of virtqueues - SharedVersions bool //enable virtio-fs shared version metadata - VhostUserType DeviceDriver + SocketPath string //path to vhostuser socket on host + CharDevID string + TypeDevID string //variable QEMU parameter based on value of VhostUserType + Address string //used for MAC address in net case + Tag string //virtio-fs volume id for mounting inside guest + CacheSize uint32 //virtio-fs DAX cache size in MiB + QueueSize uint32 //size of virtqueues + VhostUserType DeviceDriver // ROMFile specifies the ROM file being used for this device. ROMFile string @@ -1534,9 +1533,6 @@ func (vhostuserDev VhostUserDevice) QemuFSParams(config *Config) []string { if vhostuserDev.CacheSize != 0 { deviceParams = append(deviceParams, fmt.Sprintf("cache-size=%dM", vhostuserDev.CacheSize)) } - if vhostuserDev.SharedVersions { - deviceParams = append(deviceParams, "versiontable=/dev/shm/fuse_shared_versions") - } if vhostuserDev.Transport.isVirtioCCW(config) { if config.Knobs.IOMMUPlatform { deviceParams = append(deviceParams, "iommu_platform=on")