Merge branch 'main' into fp_update

firecracker-microvm · Sep 13, 2023 · 2781f92 · 2781f92
2 parents 9b2979c + bee2437
commit 2781f92
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 14 deletions.
diff --git a/.cargo/config b/.cargo/config
@@ -2,13 +2,13 @@
 target-dir = "build/cargo_target"
 target = "x86_64-unknown-linux-musl"
 rustflags = [
-  "-Dclippy::ptr_as_ptr",
-  "-Dclippy::undocumented_unsafe_blocks",
-  "-Dclippy::cast_lossless",
-  "-Dclippy::cast_possible_wrap",
-  "-Dclippy::cast_sign_loss",
-  "-Dmissing_debug_implementations",
-  "-Dclippy::exit",
+  "-Wclippy::ptr_as_ptr",
+  "-Wclippy::undocumented_unsafe_blocks",
+  "-Wclippy::cast_lossless",
+  "-Wclippy::cast_possible_wrap",
+  "-Wclippy::cast_sign_loss",
+  "-Wmissing_debug_implementations",
+  "-Wclippy::exit",
 ]
 
 [net]

diff --git a/tests/data/msr/msr_list_T2CL_INTEL_CASCADELAKE_5.10host_4.14guest.csv b/tests/data/msr/msr_list_T2CL_INTEL_CASCADELAKE_5.10host_4.14guest.csv
@@ -18,7 +18,7 @@ MSR_ADDR,VALUE
 0xcd,0x3
 0xce,0x80000000
 0xfe,0x508
-0x10a,0xaa0eb
+0x10a,0x40aa0eb
 0x11e,0xbe702111
 0x122,0x3
 0x140,0x0

diff --git a/tests/data/msr/msr_list_T2CL_INTEL_CASCADELAKE_5.10host_5.10guest.csv b/tests/data/msr/msr_list_T2CL_INTEL_CASCADELAKE_5.10host_5.10guest.csv
@@ -18,7 +18,7 @@ MSR_ADDR,VALUE
 0xcd,0x3
 0xce,0x80000000
 0xfe,0x508
-0x10a,0xaa0eb
+0x10a,0x40aa0eb
 0x11e,0xbe702111
 0x122,0x3
 0x140,0x0

diff --git a/tests/data/msr/msr_list_T2CL_INTEL_ICELAKE_5.10host_4.14guest.csv b/tests/data/msr/msr_list_T2CL_INTEL_ICELAKE_5.10host_4.14guest.csv
@@ -18,7 +18,7 @@ MSR_ADDR,VALUE
 0xcd,0x3
 0xce,0x80000000
 0xfe,0x508
-0x10a,0x2a0eb
+0x10a,0x402a0eb
 0x11e,0xbe702111
 0x122,0x3
 0x140,0x0

diff --git a/tests/data/msr/msr_list_T2CL_INTEL_ICELAKE_5.10host_5.10guest.csv b/tests/data/msr/msr_list_T2CL_INTEL_ICELAKE_5.10host_5.10guest.csv
@@ -18,7 +18,7 @@ MSR_ADDR,VALUE
 0xcd,0x3
 0xce,0x80000000
 0xfe,0x508
-0x10a,0x2a0eb
+0x10a,0x402a0eb
 0x11e,0xbe702111
 0x122,0x3
 0x140,0x0

diff --git a/tests/host_tools/cargo_build.py b/tests/host_tools/cargo_build.py
@@ -43,10 +43,9 @@ def cargo(
 
 def get_rustflags():
     """Get the relevant rustflags for building/unit testing."""
-    rustflags = "-D warnings"
     if platform.machine() == "aarch64":
-        rustflags += " -C link-arg=-lgcc -C link-arg=-lfdt "
-    return rustflags
+        return "-C link-arg=-lgcc -C link-arg=-lfdt "
+    return ""
 
 
 @with_filelock

diff --git a/tools/devtool b/tools/devtool
@@ -506,6 +506,10 @@ cmd_distclean() {
 }
 
 ensure_ci_artifacts() {
+    if [ ! command -v aws >/dev/null ]; then
+      die "AWS CLI not installed, which is required for downloading artifacts for integration tests."
+    fi
+
     # Fetch all the artifacts so they are local
     say "Fetching CI artifacts from S3"
     S3_URL=s3://spec.ccfc.min/firecracker-ci/v1.5/$(uname -m)