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@eu.citrix.com>

diff --git a/stubdom/stubdom-dm b/stubdom/stubdom-dm
index 0bcc1e644b0bce8188a6283cd2c25afef507a910..be39fff8940d7355d4b42be6e0d062fa35830db6 100644 (file)
--- a/stubdom/stubdom-dm
+++ b/stubdom/stubdom-dm
@@ -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 --git a/tools/hotplug/Linux/block b/tools/hotplug/Linux/block
index 8c61744c83c6a3bb267af8e54a49a015513f0fdb..e042a7ef99c68159bda33806fe7db9eefea23fca 100644 (file)
--- a/tools/hotplug/Linux/block
+++ b/tools/hotplug/Linux/block
@@ -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