xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
To: Mukesh Rathor <mukesh.rathor@oracle.com>
Cc: "Xen-devel@lists.xensource.com" <Xen-devel@lists.xensource.com>,
	Ian Campbell <Ian.Campbell@citrix.com>,
	"stefano.stabellini@eu.citrix.com"
	<stefano.stabellini@eu.citrix.com>
Subject: Re: [PATCH v1 1/8]: PVH  basic and hader file changes
Date: Wed, 26 Sep 2012 10:33:17 -0400	[thread overview]
Message-ID: <20120926143317.GA24866@phenom.dumpdata.com> (raw)
In-Reply-To: <20120921121511.30001c08@mantra.us.oracle.com>

> diff --git a/include/xen/interface/memory.h b/include/xen/interface/memory.h
> index eac3ce1..f150fa1c 100644
> --- a/include/xen/interface/memory.h
> +++ b/include/xen/interface/memory.h
> @@ -163,11 +163,22 @@ struct xen_add_to_physmap {
>      /* Which domain to change the mapping for. */
>      domid_t domid;
>  
> +    union {
> +        /* Number of pages to go through for gmfn_range */
> +        uint16_t    size;
> +	/* IFF XENMAPSPACE_gmfn_foreign */
> +        domid_t foreign_domid;
> +    } u;
>      /* Source mapping space. */

So found out why it crashed on PVHVM. If you rebase your patch
on top of  b58aaa4b0b3506c094308342d746f600468c63d9

Author: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Date:   Mon Aug 6 15:27:24 2012 +0100

    xen: update xen_add_to_physmap interface
    
    Update struct xen_add_to_physmap to be in sync with Xen's version of the
    structure.
    The size field was introduced by:
    
    changeset:   24164:707d27fe03e7
    user:        Jean Guyader <jean.guyader@eu.citrix.com>
    date:        Fri Nov 18 13:42:08 2011 +0000
    summary:     mm: New XENMEM space, XENMAPSPACE_gmfn_range
    
    According to the comment:
    
    "This new field .size is located in the 16 bits padding between .domid
    and .space in struct xen_add_to_physmap to stay compatible with older
    versions."
    
    Changes in v2:
    
    - remove erroneous comment in the commit message.
    
    Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
    Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

the merge ends up looking like this:
@ -166,11 +166,22 @@ struct xen_add_to_physmap {
     /* Number of pages to go through for gmfn_range */
     uint16_t    size;
 
+    union {
+        /* Number of pages to go through for gmfn_range */
+        uint16_t    size;
+	/* IFF XENMAPSPACE_gmfn_foreign */
+        domid_t foreign_domid;
+    } u;

Grrrr..

  parent reply	other threads:[~2012-09-26 14:33 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-09-21 19:15 [PATCH v1 1/8]: PVH basic and hader file changes Mukesh Rathor
2012-09-24 11:26 ` Stefano Stabellini
2012-09-24 11:29   ` Ian Campbell
2012-09-24 18:19   ` Mukesh Rathor
2012-09-26 13:42 ` Ian Campbell
2012-09-26 13:45 ` Ian Campbell
2012-09-26 14:33 ` Konrad Rzeszutek Wilk [this message]
2012-10-02 10:48 ` Stefano Stabellini
2012-10-02 13:04   ` Konrad Rzeszutek Wilk
2012-10-04 10:00 ` Ian Campbell
2012-10-04 12:44   ` Konrad Rzeszutek Wilk

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20120926143317.GA24866@phenom.dumpdata.com \
    --to=konrad.wilk@oracle.com \
    --cc=Ian.Campbell@citrix.com \
    --cc=Xen-devel@lists.xensource.com \
    --cc=mukesh.rathor@oracle.com \
    --cc=stefano.stabellini@eu.citrix.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).