github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-10 04:18:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6780 from Amulyam24/rust-virtfs

Browse Source 
ppc64le: switch virtiofsd from C to rust version
This commit is contained in:
Amulya Meka 2023-05-17 09:36:28 +05:30 committed by GitHub
commit 3ccc29030d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/runtime/Makefile
View File

@ -217,9 +217,6 @@ DEFSHAREDFS_QEMU_TDX_VIRTIOFS := virtio-9p
DEFSHAREDFS_QEMU_SEV_VIRTIOFS := virtio-9p DEFSHAREDFS_QEMU_SEV_VIRTIOFS := virtio-9p
DEFSHAREDFS_QEMU_SNP_VIRTIOFS := virtio-9p DEFSHAREDFS_QEMU_SNP_VIRTIOFS := virtio-9p
DEFVIRTIOFSDAEMON := $(LIBEXECDIR)/virtiofsd DEFVIRTIOFSDAEMON := $(LIBEXECDIR)/virtiofsd
ifeq ($(ARCH),ppc64le)
DEFVIRTIOFSDAEMON := $(LIBEXECDIR)/qemu/virtiofsd
endif
DEFVALIDVIRTIOFSDAEMONPATHS := [\"$(DEFVIRTIOFSDAEMON)\"] DEFVALIDVIRTIOFSDAEMONPATHS := [\"$(DEFVIRTIOFSDAEMON)\"]
# Default DAX mapping cache size in MiB # Default DAX mapping cache size in MiB
#if value is 0, DAX is not enabled #if value is 0, DAX is not enabled

2
tools/packaging/scripts/configure-hypervisor.sh
View File

@ -341,7 +341,7 @@ generate_qemu_options() {
qemu_options+=(functionality:--disable-virtiofsd) qemu_options+=(functionality:--disable-virtiofsd)
;; ;;
ppc64le) ppc64le)
qemu_options+=(functionality:--enable-virtiofsd) qemu_options+=(functionality:--disable-virtiofsd)
;; ;;
s390x) s390x)
qemu_options+=(functionality:--disable-virtiofsd) qemu_options+=(functionality:--disable-virtiofsd)

10
versions.yaml
View File

@ -297,14 +297,14 @@ externals:
virtiofsd: virtiofsd:
description: "vhost-user virtio-fs device backend written in Rust" description: "vhost-user virtio-fs device backend written in Rust"
url: "https://gitlab.com/virtio-fs/virtiofsd" url: "https://gitlab.com/virtio-fs/virtiofsd"
version: "v1.3.0" version: "v1.6.1"
toolchain: "1.62.0" toolchain: "1.66.0"
meta: meta:
# From https://gitlab.com/virtio-fs/virtiofsd/-/releases/v1.3.0, # From https://gitlab.com/virtio-fs/virtiofsd/-/releases/v1.6.1,
# this is the link labelled virtiofsd-v1.3.0.zip # this is the link labelled virtiofsd-v1.6.1.zip
# #
# yamllint disable-line rule:line-length # yamllint disable-line rule:line-length
binary: "https://gitlab.com/virtio-fs/virtiofsd/uploads/9a4f2261fcb1701f1e709694b5c5d980/virtiofsd-v1.3.0.zip" binary: "https://gitlab.com/virtio-fs/virtiofsd/uploads/14c1e8a7acc82d515cec6608727a1e4a/virtiofsd-v1.6.1.zip"
languages: languages:
description: | description: |