imported patch mem_event_tools_domctls.patch

diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile
index c0fd44b502161857efde254ad09e5ae7c414fe1b..a36b6acf36b22d6f594a909407fb07a66214bb24 100644 (file)
--- a/tools/libxc/Makefile
+++ b/tools/libxc/Makefile
@@ -22,6 +22,7 @@ CTRL_SRCS-y       += xc_pm.c
 CTRL_SRCS-y       += xc_cpu_hotplug.c
 CTRL_SRCS-y       += xc_resume.c
 CTRL_SRCS-y       += xc_tmem.c
+CTRL_SRCS-y       += xc_mem_event.c
 CTRL_SRCS-$(CONFIG_X86) += xc_pagetab.c
 CTRL_SRCS-$(CONFIG_Linux) += xc_linux.c
 CTRL_SRCS-$(CONFIG_SunOS) += xc_solaris.c

diff --git a/tools/libxc/xc_mem_event.c b/tools/libxc/xc_mem_event.c
new file mode 100644 (file)
index 0000000..17dbf54
--- /dev/null
+++ b/tools/libxc/xc_mem_event.c
@@ -0,0 +1,59 @@
+/******************************************************************************
+ *
+ * xc_mem_event.c
+ *
+ * Interface to low-level memory event functionality.
+ *
+ * Copyright (c) 2009 Citrix (R&D) Ltd. (Patrick Colp)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "xc_private.h"
+
+int xc_mem_event_control(int xc_handle, domid_t domain_id, unsigned int op,
+                         unsigned int mode, void *shared_page,
+                         void *ring_page, unsigned long gfn)
+{
+    DECLARE_DOMCTL;
+
+    domctl.cmd = XEN_DOMCTL_mem_event_op;
+    domctl.domain = domain_id;
+    domctl.u.mem_event_op.op = op;
+    domctl.u.mem_event_op.mode = mode;
+
+    domctl.u.mem_event_op.shared_addr = (unsigned long)shared_page;
+    domctl.u.mem_event_op.ring_addr = (unsigned long)ring_page;
+
+    domctl.u.mem_event_op.gfn = gfn;
+    
+    return do_domctl(xc_handle, &domctl);
+}
+
+int xc_mem_event_enable(int xc_handle, domid_t domain_id,
+                        void *shared_page, void *ring_page)
+{
+    return xc_mem_event_control(xc_handle, domain_id,
+                                XEN_DOMCTL_MEM_EVENT_OP_ENABLE, 0,
+                                shared_page, ring_page, INVALID_MFN);
+}
+
+int xc_mem_event_disable(int xc_handle, domid_t domain_id)
+{
+    return xc_mem_event_control(xc_handle, domain_id,
+                                XEN_DOMCTL_MEM_EVENT_OP_DISABLE, 0,
+                                NULL, NULL, INVALID_MFN);
+}
+

diff --git a/tools/libxc/xenctrl.h b/tools/libxc/xenctrl.h
index 4b3039802309627997af17c46e541d2a7e2286de..234695f791c254aa055fd99a5978973bf12a919a 100644 (file)
--- a/tools/libxc/xenctrl.h
+++ b/tools/libxc/xenctrl.h
@@ -47,6 +47,8 @@
 #define XC_PAGE_SIZE            (1UL << XC_PAGE_SHIFT)
 #define XC_PAGE_MASK            (~(XC_PAGE_SIZE-1))
 
+#define INVALID_MFN  (~0UL)
+
 /*
  *  DEFINITIONS FOR CPU BARRIERS
  */
@@ -1312,4 +1314,15 @@ void xc_tmem_save_done(int xc_handle, int dom);
 int xc_tmem_restore(int xc_handle, int dom, int fd);
 int xc_tmem_restore_extra(int xc_handle, int dom, int fd);
 
+/**
+ * mem_event operations
+ */
+int xc_mem_event_control(int xc_handle, domid_t domain_id, unsigned int op,
+                         unsigned int mode, void *shared_page,
+                          void *ring_page, unsigned long gfn);
+
+int xc_mem_event_enable(int xc_handle, domid_t domain_id,
+                        void *shared_page, void *ring_page);
+int xc_mem_event_disable(int xc_handle, domid_t domain_id);
+
 #endif /* XENCTRL_H */