more be fixes

Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>

diff --git a/hw/i386/kvm/xen_xenstore.c b/hw/i386/kvm/xen_xenstore.c
index 07e29448608b5ae1830fcea817b6b042c9e466c0..573623e573cd5c9c3654885f4f92e3df638e5f06 100644 (file)
--- a/hw/i386/kvm/xen_xenstore.c
+++ b/hw/i386/kvm/xen_xenstore.c
@@ -1247,9 +1247,10 @@ static char **xs_be_directory(struct qemu_xs_handle *h, xs_transaction_t t,
     }
 
     items_ret = g_new0(char *, g_list_length(items) + 1);
-
+    *num = 0;
     for (l = items; l; l = l->next) {
         items_ret[i++] = l->data;
+        (*num)++;
     }
     g_list_free(items);
     return items_ret;
@@ -1355,6 +1356,8 @@ static struct qemu_xs_watch *xs_be_watch(struct qemu_xs_handle *h,
         return NULL;
     }
 
+    w->fn = fn;
+    w->opaque = opaque;
     w->path = g_strdup(path);
     return w;
 }