[Xen-changelog] [xen-unstable] stubdom: 'file' based disk sharing

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1243327835 -3600
# Node ID 0f752c773497b8e5ee4a774249bd2db4477416d0
# Parent  85d6849bdcd955bd5a15124c3d5f209d2bc3d51c
stubdom: 'file' based disk sharing

Allow 'file' based disks, that are blkback based disks, to be shared
between the guest domain and the stubdom. It does so exploiting the
same exception introduced in the previous patch "stubdoms phy disks
sharing". Now we can remove the hack in stubdom-dm that forces "file"
disks to be opened using blktap instead of blkback.

Signed-off-by: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
---
 stubdom/stubdom-dm        |    4 ----
 tools/hotplug/Linux/block |    6 +++---
 2 files changed, 3 insertions(+), 7 deletions(-)

diff -r 85d6849bdcd9 -r 0f752c773497 stubdom/stubdom-dm
--- a/stubdom/stubdom-dm        Tue May 26 09:49:19 2009 +0100
+++ b/stubdom/stubdom-dm        Tue May 26 09:50:35 2009 +0100
@@ -114,10 +114,6 @@ do
     vbd_dev=`xenstore-read $i/dev`
     vbd_front=`xenstore-read $i/frontend`
     vbd_devtype=`xenstore-read $vbd_front/device-type`
-    if [ $vbd_type = "file" ]
-    then
-        vbd_type="tap:aio"
-    fi
     if [ $j -ne 0 ]
     then
         echo -n "," >> /etc/xen/stubdoms/$domname-dm
diff -r 85d6849bdcd9 -r 0f752c773497 tools/hotplug/Linux/block
--- a/tools/hotplug/Linux/block Tue May 26 09:49:19 2009 +0100
+++ b/tools/hotplug/Linux/block Tue May 26 09:50:35 2009 +0100
@@ -202,13 +202,13 @@ case "$command" in
       p=$(xenstore_read "$XENBUS_PATH/params")
       mode=$(xenstore_read "$XENBUS_PATH/mode")
     fi
+    FRONTEND_ID=$(xenstore_read "$XENBUS_PATH/frontend-id")
+    FRONTEND_UUID=$(xenstore_read_default \
+            "/local/domain/$FRONTEND_ID/vm" 'unknown')
 
     case $t in 
       phy)
         dev=$(expand_dev $p)
-        FRONTEND_ID=$(xenstore_read "$XENBUS_PATH/frontend-id")
-        FRONTEND_UUID=$(xenstore_read_default \
-            "/local/domain/$FRONTEND_ID/vm" 'unknown')
 
         if [ -L "$dev" ]
         then

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