diff --git a/confidential_container/0001-adapt-for-cvm.patch b/confidential_container/0001-adapt-for-cvm.patch index 20151b9bd57c6e79c5c050681158eb86ed666870..97c6dc60f5da21e57f07e859cca9c43837d973ce 100644 --- a/confidential_container/0001-adapt-for-cvm.patch +++ b/confidential_container/0001-adapt-for-cvm.patch @@ -1,9 +1,10 @@ -From 214f705a1a5acb148f0e3746032f8a25bf132068 Mon Sep 17 00:00:00 2001 -From: XiaoFeng Ma -Date: Mon, 12 Aug 2024 17:16:16 +0800 +From ff216cfd7dd814e66d8facd0d9ea2c1ddf36bc08 Mon Sep 17 00:00:00 2001 +From: yxk +Date: Fri, 6 Sep 2024 14:43:24 +0800 Subject: [PATCH] adapt for cvm --- + src/agent/Cargo.toml | 2 +- src/agent/Makefile | 2 +- src/agent/rustjail/src/mount.rs | 3 + src/runtime/pkg/govmm/qemu/qemu.go | 84 ++++++++++-------------- @@ -11,8 +12,21 @@ Subject: [PATCH] adapt for cvm src/runtime/virtcontainers/hypervisor.go | 2 +- src/runtime/virtcontainers/qemu.go | 1 - src/runtime/virtcontainers/qemu_arm64.go | 10 ++- - 7 files changed, 49 insertions(+), 59 deletions(-) + 8 files changed, 50 insertions(+), 60 deletions(-) +diff --git a/src/agent/Cargo.toml b/src/agent/Cargo.toml +index ad57a770c..3f68360ba 100644 +--- a/src/agent/Cargo.toml ++++ b/src/agent/Cargo.toml +@@ -74,7 +74,7 @@ clap = { version = "3.0.1", features = ["derive"] } + openssl = { version = "0.10.38", features = ["vendored"] } + + # Image pull/decrypt +-image-rs = { git = "https://github.com/confidential-containers/guest-components", tag = "v0.8.0", default-features = false, features = [ ++image-rs = { path = "../../../guest-components/image-rs", default-features = false, features = [ + "kata-cc-native-tls", + "verity", + "signature-simple-xrss", diff --git a/src/agent/Makefile b/src/agent/Makefile index a3eb56705..969548f9a 100644 --- a/src/agent/Makefile @@ -335,5 +349,5 @@ index 9e05c5452..814a27d51 100644 var supportedQemuMachine = govmmQemu.Machine{ -- -2.27.0 +2.33.0 diff --git a/confidential_container/0001-support-virtiofs.patch b/confidential_container/0002-support-virtiofs.patch similarity index 92% rename from confidential_container/0001-support-virtiofs.patch rename to confidential_container/0002-support-virtiofs.patch index 7f11f68b80963aa1f52c2641cf57f7adb2013b47..997b19831bebe182e684289724bdf89de86d921d 100644 --- a/confidential_container/0001-support-virtiofs.patch +++ b/confidential_container/0002-support-virtiofs.patch @@ -1,4 +1,4 @@ -From 37f45b783b9d7aa6d1ce6336bf2fb7392648a481 Mon Sep 17 00:00:00 2001 +From 7a83166689f8e0cfc703d2dbca7baf4fd3753012 Mon Sep 17 00:00:00 2001 From: XiaoFeng Ma Date: Mon, 12 Aug 2024 17:30:35 +0800 Subject: [PATCH] support virtiofs @@ -9,7 +9,7 @@ Subject: [PATCH] support virtiofs 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/runtime/pkg/govmm/qemu/qemu.go b/src/runtime/pkg/govmm/qemu/qemu.go -index 1470a3533..e2ae4e5c5 100644 +index 1470a3533..812af4609 100644 --- a/src/runtime/pkg/govmm/qemu/qemu.go +++ b/src/runtime/pkg/govmm/qemu/qemu.go @@ -1589,9 +1589,21 @@ func (vhostuserDev VhostUserDevice) QemuFSParams(config *Config) []string { @@ -25,7 +25,7 @@ index 1470a3533..e2ae4e5c5 100644 + if driver == "vhost-user-fs-pci" { + qemuParams = append(qemuParams, "-object") -+ objParams := "memory-backend-file,id=mem,size=" + config.Memory.Size + ", mem-path=/dev/shm,share=on" ++ objParams := "memory-backend-file,id=mem,size=" + config.Memory.Size + ",mem-path=/dev/shm,share=on" + qemuParams = append(qemuParams, objParams) + qemuParams = append(qemuParams, "-numa") + qemuParams = append(qemuParams, "node,memdev=mem") @@ -56,5 +56,5 @@ index 3e02756eb..ff46691bd 100644 fmt.Sprintf("--fd=%v", FdSocketNumber), } -- -2.27.0 +2.33.0