[PATCH 1/3] xen: handle backend deletion from xenstore

[Stefano Stabellini <stefano.stabellini@eu.citrix.com>]

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
---
 hw/xen_backend.c |   17 +++++++++--------
 hw/xen_disk.c    |    4 ++++
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/hw/xen_backend.c b/hw/xen_backend.c
index 64dc93a..11e09fc 100644
--- a/hw/xen_backend.c
+++ b/hw/xen_backend.c
@@ -561,7 +561,7 @@ static void xenstore_update_be(char *watch, char *type, int dom,
 			       struct XenDevOps *ops)
 {
     struct XenDevice *xendev;
-    char path[XEN_BUFSIZE], *dom0;
+    char path[XEN_BUFSIZE], *dom0, *bepath;
     unsigned int len, dev;
 
     dom0 = xs_get_domain_path(xenstore, 0);
@@ -577,15 +577,16 @@ static void xenstore_update_be(char *watch, char *type, int dom,
     if (dev == -1)
 	return;
 
-    if (0) {
-	/* FIXME: detect devices being deleted from xenstore ... */
-	xen_be_del_xendev(dom, dev);
-    }
-
     xendev = xen_be_get_xendev(type, dom, dev, ops);
     if (xendev != NULL) {
-	xen_be_backend_changed(xendev, path);
-	xen_be_check_state(xendev);
+        bepath = xs_read(xenstore, 0, xendev->be, &len);
+        if (bepath == NULL) {
+            xen_be_del_xendev(dom, dev);
+        } else {
+            free(bepath);
+            xen_be_backend_changed(xendev, path);
+            xen_be_check_state(xendev);
+        }
     }
 }
 
diff --git a/hw/xen_disk.c b/hw/xen_disk.c
index 5db58ac..f9ef062 100644
--- a/hw/xen_disk.c
+++ b/hw/xen_disk.c
@@ -758,6 +758,10 @@ static int blk_free(struct XenDevice *xendev)
     struct XenBlkDev *blkdev = container_of(xendev, struct XenBlkDev, xendev);
     struct ioreq *ioreq;
 
+    if (blkdev->bs || blkdev->sring) {
+        blk_disconnect(xendev);
+    }
+
     while (!LIST_EMPTY(&blkdev->freelist)) {
 	ioreq = LIST_FIRST(&blkdev->freelist);
         LIST_REMOVE(ioreq, list);
-- 
1.7.2.5