multiple fixes to vcpu setup and memory allocation

xencall/Cargo.toml

@@ -33,3 +33,7 @@ path = "examples/domain_create.rs"
 [[example]]
 name = "xencall-version-capabilities"
 path = "examples/version_capabilities.rs"
+
+[[example]]
+name = "xencall-vcpu-context"
+path = "examples/vcpu_context.rs"

xencall/examples/vcpu_context.rs

@@ -0,0 +1,12 @@
+use xencall::domctl::DomainControl;
+use xencall::{XenCall, XenCallError};
+
+fn main() -> Result<(), XenCallError> {
+    env_logger::init();
+
+    let call = XenCall::open()?;
+    let domctl: DomainControl = DomainControl::new(&call);
+    let context = domctl.get_vcpu_context(224, 0)?;
+    println!("{:?}", context);
+    Ok(())
+}

xencall/src/domctl.rs

@@ -2,8 +2,9 @@ use crate::sys::{
     AddressSize, ArchDomainConfig, CreateDomain, DomCtl, DomCtlValue, DomCtlVcpuContext,
     GetDomainInfo, HypercallInit, MaxMem, MaxVcpus, VcpuGuestContext, VcpuGuestContextAny,
     HYPERVISOR_DOMCTL, XEN_DOMCTL_CREATEDOMAIN, XEN_DOMCTL_DESTROYDOMAIN, XEN_DOMCTL_GETDOMAININFO,
-    XEN_DOMCTL_HYPERCALL_INIT, XEN_DOMCTL_INTERFACE_VERSION, XEN_DOMCTL_MAX_MEM,
-    XEN_DOMCTL_MAX_VCPUS, XEN_DOMCTL_SETVCPUCONTEXT, XEN_DOMCTL_SET_ADDRESS_SIZE,
+    XEN_DOMCTL_GETVCPUCONTEXT, XEN_DOMCTL_HYPERCALL_INIT, XEN_DOMCTL_INTERFACE_VERSION,
+    XEN_DOMCTL_MAX_MEM, XEN_DOMCTL_MAX_VCPUS, XEN_DOMCTL_PAUSEDOMAIN, XEN_DOMCTL_SETVCPUCONTEXT,
+    XEN_DOMCTL_SET_ADDRESS_SIZE,
 };
 use crate::{XenCall, XenCallError};
 use log::trace;
@@ -77,6 +78,23 @@ impl DomainControl<'_> {
         Ok(domctl.domid)
     }
 
+    pub fn pause_domain(&self, domid: u32) -> Result<(), XenCallError> {
+        trace!(
+            "domctl fd={} pause_domain domid={:?}",
+            self.call.handle.as_raw_fd(),
+            domid,
+        );
+        let mut domctl = DomCtl {
+            cmd: XEN_DOMCTL_PAUSEDOMAIN,
+            interface_version: XEN_DOMCTL_INTERFACE_VERSION,
+            domid,
+            value: DomCtlValue { pad: [0; 128] },
+        };
+        self.call
+            .hypercall1(HYPERVISOR_DOMCTL, addr_of_mut!(domctl) as c_ulong)?;
+        Ok(())
+    }
+
     pub fn set_max_mem(&self, domid: u32, memkb: u64) -> Result<(), XenCallError> {
         trace!(
             "domctl fd={} set_max_mem domid={} memkb={}",
@@ -137,6 +155,35 @@ impl DomainControl<'_> {
         Ok(())
     }
 
+    pub fn get_vcpu_context(
+        &self,
+        domid: u32,
+        vcpu: u32,
+    ) -> Result<VcpuGuestContext, XenCallError> {
+        trace!(
+            "domctl fd={} get_vcpu_context domid={}",
+            self.call.handle.as_raw_fd(),
+            domid,
+        );
+        let mut wrapper = VcpuGuestContextAny {
+            value: VcpuGuestContext::default(),
+        };
+        let mut domctl = DomCtl {
+            cmd: XEN_DOMCTL_GETVCPUCONTEXT,
+            interface_version: XEN_DOMCTL_INTERFACE_VERSION,
+            domid,
+            value: DomCtlValue {
+                vcpu_context: DomCtlVcpuContext {
+                    vcpu,
+                    ctx: addr_of_mut!(wrapper) as c_ulong,
+                },
+            },
+        };
+        self.call
+            .hypercall1(HYPERVISOR_DOMCTL, addr_of_mut!(domctl) as c_ulong)?;
+        Ok(unsafe { wrapper.value })
+    }
+
     pub fn set_vcpu_context(
         &self,
         domid: u32,

xencall/src/memory.rs

@@ -3,11 +3,9 @@ use crate::sys::{
 };
 use crate::{XenCall, XenCallError};
 
+use log::{trace};
 use std::ffi::c_ulong;
 use std::os::fd::AsRawFd;
-
-use libc::c_long;
-use log::trace;
 use std::ptr::addr_of_mut;
 
 pub struct MemoryControl<'a> {
@@ -29,8 +27,10 @@ impl MemoryControl<'_> {
     ) -> Result<Vec<u64>, XenCallError> {
         trace!("memory fd={} populate_physmap domid={} nr_extents={} extent_order={} mem_flags={} extent_starts={:?}", self.call.handle.as_raw_fd(), domid, nr_extents, extent_order, mem_flags, extent_starts);
         let mut extent_starts = extent_starts.to_vec();
+        let ptr = extent_starts.as_mut_ptr();
+
         let mut reservation = MemoryReservation {
-            extent_start: extent_starts.as_mut_ptr() as c_ulong,
+            extent_start: ptr as c_ulong,
             nr_extents,
             extent_order,
             mem_flags,
@@ -50,15 +50,13 @@ impl MemoryControl<'_> {
             ],
         }];
         self.call.multicall(calls)?;
-        let code = calls[0].result as c_long;
-        if code < 0 {
+        let code = calls[0].result;
+        if code > !0xfff {
             return Err(XenCallError::new("failed to populate physmap"));
         }
-
         if code as usize > extent_starts.len() {
             return Err(XenCallError::new("failed to populate physmap"));
         }
-
         Ok(extent_starts[0..code as usize].to_vec())
     }
 }

xencall/src/sys.rs

@@ -313,7 +313,7 @@ pub struct HypercallInit {
 }
 
 pub const XEN_DOMCTL_INTERFACE_VERSION: u32 = 0x00000015;
-pub const SECINITSID_DOMU: u32 = 13;
+pub const SECINITSID_DOMU: u32 = 12;
 
 #[repr(C)]
 #[derive(Copy, Clone, Debug)]