Merge branch 'main' into vm_device_attr

kylin-wangdi · web-flow · commit 935f9659f3fb · 2025-07-25T09:14:31.000+08:00
diff --git a/kvm-ioctls/CHANGELOG.md b/kvm-ioctls/CHANGELOG.md
@@ -6,6 +6,7 @@
 
 - Added support for `KVM_HAS_DEVICE_ATTR` and `KVM_SET_DEVICE_ATTR` vm ioctl
   on aarch64.
+- Plumb through KVM_CAP_X2APIC_API as X2ApicApi cap.
 
 ## v0.23.0
 
diff --git a/kvm-ioctls/src/cap.rs b/kvm-ioctls/src/cap.rs
@@ -167,4 +167,6 @@ pub enum Cap {
     MemoryAttributes = KVM_CAP_MEMORY_ATTRIBUTES,
     #[cfg(target_arch = "x86_64")]
     NestedState = KVM_CAP_NESTED_STATE,
+    #[cfg(target_arch = "x86_64")]
+    X2ApicApi = KVM_CAP_X2APIC_API,
 }

Original file line number	Diff line number	Diff line change
`@@ -167,4 +167,6 @@ pub enum Cap {`
`167`	`167`	`MemoryAttributes = KVM_CAP_MEMORY_ATTRIBUTES,`
`168`	`168`	`#[cfg(target_arch = "x86_64")]`
`169`	`169`	`NestedState = KVM_CAP_NESTED_STATE,`
	`170`	`+ #[cfg(target_arch = "x86_64")]`
	`171`	`+ X2ApicApi = KVM_CAP_X2APIC_API,`
`170`	`172`	`}`