thr3ads.net - Xen devel - [Xen-devel] [PATCH 1 of 2] *RESENT 3* xl: improve compatibility with xm [Jun 2011]

If this information is useful, please help other people find it:
Share via:

Carsten Schiers

2011-Jun-03 12:46 UTC

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

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@schiers.de>

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@lists.xensource.com
http://lists.xensource.com/xen-devel

Carsten Schiers

2011-Jun-03 13:02 UTC

head link

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

I give up. Please find patch attached as file. BR, Carsten.

-----Ursprüngliche Nachricht-----
Von: Carsten Schiers 
Gesendet: Freitag, 3. Juni 2011 14:47
An: xen-devel
Cc: Ian.Jackson; Ian.Campbell; Stefano.Stabellini
Betreff: [Xen-devel] [PATCH 1 of 2] *RESENT 3* xl: improve compatibility 
with xm

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@schiers.de>

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@lists.xensource.com
http://lists.xensource.com/xen-devel




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

Ian Campbell

2011-Jun-03 13:22 UTC

head link

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

On Fri, 2011-06-03 at 14:02 +0100, Carsten Schiers
wrote:> I give up.
What''s the problem?
>  Please find patch attached as file. BR, Carsten.
> 
> -----Ursprüngliche Nachricht-----
> Von: Carsten Schiers 
> Gesendet: Freitag, 3. Juni 2011 14:47
> An: xen-devel
> Cc: Ian.Jackson; Ian.Campbell; Stefano.Stabellini
> Betreff: [Xen-devel] [PATCH 1 of 2] *RESENT 3* xl: improve compatibility 
> with xm
> 
> 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@schiers.de>
> 
> 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@lists.xensource.com
> http://lists.xensource.com/xen-devel
> 
> 


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

Ian Jackson

2011-Jun-21 17:24 UTC

head link

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

Carsten Schiers writes ("[Xen-devel] [PATCH 1 of 2] *RESENT 4* xl: improve
compatibility with xm"):> xl: improve compatibility with xm
Applied, thanks.  I think this is another backport candidate.

Ian.

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

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

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

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

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

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

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

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

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

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

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