All of lore.kernel.org
 help / color / mirror / Atom feed
From: Arun Sharma <arun.sharma@intel.com>
To: Ian Pratt <Ian.Pratt@cl.cam.ac.uk>,
	Keir Fraser <Keir.Fraser@cl.cam.ac.uk>
Cc: xen-devel@lists.xensource.com
Subject: [PATCH][VT][4/4] Changing phys_to_machine_mapping[] is not implemented on VMX domains
Date: Thu, 11 Aug 2005 15:00:53 -0700	[thread overview]
Message-ID: <20050811220053.GA19889@intel.com> (raw)

Changing phys_to_machine_mapping[] is not implemented on VMX domains

Make it CONFIG_XEN only for now.

Signed-off-by: Arun Sharma <arun.sharma@intel.com>

--- a/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c	Wed Aug 10 23:09:53 2005
+++ b/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c	Wed Aug 10 16:59:36 2005
@@ -49,6 +49,7 @@
 #include <asm/uaccess.h>
 #include <asm-xen/evtchn.h>
 #include <asm-xen/ctrl_if.h>
+#include <asm-xen/xen-public/grant_table.h>
 #include <asm-xen/xen-public/io/netif.h>
 #include <asm-xen/balloon.h>
 #include <asm/page.h>
@@ -444,9 +445,11 @@
 #endif
         rx_pfn_array[i] = virt_to_machine(skb->head) >> PAGE_SHIFT;
 
+#ifdef CONFIG_XEN
 	/* Remove this page from pseudo phys map before passing back to Xen. */
 	phys_to_machine_mapping[__pa(skb->head) >> PAGE_SHIFT] 
 	    = INVALID_P2M_ENTRY;
+#endif
 
 	MULTI_update_va_mapping(rx_mcl+i, (unsigned long)skb->head,
 				__pte(0), 0);
@@ -678,12 +681,15 @@
 #endif
         mcl++;
 
+#ifdef CONFIG_XEN
         phys_to_machine_mapping[__pa(skb->head) >> PAGE_SHIFT] = 
 #ifdef CONFIG_XEN_NETDEV_GRANT_RX
             mfn;
 #else
             rx->addr >> PAGE_SHIFT;
 #endif
+#endif
+
 #ifdef GRANT_DEBUG
         printk(KERN_ALERT "#### rx_poll     enqueue vdata=%08x mfn=%08x ref=%04x\n",
                skb->data, mfn, ref);

                 reply	other threads:[~2005-08-11 22:00 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=20050811220053.GA19889@intel.com \
    --to=arun.sharma@intel.com \
    --cc=Ian.Pratt@cl.cam.ac.uk \
    --cc=Keir.Fraser@cl.cam.ac.uk \
    --cc=xen-devel@lists.xensource.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.