[Xen-devel] [PATCH] [qemu] xen_be_init under stubdom

[Kamala Narasimhan <kamala.narasimhan@xxxxxxxxx>]

Do nothing in xen_be_init under stubdom plus a minor inconsequential cleanup.

Signed-off-by: Kamala Narasimhan <kamala.narasimhan@xxxxxxxxxx>

Kamala

diff --git a/hw/xen_backend.c b/hw/xen_backend.c
index d9be513..61e1210 100644
--- a/hw/xen_backend.c
+++ b/hw/xen_backend.c
@@ -613,7 +613,7 @@ static void xenstore_update(void *unused)

     vec = xs_read_watch(xenstore, &count);
     if (vec == NULL)
-       goto cleanup;
+        return;

     if (sscanf(vec[XS_WATCH_TOKEN], "be:%" PRIxPTR ":%d:%" PRIxPTR,
                &type, &dom, &ops) == 3)
@@ -621,7 +621,6 @@ static void xenstore_update(void *unused)
     if (sscanf(vec[XS_WATCH_TOKEN], "fe:%" PRIxPTR, &ptr) == 1)
        xenstore_update_fe(vec[XS_WATCH_PATH], (void*)ptr);

-cleanup:
     qemu_free(vec);
 }

@@ -646,6 +645,10 @@ static void xen_be_evtchn_event(void *opaque)

 int xen_be_init(void)
 {
+#ifdef CONFIG_STUBDOM
+    return 0;
+#endif
+
     xenstore = xs_daemon_open();
     if (!xenstore) {
        xen_be_printf(NULL, 0, "can't connect to xenstored\n");

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