Cleanup

Author: ValentaTomas

Makefile

@@ -9,4 +9,4 @@ upload:
 	./scripts/upload.sh $(GCP_PROJECT_ID)
 
 .PHONY: build-and-upload
-make build-and-upload: build upload
+build-and-upload: build upload

scripts/build.sh

@@ -2,7 +2,7 @@
 
 set -euo pipefail
 
-# The format will be: v<major>.<minor>.<patch>_g<commit_hash> — e.g. v1.7.2_g8bb88311
+# The format will be: v<major>.<minor>.<patch>_<commit_hash> — e.g. v1.7.2_8bb88311
 # Extract full version from src/firecracker/swagger/firecracker.yaml
 FC_VERSION=$(awk '/^info:/{flag=1} flag && /^  version:/{print $2; exit}' src/firecracker/swagger/firecracker.yaml)
 commit_hash=$(git rev-parse --short=7 HEAD)

src/vmm/src/vstate/vm.rs

@@ -321,6 +321,8 @@ impl Vm {
             // This is the most important optimization - avoids repeated allocations
             let zero_buf = vec![0u8; page_size];
 
+            let sys_page_size = host_page_size();
+
             for mapping in &mappings {
                 // Find the memory region that matches this mapping
                 let mem_region = guest_memory
@@ -333,7 +335,6 @@ impl Vm {
                 let num_pages = region_size / page_size;
 
                 // Use mincore on the entire region to check residency
-                let sys_page_size = host_page_size();
                 let mincore_pages = region_size.div_ceil(sys_page_size);
                 let mut mincore_vec = vec![0u8; mincore_pages];