From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ian Campbell <ian.campbell@citrix.com>
Subject: [PATCH 20 of 26] xl: free all data on exit from the
	domain monitor daemon
Date: Mon, 16 Aug 2010 15:33:44 +0100
Message-ID: <dd25ac29c0f74a2d909d.1281969224@localhost.localdomain>
References: <patchbomb.1281969204@localhost.localdomain>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xensource.com>
In-Reply-To: <patchbomb.1281969204@localhost.localdomain>
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@lists.xensource.com
Cc: Ian Campbell <ian.campbell@citrix.com>
List-Id: xen-devel@lists.xenproject.org

# HG changeset patch
# User Ian Campbell <ian.campbell@citrix.com>
# Date 1281969065 -3600
# Node ID dd25ac29c0f74a2d909df3e3d072ed5d59320312
# Parent  a33d1901115bfeceab9cad25954472acdd475744
xl: free all data on exit from the domain monitor daemon.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>

diff -r a33d1901115b -r dd25ac29c0f7 tools/libxl/xl_cmdimpl.c
--- a/tools/libxl/xl_cmdimpl.c	Mon Aug 16 15:31:05 2010 +0100
+++ b/tools/libxl/xl_cmdimpl.c	Mon Aug 16 15:31:05 2010 +0100
@@ -1581,9 +1581,11 @@ start:
                 if (ret) {
                     switch (handle_domain_death(&ctx, domid, &event, &d_config, &info)) {
                     case 2:
-                        if (!preserve_domain(&ctx, domid, &event, &d_config, &info))
+                        if (!preserve_domain(&ctx, domid, &event, &d_config, &info)) {
                             /* If we fail then exit leaving the old domain in place. */
-                            exit(-1);
+                            ret = -1;
+                            goto out;
+                        }
 
                         /* Otherwise fall through and restart. */
                     case 1:
@@ -1601,6 +1603,8 @@ start:
                         goto start;
                     case 0:
                         LOG("Done. Exiting now");
+                        ret = 0;
+                        goto out;
                         exit(0);
                     }
                 }
@@ -1612,9 +1616,6 @@ start:
         }
         libxl_free_event(&event);
     }
-
-    close(logfile);
-    exit(0);
 
 error_out:
     if (domid)