|
From: <sv...@va...> - 2013-12-01 10:58:17
|
Author: bart
Date: Sun Dec 1 10:58:11 2013
New Revision: 13736
Log:
xen: XEN_SYSCTL_readconsole hypercall
From: Andrew Cooper <and...@ci...>
Signed-off-by: Andrew Cooper <and...@ci...>
Signed-off-by: Ian Campbell <ian...@ci...>
Modified:
trunk/coregrind/m_syswrap/syswrap-xen.c
trunk/include/vki/vki-xen-sysctl.h
Modified: trunk/coregrind/m_syswrap/syswrap-xen.c
==============================================================================
--- trunk/coregrind/m_syswrap/syswrap-xen.c (original)
+++ trunk/coregrind/m_syswrap/syswrap-xen.c Sun Dec 1 10:58:11 2013
@@ -433,6 +433,18 @@
__PRE_XEN_SYSCTL_READ(_sysctl, _sysctl, _field)
switch (sysctl->cmd) {
+ case VKI_XEN_SYSCTL_readconsole:
+ /* These are all unconditionally read */
+ PRE_XEN_SYSCTL_READ(readconsole, clear);
+ PRE_XEN_SYSCTL_READ(readconsole, incremental);
+ PRE_XEN_SYSCTL_READ(readconsole, buffer);
+ PRE_XEN_SYSCTL_READ(readconsole, count);
+
+ /* 'index' only read if 'incremental' is nonzero */
+ if (sysctl->u.readconsole.incremental)
+ PRE_XEN_SYSCTL_READ(readconsole, index);
+ break;
+
case VKI_XEN_SYSCTL_getdomaininfolist:
switch (sysctl->interface_version)
{
@@ -984,6 +996,11 @@
__POST_XEN_SYSCTL_WRITE(_sysctl, _sysctl, _field)
switch (sysctl->cmd) {
+ case VKI_XEN_SYSCTL_readconsole:
+ POST_MEM_WRITE((Addr)sysctl->u.readconsole.buffer.p,
+ sysctl->u.readconsole.count * sizeof(char));
+ break;
+
case VKI_XEN_SYSCTL_getdomaininfolist:
switch (sysctl->interface_version)
{
Modified: trunk/include/vki/vki-xen-sysctl.h
==============================================================================
--- trunk/include/vki/vki-xen-sysctl.h (original)
+++ trunk/include/vki/vki-xen-sysctl.h Sun Dec 1 10:58:11 2013
@@ -38,6 +38,27 @@
#define VKI_XEN_SYSCTL_scheduler_op 19
#define VKI_XEN_SYSCTL_coverage_op 20
+struct vki_xen_sysctl_readconsole {
+ /* IN */
+ vki_uint8_t clear;
+ vki_uint8_t incremental;
+
+ vki_uint8_t pad0, pad1;
+
+ /*
+ * IN: Start index for consumption if @incremental.
+ * OUT: End index after consuming from the console.
+ */
+ vki_uint32_t index;
+ VKI_XEN_GUEST_HANDLE_64(char) buffer; /* IN */
+
+ /*
+ * IN: size of buffer.
+ * OUT: bytes written into buffer.
+ */
+ vki_uint32_t count;
+};
+
struct vki_xen_sysctl_getdomaininfolist_00000008 {
/* IN variables. */
vki_xen_domid_t first_domain;
@@ -138,7 +159,7 @@
vki_uint32_t cmd;
vki_uint32_t interface_version; /* XEN_SYSCTL_INTERFACE_VERSION */
union {
- //struct vki_xen_sysctl_readconsole readconsole;
+ struct vki_xen_sysctl_readconsole readconsole;
//struct vki_xen_sysctl_tbuf_op tbuf_op;
struct vki_xen_sysctl_physinfo_00000008 physinfo_00000008;
struct vki_xen_sysctl_physinfo_0000000a physinfo_0000000a;
|