Skip to content

Commit

Permalink
runtime: remove SharedVersions field dead code
Browse files Browse the repository at this point in the history
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 <kalil.pelissier@gmail.com>
  • Loading branch information
kalil-pelissier committed Jan 12, 2024
1 parent f62ec0a commit acdfb40
Showing 1 changed file with 9 additions and 12 deletions.
21 changes: 9 additions & 12 deletions src/runtime/pkg/govmm/qemu/qemu.go
Original file line number Diff line number Diff line change
Expand Up @@ -1352,15 +1352,15 @@ 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
// SharedVersions bool //enable virtio-fs shared version metadata
VhostUserType DeviceDriver

// ROMFile specifies the ROM file being used for this device.
ROMFile string
Expand Down Expand Up @@ -1534,9 +1534,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")
Expand Down

0 comments on commit acdfb40

Please sign in to comment.