xen-changelog

[Top] [All Lists]

[Xen-changelog] Fix blkif 'grant-table-ification'

from [Xen patchbot -unstable]

[Permanent Link][Original]

To:	xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject:	[Xen-changelog] Fix blkif 'grant-table-ification'
From:	Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>
Date:	Wed, 06 Jul 2005 12:52:11 -0400
Delivery-date:	Wed, 06 Jul 2005 16:52:41 +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 smh22@xxxxxxxxxxxxxxxxxxxx
# Node ID b522a3a4d525b1b5ead7617915a6fec23fd07dba
# Parent  1883ec07708b5ce77c1daa1d7a5e15f7ba0feac8

Fix blkif 'grant-table-ification' 

Signed-off-by: Steven Hand <steve@xxxxxxxxxxxxx>

diff -r 1883ec07708b -r b522a3a4d525 
linux-2.6.11-xen-sparse/drivers/xen/blkback/interface.c
--- a/linux-2.6.11-xen-sparse/drivers/xen/blkback/interface.c   Wed Jul  6 
15:38:25 2005
+++ b/linux-2.6.11-xen-sparse/drivers/xen/blkback/interface.c   Wed Jul  6 
16:50:57 2005
@@ -219,9 +219,7 @@
         op.ref            = ref;
         op.dom            = domid;
        
-        if(unlikely(HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, &op, 
1))) {
-            BUG();
-        }
+        BUG_ON( HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, &op, 1) );
        
         handle = op.handle;
        
@@ -231,10 +229,6 @@
             vfree(vma->addr);
             return;
         }
-
-        phys_to_machine_mapping[__pa(VMALLOC_VMADDR(vma->addr)) >>
-                                PAGE_SHIFT] =
-                      FOREIGN_FRAME(shmem_frame);
 
         blkif->shmem_ref = ref;
         blkif->shmem_handle = handle;

_______________________________________________
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] Fix blkif 'grant-table-ification', Xen patchbot -unstable <=

Previous by Date:	[Xen-changelog] Manual merge., Xen patchbot -unstable
Next by Date:	[Xen-changelog] Improve changeset identification to work from src tar ball too., Xen patchbot -unstable
Previous by Thread:	[Xen-changelog] Move xenstore page before page tables so that guest doesn't free it after boot, Xen patchbot -unstable
Next by Thread:	[Xen-changelog] Improve changeset identification to work from src tar ball too., Xen patchbot -unstable
Indexes:	[Date] [Thread] [Top] [All Lists]