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

Merge pull request #11491 from Apokleos/default-blk-driver

Browse Source 
runtime-rs: Change default block device driver from virtio-scsi to virtio-blk-*
This commit is contained in:
Fabiano Fidêncio 2025-07-11 23:14:13 +02:00 committed by GitHub
commit 4a79c2520d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 33 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/runtime-rs/Makefile
View File

@ -311,14 +311,15 @@ ifneq (,$(QEMUCMD))
DEFSANDBOXCGROUPONLY_QEMU := false DEFSANDBOXCGROUPONLY_QEMU := false
ifeq ($(ARCH), s390x) ifeq ($(ARCH), s390x)
VMROOTFSDRIVER_QEMU := virtio-blk-ccw VMROOTFSDRIVER_QEMU := virtio-blk-ccw
DEFBLOCKSTORAGEDRIVER_QEMU := virtio-blk-ccw
else else
VMROOTFSDRIVER_QEMU := virtio-pmem VMROOTFSDRIVER_QEMU := virtio-pmem
DEFBLOCKSTORAGEDRIVER_QEMU := virtio-blk-pci
endif endif
DEFVCPUS_QEMU := 1 DEFVCPUS_QEMU := 1
DEFMAXVCPUS_QEMU := 0 DEFMAXVCPUS_QEMU := 0
DEFSHAREDFS_QEMU_VIRTIOFS := virtio-fs DEFSHAREDFS_QEMU_VIRTIOFS := virtio-fs
DEFSHAREDFS_QEMU_SEL_VIRTIOFS := none DEFSHAREDFS_QEMU_SEL_VIRTIOFS := none
DEFBLOCKSTORAGEDRIVER_QEMU := virtio-scsi
DEFBLOCKDEVICEAIO_QEMU := io_uring DEFBLOCKDEVICEAIO_QEMU := io_uring
DEFNETWORKMODEL_QEMU := tcfilter DEFNETWORKMODEL_QEMU := tcfilter
DEFDISABLEGUESTSELINUX := true DEFDISABLEGUESTSELINUX := true

5
src/runtime-rs/config/configuration-cloud-hypervisor.toml.in
View File

@ -168,8 +168,9 @@ default_bridges = @DEFBRIDGES@
# Default false # Default false
#reclaim_guest_freed_memory = true #reclaim_guest_freed_memory = true
# Block storage driver to be used for the hypervisor in case the container # Block device driver to be used by the hypervisor when a container's storage
# rootfs is backed by a block device. # is backed by a block device or a file. This driver facilitates attaching the
# storage directly to the guest VM.
block_device_driver = "virtio-blk-pci" block_device_driver = "virtio-blk-pci"
# Specifies cache-related options for block devices. # Specifies cache-related options for block devices.

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

@ -118,9 +118,11 @@ default_memory = @DEFMEMSZ@
# > amount of physical RAM --> will be set to the actual amount of physical RAM # > amount of physical RAM --> will be set to the actual amount of physical RAM
default_maxmemory = @DEFMAXMEMSZ@ default_maxmemory = @DEFMAXMEMSZ@
# Block device driver to be used by the hypervisor when a container's storage
# Block storage driver to be used for the hypervisor in case the container # is backed by a block device or a file. This driver facilitates attaching the
# rootfs is backed by a block device. DB only supports virtio-blk. # storage directly to the guest VM.
#
# DB only supports virtio-blk-mmio.
block_device_driver = "@DEFBLOCKSTORAGEDRIVER_DB@" block_device_driver = "@DEFBLOCKSTORAGEDRIVER_DB@"
# This option changes the default hypervisor and kernel parameters # This option changes the default hypervisor and kernel parameters

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

@ -235,9 +235,15 @@ virtio_fs_extra_args = @DEFVIRTIOFSEXTRAARGS@
# Metadata, data, and pathname lookup are cached in guest and never expire. # Metadata, data, and pathname lookup are cached in guest and never expire.
virtio_fs_cache = "@DEFVIRTIOFSCACHE@" virtio_fs_cache = "@DEFVIRTIOFSCACHE@"
# Block storage driver to be used for the hypervisor in case the container # Block device driver to be used by the hypervisor when a container's
# rootfs is backed by a block device. This is virtio-scsi, virtio-blk # storage is backed by a block device or a file. This driver facilitates attaching
# or nvdimm. # the storage directly to the guest VM.
#
# Examples include:
# - virtio-blk-pci
# - virtio-blk-ccw
# - virtio-scsi
# - nvidmm
block_device_driver = "@DEFBLOCKSTORAGEDRIVER_QEMU@" block_device_driver = "@DEFBLOCKSTORAGEDRIVER_QEMU@"
# aio is the I/O mechanism used by qemu # aio is the I/O mechanism used by qemu

12
src/runtime-rs/config/configuration-qemu-se-runtime-rs.toml.in
View File

@ -211,9 +211,15 @@ virtio_fs_extra_args = @DEFVIRTIOFSEXTRAARGS@
# Metadata, data, and pathname lookup are cached in guest and never expire. # Metadata, data, and pathname lookup are cached in guest and never expire.
virtio_fs_cache = "@DEFVIRTIOFSCACHE@" virtio_fs_cache = "@DEFVIRTIOFSCACHE@"
# Block storage driver to be used for the hypervisor in case the container # Block device driver to be used by the hypervisor when a container's storage
# rootfs is backed by a block device. This is virtio-scsi, virtio-blk # is backed by a block device or a file. This driver facilitates attaching the
# or nvdimm. # storage directly to the guest VM.
#
# Examples include:
# - virtio-blk-pci
# - virtio-blk-ccw
# - virtio-scsi
# - nvidmm
block_device_driver = "@DEFBLOCKSTORAGEDRIVER_QEMU@" block_device_driver = "@DEFBLOCKSTORAGEDRIVER_QEMU@"
# aio is the I/O mechanism used by qemu # aio is the I/O mechanism used by qemu

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

@ -112,9 +112,11 @@ memory_slots = @DEFMEMSLOTS@
# > amount of physical RAM --> will be set to the actual amount of physical RAM # > amount of physical RAM --> will be set to the actual amount of physical RAM
default_maxmemory = @DEFMAXMEMSZ_FC@ default_maxmemory = @DEFMAXMEMSZ_FC@
# Block storage driver to be used for the hypervisor in case the container # Block device driver to be used by the hypervisor when a container's storage
# rootfs is backed by a block device. This is virtio-scsi, virtio-blk # is backed by a block device or a file. This driver facilitates attaching the
# or nvdimm. # storage directly to the guest VM.
#
# FC only supports virtio-blk-mmio.
block_device_driver = "@DEFBLOCKSTORAGEDRIVER_FC@" block_device_driver = "@DEFBLOCKSTORAGEDRIVER_FC@"
# Specifies cache-related options will be set to block devices or not. # Specifies cache-related options will be set to block devices or not.