[Xen-changelog] [xen-unstable] [XEN] getpagframeinfo field name mfn -> gmfn.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Node ID 74018b65c369ea23815a4b2c7285c3268af1d7d4
# Parent  2aa910eb3713cbf2e078c842fc0ed5572d0d9bd7
[XEN] getpagframeinfo field name mfn -> gmfn.
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
---
 tools/libxc/xc_private.c      |    2 +-
 xen/arch/ia64/xen/dom0_ops.c  |    2 +-
 xen/arch/x86/dom0_ops.c       |    2 +-
 xen/include/public/dom0_ops.h |    6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff -r 2aa910eb3713 -r 74018b65c369 tools/libxc/xc_private.c
--- a/tools/libxc/xc_private.c  Wed Jul 05 17:16:10 2006 +0100
+++ b/tools/libxc/xc_private.c  Wed Jul 05 17:37:08 2006 +0100
@@ -26,7 +26,7 @@ unsigned int get_pfn_type(int xc_handle,
 {
     DECLARE_DOM0_OP;
     op.cmd = DOM0_GETPAGEFRAMEINFO;
-    op.u.getpageframeinfo.mfn    = mfn;
+    op.u.getpageframeinfo.gmfn   = mfn;
     op.u.getpageframeinfo.domain = (domid_t)dom;
     if ( do_dom0_op(xc_handle, &op) < 0 )
     {
diff -r 2aa910eb3713 -r 74018b65c369 xen/arch/ia64/xen/dom0_ops.c
--- a/xen/arch/ia64/xen/dom0_ops.c      Wed Jul 05 17:16:10 2006 +0100
+++ b/xen/arch/ia64/xen/dom0_ops.c      Wed Jul 05 17:37:08 2006 +0100
@@ -32,7 +32,7 @@ long arch_do_dom0_op(dom0_op_t *op, XEN_
     case DOM0_GETPAGEFRAMEINFO:
     {
         struct page_info *page;
-        unsigned long mfn = op->u.getpageframeinfo.mfn;
+        unsigned long mfn = op->u.getpageframeinfo.gmfn;
         domid_t dom = op->u.getpageframeinfo.domain;
         struct domain *d;
 
diff -r 2aa910eb3713 -r 74018b65c369 xen/arch/x86/dom0_ops.c
--- a/xen/arch/x86/dom0_ops.c   Wed Jul 05 17:16:10 2006 +0100
+++ b/xen/arch/x86/dom0_ops.c   Wed Jul 05 17:37:08 2006 +0100
@@ -207,7 +207,7 @@ long arch_do_dom0_op(struct dom0_op *op,
     case DOM0_GETPAGEFRAMEINFO:
     {
         struct page_info *page;
-        unsigned long mfn = op->u.getpageframeinfo.mfn;
+        unsigned long mfn = op->u.getpageframeinfo.gmfn;
         domid_t dom = op->u.getpageframeinfo.domain;
         struct domain *d;
 
diff -r 2aa910eb3713 -r 74018b65c369 xen/include/public/dom0_ops.h
--- a/xen/include/public/dom0_ops.h     Wed Jul 05 17:16:10 2006 +0100
+++ b/xen/include/public/dom0_ops.h     Wed Jul 05 17:37:08 2006 +0100
@@ -162,7 +162,7 @@ DEFINE_XEN_GUEST_HANDLE(dom0_settime_t);
 
 struct dom0_getpageframeinfo {
     /* IN variables. */
-    xen_pfn_t mfn;         /* Machine page frame number to query.       */
+    xen_pfn_t gmfn;        /* GMFN to query.                            */
     domid_t domain;        /* To which domain does the frame belong?    */
     /* OUT variables. */
     /* Is the page PINNED to a type? */
@@ -177,9 +177,9 @@ DEFINE_XEN_GUEST_HANDLE(dom0_getpagefram
 #define DOM0_READCONSOLE      19
 struct dom0_readconsole {
     /* IN variables. */
-    uint32_t clear;            /* Non-zero -> clear after reading. */
+    uint32_t clear;                /* Non-zero -> clear after reading. */
+    XEN_GUEST_HANDLE(char) buffer; /* Buffer start */
     /* IN/OUT variables. */
-    XEN_GUEST_HANDLE(char) buffer; /* In: Buffer start; Out: Used buffer start 
*/
     uint32_t count;            /* In: Buffer size;  Out: Used buffer size  */
 };
 typedef struct dom0_readconsole dom0_readconsole_t;

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog