3 files changed, 27 insertions, 8 deletions

diff --git a/include/xen/interface/memory.h b/include/xen/interface/memory.h
index b40a4315cb8b..2ecfe4f700d9 100644
--- a/include/xen/interface/memory.h
+++ b/include/xen/interface/memory.h
@@ -190,6 +190,7 @@ DEFINE_GUEST_HANDLE_STRUCT(xen_add_to_physmap);
 
 #define XENMEM_add_to_physmap_range 23
 struct xen_add_to_physmap_range {
+    /* IN */
     /* Which domain to change the mapping for. */
     domid_t domid;
     uint16_t space; /* => enum phys_map_space */
@@ -203,6 +204,11 @@ struct xen_add_to_physmap_range {
 
     /* GPFN in domid where the source mapping page should appear. */
     GUEST_HANDLE(xen_pfn_t) gpfns;
+
+    /* OUT */
+
+    /* Per index error code. */
+    GUEST_HANDLE(int) errs;
 };
 DEFINE_GUEST_HANDLE_STRUCT(xen_add_to_physmap_range);
 
diff --git a/include/xen/interface/platform.h b/include/xen/interface/platform.h
index 5e36932ab407..c57d5f67f702 100644
--- a/include/xen/interface/platform.h
+++ b/include/xen/interface/platform.h
@@ -324,10 +324,21 @@ struct xenpf_cpu_ol {
 };
 DEFINE_GUEST_HANDLE_STRUCT(xenpf_cpu_ol);
 
-/*
- * CMD 58 and 59 are reserved for cpu hotadd and memory hotadd,
- * which are already occupied at Xen hypervisor side.
- */
+#define XENPF_cpu_hotadd        58
+struct xenpf_cpu_hotadd {
+        uint32_t apic_id;
+        uint32_t acpi_id;
+        uint32_t pxm;
+};
+
+#define XENPF_mem_hotadd        59
+struct xenpf_mem_hotadd {
+        uint64_t spfn;
+        uint64_t epfn;
+        uint32_t pxm;
+        uint32_t flags;
+};
+
 #define XENPF_core_parking     60
 struct xenpf_core_parking {
         /* IN variables */
@@ -357,6 +368,8 @@ struct xen_platform_op {
                 struct xenpf_set_processor_pminfo set_pminfo;
                 struct xenpf_pcpuinfo          pcpu_info;
                 struct xenpf_cpu_ol            cpu_ol;
+                struct xenpf_cpu_hotadd        cpu_add;
+                struct xenpf_mem_hotadd        mem_add;
                 struct xenpf_core_parking      core_parking;
                 uint8_t                        pad[128];
         } u;
diff --git a/include/xen/interface/xen.h b/include/xen/interface/xen.h
index 886a5d80a18f..53ec4167bd0b 100644
--- a/include/xen/interface/xen.h
+++ b/include/xen/interface/xen.h
@@ -285,7 +285,7 @@ DEFINE_GUEST_HANDLE_STRUCT(multicall_entry);
  * Event channel endpoints per domain:
  *  1024 if a long is 32 bits; 4096 if a long is 64 bits.
  */
-#define NR_EVENT_CHANNELS (sizeof(unsigned long) * sizeof(unsigned long) * 64)
+#define NR_EVENT_CHANNELS (sizeof(xen_ulong_t) * sizeof(xen_ulong_t) * 64)
 
 struct vcpu_time_info {
         /*
@@ -341,7 +341,7 @@ struct vcpu_info {
          */
         uint8_t evtchn_upcall_pending;
         uint8_t evtchn_upcall_mask;
-        unsigned long evtchn_pending_sel;
+        xen_ulong_t evtchn_pending_sel;
         struct arch_vcpu_info arch;
         struct pvclock_vcpu_time_info time;
 }; /* 64 bytes (x86) */
@@ -384,8 +384,8 @@ struct shared_info {
          * per-vcpu selector word to be set. Each bit in the selector covers a
          * 'C long' in the PENDING bitfield array.
          */
-        unsigned long evtchn_pending[sizeof(unsigned long) * 8];
-        unsigned long evtchn_mask[sizeof(unsigned long) * 8];
+        xen_ulong_t evtchn_pending[sizeof(xen_ulong_t) * 8];
+        xen_ulong_t evtchn_mask[sizeof(xen_ulong_t) * 8];
 
         /*
          * Wallclock time: updated only by control software. Guests should base