Skip to content

Commit 9fa26c3

Browse files
committed
chore(virtio-mem): new guest kernel config
Add new file with options enabling virtio-mem support in guest kernels Signed-off-by: Egor Lazarchuk <[email protected]>
1 parent 2374f60 commit 9fa26c3

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
CONFIG_VIRTIO_MEM=y
2+
CONFIG_STRICT_DEVMEM=y

resources/rebuild.sh

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -249,15 +249,16 @@ function build_al_kernels {
249249
CI_CONFIG="$PWD/guest_configs/ci.config"
250250
PCIE_CONFIG="$PWD/guest_configs/pcie.config"
251251
PMEM_CONFIG="$PWD/guest_configs/virtio-pmem.config"
252+
MEM_CONFIG="$PWD/guest_configs/virtio-mem.config"
252253

253254
if [[ "$KERNEL_VERSION" == @(all|5.10) ]]; then
254-
build_al_kernel $PWD/guest_configs/microvm-kernel-ci-$ARCH-5.10.config "$CI_CONFIG" "$PCIE_CONFIG" "$PMEM_CONFIG"
255+
build_al_kernel $PWD/guest_configs/microvm-kernel-ci-$ARCH-5.10.config "$CI_CONFIG" "$PCIE_CONFIG" "$PMEM_CONFIG" "$MEM_CONFIG"
255256
fi
256257
if [[ $ARCH == "x86_64" && "$KERNEL_VERSION" == @(all|5.10-no-acpi) ]]; then
257-
build_al_kernel $PWD/guest_configs/microvm-kernel-ci-$ARCH-5.10-no-acpi.config "$CI_CONFIG" "$PCIE_CONFIG" "$PMEM_CONFIG"
258+
build_al_kernel $PWD/guest_configs/microvm-kernel-ci-$ARCH-5.10-no-acpi.config "$CI_CONFIG" "$PCIE_CONFIG" "$PMEM_CONFIG" "$MEM_CONFIG"
258259
fi
259260
if [[ "$KERNEL_VERSION" == @(all|6.1) ]]; then
260-
build_al_kernel $PWD/guest_configs/microvm-kernel-ci-$ARCH-6.1.config "$CI_CONFIG" "$PCIE_CONFIG" "$PMEM_CONFIG"
261+
build_al_kernel $PWD/guest_configs/microvm-kernel-ci-$ARCH-6.1.config "$CI_CONFIG" "$PCIE_CONFIG" "$PMEM_CONFIG" "$MEM_CONFIG"
261262
fi
262263

263264
# Build debug kernels
@@ -266,11 +267,11 @@ function build_al_kernels {
266267
OUTPUT_DIR=$OUTPUT_DIR/debug
267268
mkdir -pv $OUTPUT_DIR
268269
if [[ "$KERNEL_VERSION" == @(all|5.10) ]]; then
269-
build_al_kernel "$PWD/guest_configs/microvm-kernel-ci-$ARCH-5.10.config" "$CI_CONFIG" "$PCIE_CONFIG" "$PMEM_CONFIG" "$FTRACE_CONFIG" "$DEBUG_CONFIG"
270+
build_al_kernel "$PWD/guest_configs/microvm-kernel-ci-$ARCH-5.10.config" "$CI_CONFIG" "$PCIE_CONFIG" "$PMEM_CONFIG" "$MEM_CONFIG" "$FTRACE_CONFIG" "$DEBUG_CONFIG"
270271
vmlinux_split_debuginfo $OUTPUT_DIR/vmlinux-5.10.*
271272
fi
272273
if [[ "$KERNEL_VERSION" == @(all|6.1) ]]; then
273-
build_al_kernel "$PWD/guest_configs/microvm-kernel-ci-$ARCH-6.1.config" "$CI_CONFIG" "$PCIE_CONFIG" "$PMEM_CONFIG" "$FTRACE_CONFIG" "$DEBUG_CONFIG"
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"
274275
vmlinux_split_debuginfo $OUTPUT_DIR/vmlinux-6.1.*
275276
fi
276277
}

0 commit comments

Comments
 (0)