WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-devel

[Xen-devel] [PATCH 1 of 2] *RESENT 3* xl: improve compatibility with xm

To: xen-devel <xen-devel@xxxxxxxxxxxxxxxxxxx>
Subject: [Xen-devel] [PATCH 1 of 2] *RESENT 3* xl: improve compatibility with xm
From: "Carsten Schiers" <carsten@xxxxxxxxxx>
Date: Fri, 3 Jun 2011 14:46:50 +0200
Cc: "Ian.Jackson" <Ian.Jackson@xxxxxxxxxxxxx>, "Ian.Campbell" <Ian.Campbell@xxxxxxxxxx>, "Stefano.Stabellini" <Stefano.Stabellini@xxxxxxxxxxxxx>
Delivery-date: Fri, 03 Jun 2011 05:47:34 -0700
Dkim-signature: v=1; a=rsa-sha256; c=simple; d=mail.zeus06.de; h=date: from:to:cc:message-id:subject:mime-version:content-type: content-transfer-encoding; q=dns/txt; s=beta; bh=JnPa2fPek3x5EuN DcHtYTjgMdIAjBpzgw97qqHMaYP8=; b=sYFr4e0eRoxPUxy4U5ubwErR8aZRGAc VuCX22/8I+WkD608T6XZxQH0xqbq11kdjIXc/W/GjA06A0nF2lO3sALFzoA/eSd2 9huzCq+4H+sGie4s6rPqS16whkSHsvbrK5/PQVBNtBZstbOJ50NMRm31wHgXMcsm osjbpXMXAI1g=
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-id: Xen developer discussion <xen-devel.lists.xensource.com>
List-post: <mailto:xen-devel@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
Sender: xen-devel-bounces@xxxxxxxxxxxxxxxxxxx
xl: improve compatibility with xm

/etc/init.d/xendomains relies on simple pattern matching from sructures 
being printed by "xl list -l" command. so update xl implementation to 
match.

Signed-off-by: Carsten Schiers <carsten@xxxxxxxxxx>

diff -r 37c77bacb52a tools/libxl/xl_cmdimpl.c
--- a/tools/libxl/xl_cmdimpl.c  Mon May 23 17:38:28 2011 +0100
+++ b/tools/libxl/xl_cmdimpl.c  Thu May 26 19:58:46 2011 +0200
@@ -294,7 +294,7 @@
     libxl_domain_build_info *b_info = &d_config->b_info;
 
     printf("(domain\n\t(domid %d)\n", domid);
-    printf("\t(domain_create_info)\n");
+    printf("\t(create_info)\n");
     printf("\t(hvm %d)\n", c_info->hvm);
     printf("\t(hap %d)\n", c_info->hap);
     printf("\t(oos %d)\n", c_info->oos);
@@ -321,7 +321,7 @@
         printf("\t(platformdata (null))\n");
 
 
-    printf("\t(domain_build_info)\n");
+    printf("\t(build_info)\n");
     printf("\t(max_vcpus %d)\n", b_info->max_vcpus);
     printf("\t(tsc_mode %d)\n", b_info->tsc_mode);
     printf("\t(max_memkb %d)\n", b_info->max_memkb);
@@ -381,7 +381,7 @@
         printf("\t(device\n");
         printf("\t\t(tap\n");
         printf("\t\t\t(backend_domid %d)\n", 
d_config->disks[i].backend_domid);
-        printf("\t\t\t(domid %d)\n", domid);
+        printf("\t\t\t(frontend_domid %d)\n", domid);
         printf("\t\t\t(physpath %s)\n", d_config->disks[i].pdev_path);
         printf("\t\t\t(phystype %d)\n", d_config->disks[i].backend);
         printf("\t\t\t(virtpath %s)\n", d_config->disks[i].vdev);
@@ -396,7 +396,7 @@
         printf("\t(device\n");
         printf("\t\t(vif\n");
         printf("\t\t\t(backend_domid %d)\n", 
d_config->vifs[i].backend_domid);
-        printf("\t\t\t(domid %d)\n", domid);
+        printf("\t\t\t(frontend_domid %d)\n", domid);
         printf("\t\t\t(devid %d)\n", d_config->vifs[i].devid);
         printf("\t\t\t(mtu %d)\n", d_config->vifs[i].mtu);
         printf("\t\t\t(model %s)\n", d_config->vifs[i].model);
@@ -426,7 +426,7 @@
         printf("\t(device\n");
         printf("\t\t(vfb\n");
         printf("\t\t\t(backend_domid %d)\n", 
d_config->vfbs[i].backend_domid);
-        printf("\t\t\t(domid %d)\n", domid);
+        printf("\t\t\t(frontend_domid %d)\n", domid);
         printf("\t\t\t(devid %d)\n", d_config->vfbs[i].devid);
         printf("\t\t\t(vnc %d)\n", d_config->vfbs[i].vnc);
         printf("\t\t\t(vnclisten %s)\n", d_config->vfbs[i].vnclisten);
@@ -1469,10 +1469,6 @@
 
     parse_config_data(config_file, config_data, config_len, &d_config, 
&d_config.dm_info);
 
-    ret = 0;
-    if (dom_info->dryrun)
-        goto out;
-
     if (migrate_fd >= 0) {
         if (d_config.c_info.name) {
             /* when we receive a domain we get its name from the config
@@ -1491,9 +1487,13 @@
         }
     }
 
-    if (debug)
+    if (debug || dom_info->dryrun)
         printf_info(-1, &d_config, &d_config.dm_info);
 
+    ret = 0;
+    if (dom_info->dryrun)
+      goto out;
+
 start:
     domid = -1;




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

<Prev in Thread] Current Thread [Next in Thread>