xen-changelog

[Top] [All Lists]

[Xen-changelog] Merge xen-vtx-unstable.hg

from [Xen patchbot -unstable]

[Permanent Link][Original]

To:	xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject:	[Xen-changelog] Merge xen-vtx-unstable.hg
From:	Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>
Date:	Wed, 31 Aug 2005 08:30:40 +0000
Delivery-date:	Wed, 31 Aug 2005 08:34:20 +0000
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/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe:	<http://lists.xensource.com/cgi-bin/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 adsharma@xxxxxxxxxxxxxxxxxxxx
# Node ID 84ee014ebd41cc93ca02b3a55f58b27575fdfcf9
# Parent  23979fb12c4908a5743b833da8d87e73677c5461
# Parent  f36aee6f8902a484e030912bf6b2f60ea6dabd9d
Merge xen-vtx-unstable.hg

diff -r 23979fb12c49 -r 84ee014ebd41 xen/arch/x86/shadow.c
--- a/xen/arch/x86/shadow.c     Wed Aug 17 20:33:56 2005
+++ b/xen/arch/x86/shadow.c     Wed Aug 17 20:34:38 2005
@@ -671,6 +671,7 @@
                          sizeof(gpte))) {*/
     if (unlikely(!__guest_get_l1e(v, va, &gpte))) {
         perfc_incrc(shadow_invlpg_faults);
+        shadow_unlock(d);
         return;
     }
     l1pte_propagate_from_guest(d, gpte, &spte);
diff -r 23979fb12c49 -r 84ee014ebd41 xen/arch/x86/shadow32.c
--- a/xen/arch/x86/shadow32.c   Wed Aug 17 20:33:56 2005
+++ b/xen/arch/x86/shadow32.c   Wed Aug 17 20:34:38 2005
@@ -1685,6 +1685,7 @@
     if (__copy_from_user(&gpte, &linear_pg_table[va >> PAGE_SHIFT],
                          sizeof(gpte))) {
         perfc_incrc(shadow_invlpg_faults);
+        shadow_unlock(d);
         return;
     }
     l1pte_propagate_from_guest(d, gpte, &spte);

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

[More with this subject...]

<Prev in Thread]	Current Thread	[Next in Thread>
[Xen-changelog] Merge xen-vtx-unstable.hg, Xen patchbot -unstable <=

Previous by Date:	[Xen-changelog] Drop shadow lock on exit, Xen patchbot -unstable
Next by Date:	[Xen-changelog] Merge., Xen patchbot -unstable
Previous by Thread:	[Xen-changelog] Drop shadow lock on exit, Xen patchbot -unstable
Next by Thread:	[Xen-changelog] Implement cpu_physical_memory_reset_dirty(), Xen patchbot -unstable
Indexes:	[Date] [Thread] [Top] [All Lists]