On Mon, 24 Jan 2011, Gianni Tedesco wrote:
> Only if was_name is true... If they pass a number then we need to check
> explicitly. Perhaps it would be better to put that check in an else {}
> statement though.
>
Good point.
Apart from the inconsistent code style:
Acked-by: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
>
> --
> xl: Check domain existance when doing domain identifier lookups
>
> Also fix a mis-formatted error message in xl destroy command.
>
> Signed-off-by: Gianni Tedesco <gianni.tedesco@xxxxxxxxxx>
>
> diff -r b59f04eb8978 tools/libxl/xl_cmdimpl.c
> --- a/tools/libxl/xl_cmdimpl.c Fri Jan 21 18:06:23 2011 +0000
> +++ b/tools/libxl/xl_cmdimpl.c Mon Jan 24 18:50:32 2011 +0000
> @@ -143,11 +143,24 @@ static int qualifier_to_id(const char *p
> static int domain_qualifier_to_domid(const char *p, uint32_t *domid_r,
> int *was_name_r)
> {
> - int was_name;
> + int was_name, rc;
>
> was_name = qualifier_to_id(p, domid_r);
> - if (was_name_r) *was_name_r = was_name;
> - return was_name ? libxl_name_to_domid(&ctx, p, domid_r) : 0;
> + if (was_name_r)
> + *was_name_r = was_name;
> +
> + if ( was_name ) {
> + rc = libxl_name_to_domid(&ctx, p, domid_r);
> + if ( rc )
> + return rc;
> + }else{
> + libxl_dominfo dominfo;
> + rc = libxl_domain_info(&ctx, &dominfo, *domid_r);
> + if ( rc )
> + return rc;
> + }
> +
> + return 0;
> }
>
> static int cpupool_qualifier_to_cpupoolid(const char *p, uint32_t *poolid_r,
> @@ -2176,7 +2189,7 @@ static void destroy_domain(const char *p
> exit(-1);
> }
> rc = libxl_domain_destroy(&ctx, domid, 0);
> - if (rc) { fprintf(stderr,"destroy failed (rc=%d)\n.",rc); exit(-1); }
> + if (rc) { fprintf(stderr,"destroy failed (rc=%d).\n",rc); exit(-1); }
> }
>
> static void shutdown_domain(const char *p, int wait)
>
>
>
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|
Home