From: Ian Campbell <ian.campbell@citrix.com>
To: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: xen-devel@lists.xenproject.org, ian.jackson@eu.citrix.com,
wei.liu2@citrix.com, stefano.stabellini@eu.citrix.com
Subject: Re: [PATCH v2 2/5] libxl: vcpuset: Return error values.
Date: Wed, 18 Mar 2015 13:08:05 +0000 [thread overview]
Message-ID: <1426684085.14291.15.camel@citrix.com> (raw)
In-Reply-To: <1426683978.14291.14.camel@citrix.com>
On Wed, 2015-03-18 at 13:06 +0000, Ian Campbell wrote:
> On Fri, 2015-03-13 at 16:26 -0400, Konrad Rzeszutek Wilk wrote:
> > The function does not return any values at all. Convert the
> > internal libxl ones (ERROR_FAIL, ..., etc) to positive values
> > and for the other cases just return standard libxl values.
>
> It's not clear why you want to do this, in particular returning
> -ERROR_INVAL and inverting libxl error codes seems like a very strange
> thing to be doing.
BTW I know the xl error handling is horribly confused, and there are
even a small number of instances of -ERROR_* already, but I think those
are wrong and we shouldn't introduce more.
>
> I think you should either use ERROR_INVAL (not inverted) and propagate
> libxl rc's directly or convert them into something which suits xl, i.e.
> 0 and 1.
>
> > Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> > ---
> > tools/libxl/xl_cmdimpl.c | 23 +++++++++++++----------
> > 1 file changed, 13 insertions(+), 10 deletions(-)
> >
> > diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
> > index 2d7145f..454a895 100644
> > --- a/tools/libxl/xl_cmdimpl.c
> > +++ b/tools/libxl/xl_cmdimpl.c
> > @@ -5013,17 +5013,18 @@ int main_vcpupin(int argc, char **argv)
> > return rc;
> > }
> >
> > -static void vcpuset(uint32_t domid, const char* nr_vcpus, int check_host)
> > +static int vcpuset(uint32_t domid, const char* nr_vcpus, int check_host)
> > {
> > char *endptr;
> > unsigned int max_vcpus, i;
> > libxl_bitmap cpumap;
> > + int rc;
> >
> > libxl_bitmap_init(&cpumap);
> > max_vcpus = strtoul(nr_vcpus, &endptr, 10);
> > if (nr_vcpus == endptr) {
> > fprintf(stderr, "Error: Invalid argument.\n");
> > - return;
> > + return -ERROR_INVAL;
> > }
> >
> > /*
> > @@ -5036,22 +5037,25 @@ static void vcpuset(uint32_t domid, const char* nr_vcpus, int check_host)
> > fprintf(stderr, "You are overcommmitting! You have %d physical " \
> > " CPUs and want %d vCPUs! Aborting, use --ignore-host to " \
> > " continue\n", host_cpu, max_vcpus);
> > - return;
> > + return -ERROR_INVAL;
> > }
> > /* NB: This also limits how many are set in the bitmap */
> > max_vcpus = (max_vcpus > host_cpu ? host_cpu : max_vcpus);
> > }
> > - if (libxl_cpu_bitmap_alloc(ctx, &cpumap, max_vcpus)) {
> > - fprintf(stderr, "libxl_cpu_bitmap_alloc failed\n");
> > - return;
> > + rc = libxl_cpu_bitmap_alloc(ctx, &cpumap, max_vcpus);
> > + if (rc) {
> > + fprintf(stderr, "libxl_cpu_bitmap_alloc failed, rc: %d\n", rc);
> > + return -rc;
> > }
> > for (i = 0; i < max_vcpus; i++)
> > libxl_bitmap_set(&cpumap, i);
> >
> > - if (libxl_set_vcpuonline(ctx, domid, &cpumap) < 0)
> > - fprintf(stderr, "libxl_set_vcpuonline failed domid=%d max_vcpus=%d\n", domid, max_vcpus);
> > + rc = libxl_set_vcpuonline(ctx, domid, &cpumap);
> > + if (rc)
> > + fprintf(stderr, "libxl_set_vcpuonline failed domid=%d max_vcpus=%d, rc: %d\n", domid, max_vcpus, rc);
> >
> > libxl_bitmap_dispose(&cpumap);
> > + return rc ? -rc : 0;
> > }
> >
> > int main_vcpuset(int argc, char **argv)
> > @@ -5070,8 +5074,7 @@ int main_vcpuset(int argc, char **argv)
> > break;
> > }
> >
> > - vcpuset(find_domain(argv[optind]), argv[optind + 1], check_host);
> > - return 0;
> > + return vcpuset(find_domain(argv[optind]), argv[optind + 1], check_host);
> > }
> >
> > static void output_xeninfo(void)
>
next prev parent reply other threads:[~2015-03-18 13:08 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-13 20:26 [PATCH v2] Fix xl vcpu-set to decrease amount of vCPUS without warnining Konrad Rzeszutek Wilk
2015-03-13 20:26 ` [PATCH v2 1/5] libxl: Add ERROR_NOTFOUND for libxl_domain_info when it cannot find the domain Konrad Rzeszutek Wilk
2015-03-18 13:03 ` Ian Campbell
2015-03-13 20:26 ` [PATCH v2 2/5] libxl: vcpuset: Return error values Konrad Rzeszutek Wilk
2015-03-18 13:06 ` Ian Campbell
2015-03-18 13:08 ` Ian Campbell [this message]
2015-03-18 14:09 ` Dario Faggioli
2015-03-18 14:15 ` Konrad Rzeszutek Wilk
2015-03-18 13:37 ` Konrad Rzeszutek Wilk
2015-03-13 20:26 ` [PATCH v2 3/5] libxl: vcpuset: Check max_vcpus argument against the maximum number of vCPUs the guest has set Konrad Rzeszutek Wilk
2015-03-18 13:11 ` Ian Campbell
2015-03-13 20:26 ` [PATCH v2 4/5] libxl: vcpuset: Remove useless limit on max_vcpus Konrad Rzeszutek Wilk
2015-03-18 13:13 ` Ian Campbell
2015-03-13 20:26 ` [PATCH v2 5/5] libxl: vcpu-set - allow to decrease vcpu count on overcommitted guests (v3) Konrad Rzeszutek Wilk
2015-03-18 13:15 ` Ian Campbell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1426684085.14291.15.camel@citrix.com \
--to=ian.campbell@citrix.com \
--cc=ian.jackson@eu.citrix.com \
--cc=konrad.wilk@oracle.com \
--cc=stefano.stabellini@eu.citrix.com \
--cc=wei.liu2@citrix.com \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.