Merge branch 'main' into awscli-errors

roypat · web-flow · commit e0690be763f1 · 2025-04-10T15:01:53.000Z
diff --git a/.buildkite/common.py b/.buildkite/common.py
@@ -25,6 +25,8 @@
     "m7a.metal-48xl", # AMD Genoa
     "m6g.metal",      # Graviton2
     "m7g.metal",      # Graviton3
+    "m8g.metal-24xl", # Graviton4 1 socket
+    "m8g.metal-48xl", # Graviton4 2 sockets
 ]
 # fmt: on
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,7 +16,9 @@ and this project adheres to
   Linux kernels newer than 5.0 compiled with `CONFIG_PVH=y` set this ELF Note,
   as do FreeBSD kernels.
 - [#5065](https://github.com/firecracker-microvm/firecracker/pull/5065) Added
-  support for Intel AMX (Advanced Matrix Extensions).
+  support for Intel AMX (Advanced Matrix Extensions). To be able to take and
+  restore a snapshot of Intel AMX state, `Xsave` is used instead of `kvm_xsave`,
+  so users need to regenerate snapshots.
 - [#4731](https://github.com/firecracker-microvm/firecracker/pull/4731): Added
   support for modifying the host TAP device name during snapshot restore.
 
diff --git a/README.md b/README.md
@@ -141,6 +141,8 @@ We test all combinations of:
 | m7a.metal-48xl |                  |              |              |
 | m6g.metal      |                  |              |              |
 | m7g.metal      |                  |              |              |
+| m8g.metal-24xl |                  |              |              |
+| m8g.metal-48xl |                  |              |              |
 
 ## Known issues and Limitations
 
diff --git a/src/vmm/src/persist.rs b/src/vmm/src/persist.rs
@@ -148,7 +148,7 @@ pub enum CreateSnapshotError {
 }
 
 /// Snapshot version
-pub const SNAPSHOT_VERSION: Version = Version::new(5, 0, 0);
+pub const SNAPSHOT_VERSION: Version = Version::new(6, 0, 0);
 
 /// Creates a Microvm snapshot.
 pub fn create_snapshot(

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,8 @@`
`25`	`25`	`"m7a.metal-48xl", # AMD Genoa`
`26`	`26`	`"m6g.metal", # Graviton2`
`27`	`27`	`"m7g.metal", # Graviton3`
	`28`	`+ "m8g.metal-24xl", # Graviton4 1 socket`
	`29`	`+ "m8g.metal-48xl", # Graviton4 2 sockets`
`28`	`30`	`]`
`29`	`31`	`# fmt: on`
`30`	`32`
Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ pub enum CreateSnapshotError {`
`148`	`148`	`}`
`149`	`149`
`150`	`150`	`/// Snapshot version`
`151`		`-pub const SNAPSHOT_VERSION: Version = Version::new(5, 0, 0);`
	`151`	`+pub const SNAPSHOT_VERSION: Version = Version::new(6, 0, 0);`
`152`	`152`
`153`	`153`	`/// Creates a Microvm snapshot.`
`154`	`154`	`pub fn create_snapshot(`