diff --git a/SPECS/cloud-hypervisor/cloud-hypervisor.signatures.json b/SPECS/cloud-hypervisor/cloud-hypervisor.signatures.json index a41c7605cd..54e1f6e00d 100644 --- a/SPECS/cloud-hypervisor/cloud-hypervisor.signatures.json +++ b/SPECS/cloud-hypervisor/cloud-hypervisor.signatures.json @@ -1,7 +1,7 @@ { "Signatures": { - "cloud-hypervisor-28.0-cargo.tar.gz": "caa7a53edb22326df4ab9594deaaa7a686324cf80f76bce65b0a86a4b524a15e", - "cloud-hypervisor-28.0.tar.gz": "c04bd4b511a142bec8fb97181b121d8d0623c16188867e860502e936cb751948", - "config.toml": "e823c53144d9c88262f033560e988e2431a2f0b4a815ff0be8740f0c0bb9312c" + "cloud-hypervisor-29.0-cargo.tar.gz": "15b013e359f8e578c67ff16840817882023f3547823bb797b67a9c03d8be1b1d", + "cloud-hypervisor-29.0.tar.gz": "80f235002d2fd61e5840772f4faf4877c87fff9c3f3522ce4a68317398a2ee3f", + "config.toml": "0038e45c315505ffd9dbba92c2ea5c054521c0302bc9c4b058fdc8214f9d4f84" } } \ No newline at end of file diff --git a/SPECS/cloud-hypervisor/cloud-hypervisor.spec b/SPECS/cloud-hypervisor/cloud-hypervisor.spec index 1c4f02602d..836780cd06 100644 --- a/SPECS/cloud-hypervisor/cloud-hypervisor.spec +++ b/SPECS/cloud-hypervisor/cloud-hypervisor.spec @@ -4,7 +4,7 @@ Summary: Cloud Hypervisor is an open source Virtual Machine Monitor (VMM) that runs on top of KVM. Name: cloud-hypervisor -Version: 28.0 +Version: 29.0 Release: 1%{?dist} License: ASL 2.0 OR BSD-3-clause Vendor: Microsoft Corporation @@ -151,6 +151,9 @@ cargo build --release --target=%{rust_musl_target} --package vhost_user_block %{ %license LICENSE-BSD-3-Clause %changelog +* Tue Jan 24 2023 Neha Agarwal - 29.0-1 +- Update to v29.0 + * Mon Dec 12 2022 Neha Agarwal - 28.0-1 - Update to v28.0 diff --git a/SPECS/cloud-hypervisor/config.toml b/SPECS/cloud-hypervisor/config.toml index 1523e9ff88..9c40c29144 100644 --- a/SPECS/cloud-hypervisor/config.toml +++ b/SPECS/cloud-hypervisor/config.toml @@ -4,7 +4,7 @@ replace-with = "vendored-sources" [source."https://github.com/cloud-hypervisor/kvm-bindings"] git = "https://github.com/cloud-hypervisor/kvm-bindings" -branch = "ch-v0.5.0-tdx" +branch = "ch-v0.6.0-tdx" replace-with = "vendored-sources" [source."https://github.com/cloud-hypervisor/versionize_derive"] @@ -17,11 +17,6 @@ git = "https://github.com/firecracker-microvm/micro-http" branch = "main" replace-with = "vendored-sources" -[source."https://github.com/rust-vmm/kvm-ioctls"] -git = "https://github.com/rust-vmm/kvm-ioctls" -branch = "main" -replace-with = "vendored-sources" - [source."https://github.com/rust-vmm/mshv"] git = "https://github.com/rust-vmm/mshv" branch = "main" @@ -32,11 +27,6 @@ git = "https://github.com/rust-vmm/vfio" branch = "main" replace-with = "vendored-sources" -[source."https://github.com/rust-vmm/vhost"] -git = "https://github.com/rust-vmm/vhost" -branch = "main" -replace-with = "vendored-sources" - [source."https://github.com/rust-vmm/vm-fdt"] git = "https://github.com/rust-vmm/vm-fdt" branch = "main" diff --git a/SPECS/kernel-mshv/config b/SPECS/kernel-mshv/config index dd05c5ad47..6cd65df9c1 100644 --- a/SPECS/kernel-mshv/config +++ b/SPECS/kernel-mshv/config @@ -5625,9 +5625,11 @@ CONFIG_VHOST_VSOCK=m # # Microsoft Hyper-V guest support # +CONFIG_MSHV=y CONFIG_MSHV_VFIO=y +CONFIG_MSHV_ROOT=y +CONFIG_MSHV_XFER_TO_GUEST_WORK=y CONFIG_HYPERV=y -CONFIG_HYPERV_VMM_API=y CONFIG_HYPERV_TIMER=y CONFIG_HYPERV_UTILS=y CONFIG_HYPERV_BALLOON=y diff --git a/SPECS/kernel-mshv/kernel-mshv.signatures.json b/SPECS/kernel-mshv/kernel-mshv.signatures.json index ffdbb1b17c..3f58829566 100644 --- a/SPECS/kernel-mshv/kernel-mshv.signatures.json +++ b/SPECS/kernel-mshv/kernel-mshv.signatures.json @@ -1,7 +1,7 @@ { "Signatures": { - "config": "e652c672401fa5742b0591964d73c7f241a34a737dcaf4b2b2021b5eb3e2b3ca", - "kernel-mshv-5.15.80.mshv2.tar.gz": "d5cb470fdecf692a00eac64bdb4b4f7cb2e9ca729f321f242cc6104896d0f0c8", + "config": "cac2dff2445099de8e89a502a36e7f7520edcfefd492ca257278443c3515ca45", + "kernel-mshv-5.15.86.mshv2.tar.gz": "380464057bf996e3d4c833aafd36f9681de7d5aa7f1984fbf3906b347530a4fc", "cbl-mariner-ca-20211013.pem": "5ef124b0924cb1047c111a0ecff1ae11e6ad7cac8d1d9b40f98f99334121f0b0" } } diff --git a/SPECS/kernel-mshv/kernel-mshv.spec b/SPECS/kernel-mshv/kernel-mshv.spec index d0ac112407..bbe8c91e48 100644 --- a/SPECS/kernel-mshv/kernel-mshv.spec +++ b/SPECS/kernel-mshv/kernel-mshv.spec @@ -10,7 +10,7 @@ Summary: Mariner kernel that has MSHV Host support Name: kernel-mshv -Version: 5.15.80.mshv2 +Version: 5.15.86.mshv2 Release: 1%{?dist} License: GPLv2 URL: https://github.com/microsoft/CBL-Mariner-Linux-Kernel @@ -237,6 +237,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg %{_includedir}/perf/perf_dlfilter.h %changelog +* Tue Jan 24 2023 Neha Agarwal - 5.15.86.mshv2-1 +- Update to v5.15.86.mshv2. + * Fri Dec 09 2022 Neha Agarwal - 5.15.80.mshv2-1 - Update to v5.15.80.mshv2. - Update initramfs triggerun to remove initrd from /boot/efi diff --git a/cgmanifest.json b/cgmanifest.json index 3f66fe7c09..1a1b59c476 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -1717,8 +1717,8 @@ "type": "other", "other": { "name": "cloud-hypervisor", - "version": "28.0", - "downloadUrl": "https://github.com/cloud-hypervisor/cloud-hypervisor/archive/refs/tags/v28.0.tar.gz" + "version": "29.0", + "downloadUrl": "https://github.com/cloud-hypervisor/cloud-hypervisor/archive/refs/tags/v29.0.tar.gz" } } }, @@ -7821,8 +7821,8 @@ "type": "other", "other": { "name": "kernel-mshv", - "version": "5.15.80.mshv2", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/kernel-mshv-5.15.80.mshv2.tar.gz" + "version": "5.15.86.mshv2", + "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/kernel-mshv-5.15.86.mshv2.tar.gz" } } },