WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-changelog

[Xen-changelog] [xen-3.4-testing] New release of C/S 19894 "Disable memo

To: xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-changelog] [xen-3.4-testing] New release of C/S 19894 "Disable memory mapping warnings when stub
From: "Xen patchbot-3.4-testing" <patchbot-3.4-testing@xxxxxxxxxxxxxxxxxxx>
Date: Mon, 01 Mar 2010 04:05:23 -0800
Delivery-date: Mon, 01 Mar 2010 04:17:50 -0800
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id: BK change log <xen-changelog.lists.xensource.com>
List-post: <mailto:xen-changelog@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to: xen-devel@xxxxxxxxxxxxxxxxxxx
Sender: xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx
# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1267444870 0
# Node ID 1cdf837cd5ef635f998e14620905fb31b7a6e54c
# Parent  fa6ee088d915e53c075fb5c6e225f5200e1a0a99
New release of C/S 19894 "Disable memory mapping warnings when stub
domain is used."

This is backport from xen-unstable.

Signed-off-by: Daniel Kiper <dkiper@xxxxxxxxxxxx>
---
 xen/arch/x86/mm.c               |    6 +++---
 xen/arch/x86/mm/shadow/common.c |    6 ++----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff -r fa6ee088d915 -r 1cdf837cd5ef xen/arch/x86/mm.c
--- a/xen/arch/x86/mm.c Fri Feb 26 17:10:48 2010 +0000
+++ b/xen/arch/x86/mm.c Mon Mar 01 12:01:10 2010 +0000
@@ -3932,6 +3932,9 @@ long arch_memory_op(int op, XEN_GUEST_HA
 
         domain_lock(d);
 
+        if ( page )
+            put_page(page);
+
         /* Remove previously mapped page if it was present. */
         prev_mfn = gmfn_to_mfn(d, xatp.gpfn);
         if ( mfn_valid(prev_mfn) )
@@ -3953,9 +3956,6 @@ long arch_memory_op(int op, XEN_GUEST_HA
         rc = guest_physmap_add_page(d, xatp.gpfn, mfn, 0);
 
         domain_unlock(d);
-
-        if ( page )
-            put_page(page);
 
         rcu_unlock_domain(d);
 
diff -r fa6ee088d915 -r 1cdf837cd5ef xen/arch/x86/mm/shadow/common.c
--- a/xen/arch/x86/mm/shadow/common.c   Fri Feb 26 17:10:48 2010 +0000
+++ b/xen/arch/x86/mm/shadow/common.c   Mon Mar 01 12:01:10 2010 +0000
@@ -2584,11 +2584,9 @@ int sh_remove_all_mappings(struct vcpu *
     {
         /* Don't complain if we're in HVM and there are some extra mappings: 
          * The qemu helper process has an untyped mapping of this dom's RAM 
-         * and the HVM restore program takes another. Additionally, if stub
-         * domain is active then it also has an untyped mapping of original
-         * domain's RAM. */
+         * and the HVM restore program takes another. */
         if ( !(shadow_mode_external(v->domain)
-               && (page->count_info & PGC_count_mask) <= 4
+               && (page->count_info & PGC_count_mask) <= 3
                && (page->u.inuse.type_info & PGT_count_mask) == 0) )
         {
             SHADOW_ERROR("can't find all mappings of mfn %lx: "

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

<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-changelog] [xen-3.4-testing] New release of C/S 19894 "Disable memory mapping warnings when stub, Xen patchbot-3.4-testing <=