Skip to content

Commit

Permalink
Merge pull request kata-containers#8812 from kalil-pelissier/feature/…
Browse files Browse the repository at this point in the history
…issue-7720/drop-dead-code

runtime: remove SharedVersions field dead code
  • Loading branch information
gkurz authored Jan 23, 2024
2 parents 4516f38 + a4b208a commit 0f67a26
Showing 1 changed file with 8 additions and 12 deletions.
20 changes: 8 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,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
Expand Down Expand Up @@ -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")
Expand Down

0 comments on commit 0f67a26

Please sign in to comment.