From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Subject: [PATCH] stubdoms 'file' based disks sharing
Date: Thu, 21 May 2009 17:21:49 +0100
Message-ID: <4A157F9D.2050506@eu.citrix.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xensource.com>
List-Unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: xen-devel <xen-devel@lists.xensource.com>
List-Id: xen-devel@lists.xenproject.org

Hi all,
this simple patch allows '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 -r 61404d971c92 stubdom/stubdom-dm
--- a/stubdom/stubdom-dm	Thu May 21 04:31:47 2009 +0100
+++ b/stubdom/stubdom-dm	Thu May 21 17:15:49 2009 +0100
@@ -114,10 +114,6 @@
     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 61404d971c92 tools/hotplug/Linux/block
--- a/tools/hotplug/Linux/block	Thu May 21 04:31:47 2009 +0100
+++ b/tools/hotplug/Linux/block	Thu May 21 17:15:49 2009 +0100
@@ -202,13 +202,13 @@
       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