From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dario Faggioli Subject: [PATCH] xl: convert vcpuid to signed in main_vcpupin() Date: Wed, 20 Aug 2014 17:36:00 +0200 Message-ID: <20140820153600.20604.97575.stgit@Solace.lan> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XK7vh-0007us-8U for xen-devel@lists.xenproject.org; Wed, 20 Aug 2014 15:36:05 +0000 Received: by mail-we0-f181.google.com with SMTP id k48so8115850wev.12 for ; Wed, 20 Aug 2014 08:36:03 -0700 (PDT) List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel Cc: Ian Campbell , Ian Jackson List-Id: xen-devel@lists.xenproject.org No functional changes, it just looks more correct, considering that at some point in the function we assign -1 to it (and at some other later point we check for it to be -1), to signify 'all vcpus'. While at it, fix a coding style nit and improve error reporting. Signed-off-by: Dario Faggioli --- tools/libxl/xl_cmdimpl.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index f1c136a..a29a579 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -4601,8 +4601,9 @@ int main_vcpupin(int argc, char **argv) libxl_vcpuinfo *vcpuinfo; libxl_bitmap cpumap_hard, cpumap_soft;; libxl_bitmap *soft = &cpumap_soft, *hard = &cpumap_hard; - uint32_t vcpuid, domid; const char *vcpu, *hard_str, *soft_str; + uint32_t domid; + long vcpuid; char *endptr; int opt, nb_cpu, nb_vcpu, rc = -1; @@ -4619,10 +4620,10 @@ int main_vcpupin(int argc, char **argv) soft_str = (argc > optind+3) ? argv[optind+3] : NULL; /* Figure out with which vCPU we are dealing with */ - vcpuid = strtoul(vcpu, &endptr, 10); - if (vcpu == endptr) { + vcpuid = strtol(vcpu, &endptr, 10); + if (vcpu == endptr || vcpuid < 0) { if (strcmp(vcpu, "all")) { - fprintf(stderr, "Error: Invalid argument.\n"); + fprintf(stderr, "Error: Invalid argument %s as VCPU.\n", vcpu); goto out; } vcpuid = -1; @@ -4688,12 +4689,11 @@ int main_vcpupin(int argc, char **argv) if (vcpuid != -1) { if (libxl_set_vcpuaffinity(ctx, domid, vcpuid, hard, soft)) { - fprintf(stderr, "Could not set affinity for vcpu `%u'.\n", + fprintf(stderr, "Could not set affinity for vcpu `%ld'.\n", vcpuid); goto out; } - } - else { + } else { if (!(vcpuinfo = libxl_list_vcpu(ctx, domid, &nb_vcpu, &nb_cpu))) { fprintf(stderr, "libxl_list_vcpu failed.\n"); goto out;