github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-20 08:18:24 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3814 from fidencio/wip/disable-block-device-use-minor-fixes

Browse Source 
Minor fixes for the `disable_block_device_use` comments
This commit is contained in:
Fabiano Fidêncio
2022-03-03 23:26:05 +01:00
committed by GitHub
parent 6628977fcd fa8b93927c
commit 12af632952
3 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/runtime/config/configuration-fc.toml.in
View File

@@ -103,14 +103,6 @@ default_memory = @DEFMEMSZ@
# Default 0 # Default 0
#memory_offset = 0 #memory_offset = 0
# Disable block device from being used for a container's rootfs.
# In case of a storage driver like devicemapper where a container's
# root file system is backed by a block device, the block device is passed
# directly to the hypervisor for performance reasons.
# This flag prevents the block device from being passed to the hypervisor,
# 9pfs is used instead to pass the rootfs.
disable_block_device_use = @DEFDISABLEBLOCK@
# Block storage driver to be used for the hypervisor in case the container # Block storage driver to be used for the hypervisor in case the container
# rootfs is backed by a block device. This is virtio-scsi, virtio-blk # rootfs is backed by a block device. This is virtio-scsi, virtio-blk
# or nvdimm. # or nvdimm.

2
src/runtime/config/configuration-qemu.toml.in
View File

@@ -143,7 +143,7 @@ default_memory = @DEFMEMSZ@
# root file system is backed by a block device, the block device is passed # root file system is backed by a block device, the block device is passed
# directly to the hypervisor for performance reasons. # directly to the hypervisor for performance reasons.
# This flag prevents the block device from being passed to the hypervisor, # This flag prevents the block device from being passed to the hypervisor,
# 9pfs is used instead to pass the rootfs. # virtio-fs is used instead to pass the rootfs.
disable_block_device_use = @DEFDISABLEBLOCK@ disable_block_device_use = @DEFDISABLEBLOCK@
# Shared file system type: # Shared file system type:

2
src/runtime/pkg/katautils/config.go
View File

@@ -568,7 +568,7 @@ func newFirecrackerHypervisorConfig(h hypervisor) (vc.HypervisorConfig, error) {
EntropySource: h.GetEntropySource(), EntropySource: h.GetEntropySource(),
EntropySourceList: h.EntropySourceList, EntropySourceList: h.EntropySourceList,
DefaultBridges: h.defaultBridges(), DefaultBridges: h.defaultBridges(),
DisableBlockDeviceUse: h.DisableBlockDeviceUse, DisableBlockDeviceUse: false, // shared fs is not supported in Firecracker,
HugePages: h.HugePages, HugePages: h.HugePages,
Debug: h.Debug, Debug: h.Debug,
DisableNestingChecks: h.DisableNestingChecks, DisableNestingChecks: h.DisableNestingChecks,