Skip to content

Commit d836109

Browse files
committed
vmclock: enable vmclock device for our guest kernel
Enable vmclock for 6.1 guest kernels. Create a patch that enables the CONFIG_PTP_1588_CLOCK_VMCLOCK Kconfig and change rebuild.sh to patch the config when building 6.1 guest kernels. Signed-off-by: Babis Chalios <bchalios@amazon.es>
1 parent 51427b2 commit d836109

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
CONFIG_PTP_1588_CLOCK_VMCLOCK=y

resources/rebuild.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,7 @@ function build_al_kernels {
250250
PCIE_CONFIG="$PWD/guest_configs/pcie.config"
251251
PMEM_CONFIG="$PWD/guest_configs/virtio-pmem.config"
252252
MEM_CONFIG="$PWD/guest_configs/virtio-mem.config"
253+
VMCLOCK_CONFIG="$PWD/guest_configs/vmclock.config"
253254

254255
if [[ "$KERNEL_VERSION" == @(all|5.10) ]]; then
255256
build_al_kernel $PWD/guest_configs/microvm-kernel-ci-$ARCH-5.10.config "$CI_CONFIG" "$PCIE_CONFIG" "$PMEM_CONFIG" "$MEM_CONFIG"
@@ -258,7 +259,7 @@ function build_al_kernels {
258259
build_al_kernel $PWD/guest_configs/microvm-kernel-ci-$ARCH-5.10-no-acpi.config "$CI_CONFIG" "$PCIE_CONFIG" "$PMEM_CONFIG" "$MEM_CONFIG"
259260
fi
260261
if [[ "$KERNEL_VERSION" == @(all|6.1) ]]; then
261-
build_al_kernel $PWD/guest_configs/microvm-kernel-ci-$ARCH-6.1.config "$CI_CONFIG" "$PCIE_CONFIG" "$PMEM_CONFIG" "$MEM_CONFIG"
262+
build_al_kernel $PWD/guest_configs/microvm-kernel-ci-$ARCH-6.1.config "$CI_CONFIG" "$PCIE_CONFIG" "$PMEM_CONFIG" "$MEM_CONFIG" "$VMCLOCK_CONFIG"
262263
fi
263264

264265
# Build debug kernels
@@ -271,7 +272,7 @@ function build_al_kernels {
271272
vmlinux_split_debuginfo $OUTPUT_DIR/vmlinux-5.10.*
272273
fi
273274
if [[ "$KERNEL_VERSION" == @(all|6.1) ]]; then
274-
build_al_kernel "$PWD/guest_configs/microvm-kernel-ci-$ARCH-6.1.config" "$CI_CONFIG" "$PCIE_CONFIG" "$PMEM_CONFIG" "$MEM_CONFIG" "$FTRACE_CONFIG" "$DEBUG_CONFIG"
275+
build_al_kernel "$PWD/guest_configs/microvm-kernel-ci-$ARCH-6.1.config" "$CI_CONFIG" "$PCIE_CONFIG" "$PMEM_CONFIG" "$MEM_CONFIG" "$FTRACE_CONFIG" "$DEBUG_CONFIG" "$VMCLOCK_CONFIG"
275276
vmlinux_split_debuginfo $OUTPUT_DIR/vmlinux-6.1.*
276277
fi
277278
}

0 commit comments

Comments
 (0)