From mboxrd@z Thu Jan 1 00:00:00 1970 From: Juergen Gross Subject: Re: [PATCH 1 of 3] libxl: remove libxl_domain_create_info.poolname Date: Tue, 24 Jan 2012 08:21:08 +0100 Message-ID: <4F1E5BE4.3010406@ts.fujitsu.com> References: Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii"; Format="flowed" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: Ian Campbell Cc: ian.jackson@citrix.com, xen-devel@lists.xensource.com List-Id: xen-devel@lists.xenproject.org On 01/23/2012 03:43 PM, Ian Campbell wrote: > # HG changeset patch > # User Ian Campbell > # Date 1327329346 0 > # Node ID c91bee33280debdfe602d28e48318c03ddf0f4c9 > # Parent 4bb2b6a04ec02c3502c1825e2736df54870229e5 > libxl: remove libxl_domain_create_info.poolname > > It is redundant with poolid and allowing the user to specify both > opens up the possibility of a disconnect. > > Also default c_info->poolid to -1 (no pool) instead of defaulting to 0 in the > library and overriding in the toolstack. > > Signed-off-by: Ian Campbell Acked-by: juergen.gross@ts.fujitsu.com > diff -r 4bb2b6a04ec0 -r c91bee33280d tools/libxl/libxl_create.c > --- a/tools/libxl/libxl_create.c Fri Jan 20 17:12:17 2012 +0000 > +++ b/tools/libxl/libxl_create.c Mon Jan 23 14:35:46 2012 +0000 > @@ -60,7 +60,7 @@ int libxl_init_create_info(libxl_ctx *ct > c_info->type = LIBXL_DOMAIN_TYPE_HVM; > c_info->oos = 1; > c_info->ssidref = 0; > - c_info->poolid = 0; > + c_info->poolid = -1; > return 0; > } > > @@ -438,8 +438,9 @@ retry_transaction: > > xs_write(ctx->xsh, t, libxl__sprintf(gc, "%s/uuid", vm_path), uuid_string, strlen(uuid_string)); > xs_write(ctx->xsh, t, libxl__sprintf(gc, "%s/name", vm_path), info->name, strlen(info->name)); > - if (info->poolname) > - xs_write(ctx->xsh, t, libxl__sprintf(gc, "%s/pool_name", vm_path), info->poolname, strlen(info->poolname)); > + if (info->poolid != -1) > + libxl__xs_write(gc, t, libxl__sprintf(gc, "%s/pool_name", vm_path), > + "%s", libxl__cpupoolid_to_name(gc, info->poolid)); > > libxl__xs_writev(gc, t, dom_path, info->xsdata); > libxl__xs_writev(gc, t, libxl__sprintf(gc, "%s/platform", dom_path), info->platformdata); > diff -r 4bb2b6a04ec0 -r c91bee33280d tools/libxl/libxl_types.idl > --- a/tools/libxl/libxl_types.idl Fri Jan 20 17:12:17 2012 +0000 > +++ b/tools/libxl/libxl_types.idl Mon Jan 23 14:35:46 2012 +0000 > @@ -156,7 +156,6 @@ libxl_domain_create_info = Struct("domai > ("xsdata", libxl_key_value_list), > ("platformdata", libxl_key_value_list), > ("poolid", uint32), > - ("poolname", string), > ]) > > libxl_domain_build_info = Struct("domain_build_info",[ > diff -r 4bb2b6a04ec0 -r c91bee33280d tools/libxl/xl_cmdimpl.c > --- a/tools/libxl/xl_cmdimpl.c Fri Jan 20 17:12:17 2012 +0000 > +++ b/tools/libxl/xl_cmdimpl.c Mon Jan 23 14:35:46 2012 +0000 > @@ -315,7 +315,7 @@ static void printf_info(int domid, > printf("\t(uuid)\n"); > } > > - printf("\t(cpupool %s)\n", c_info->poolname); > + printf("\t(cpupool %s)\n", libxl_cpupoolid_to_name(ctx, c_info->poolid)); > if (c_info->xsdata) > printf("\t(xsdata contains data)\n"); > else > @@ -640,11 +640,9 @@ static void parse_config_data(const char > c_info->oos = l; > > if (!xlu_cfg_get_string (config, "pool",&buf, 0)) { > - c_info->poolid = -1; > cpupool_qualifier_to_cpupoolid(buf,&c_info->poolid, NULL); > } > - c_info->poolname = libxl_cpupoolid_to_name(ctx, c_info->poolid); > - if (!c_info->poolname) { > + if (!libxl_cpupoolid_to_name(ctx, c_info->poolid)) { > fprintf(stderr, "Illegal pool specified\n"); > exit(1); > } > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xensource.com > http://lists.xensource.com/xen-devel > > -- Juergen Gross Principal Developer Operating Systems PDG ES&S SWE OS6 Telephone: +49 (0) 89 3222 2967 Fujitsu Technology Solutions e-mail: juergen.gross@ts.fujitsu.com Domagkstr. 28 Internet: ts.fujitsu.com D-80807 Muenchen Company details: ts.fujitsu.com/imprint.html