From patchwork Mon Oct 17 00:16:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ronald Rojas X-Patchwork-Id: 9378355 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 82549607FD for ; Mon, 17 Oct 2016 00:19:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 53B9728DED for ; Mon, 17 Oct 2016 00:19:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 30BC528DF8; Mon, 17 Oct 2016 00:19:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.6 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 61E4028DED for ; Mon, 17 Oct 2016 00:19:55 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bvvc7-0001X0-91; Mon, 17 Oct 2016 00:17:11 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bvvc5-0001Wu-FO for xen-devel@lists.xen.org; Mon, 17 Oct 2016 00:17:09 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id 1F/0F-10540-48814085; Mon, 17 Oct 2016 00:17:08 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupjkeJIrShJLcpLzFFi42K5GHrjsG6LBEu EweTdTBZLPi5mcWD0OLr7N1MAYxRrZl5SfkUCa8avJdOZChZrVpyfuJu1gbFNvouRi0NIYCKj xNcrn1lAHBaBSywS23f3MIE4EgLvWCTmrb/F2MXICeTESOyc8J0Fwq6SuPLmKSuILSSgJLHx5 jJ2iFFTmCQOrvvADJJgE9CQePvpL1iRiECGxIW9p8HizAJqEude7WECsYUFTCVWbu0Fi7MIqE r8a/sLNIiDg1fASeLeHQWIXXISN891Mk9g5FvAyLCKUaM4tagstUjX0EIvqSgzPaMkNzEzR9f QwFgvN7W4ODE9NScxqVgvOT93EyMwVOoZGBh3MP4+7XmIUZKDSUmUt8CdOUKILyk/pTIjsTgj vqg0J7X4EKMMB4eSBC8rMPSEBItS01Mr0jJzgEELk5bg4FES4Z0hDpTmLS5IzC3OTIdInWI05 tjy+9paJo5tU++tZRJiycvPS5US550NUioAUppRmgc3CBZNlxhlpYR5GRkYGIR4ClKLcjNLUO VfMYpzMCoJ86qBTOHJzCuB2/cK6BQmoFM+tDGAnFKSiJCSamCsuuL7NcJZ5q1229kXdg3PDgu nHmfRzZ/Y/Jqz99Ed7fr/spIaczI38ax6wpOwj8M8m3GKy93n5e9KpO1lp0yetElD+Lx+k+FO l2NpPCnPWpsD9Ddei0rcXDqR/5l/qPCyl6+5pr16HlfRaTO9+6NMw5+dU5tOCpxQXbVdounbd G9Va2OmjypKLMUZiYZazEXFiQBHk67zoQIAAA== X-Env-Sender: ronladred@gmail.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1476663427!63189290!1 X-Originating-IP: [209.85.216.195] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.84; banners=-,-,- X-VirusChecked: Checked Received: (qmail 48931 invoked from network); 17 Oct 2016 00:17:07 -0000 Received: from mail-qt0-f195.google.com (HELO mail-qt0-f195.google.com) (209.85.216.195) by server-5.tower-31.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 17 Oct 2016 00:17:07 -0000 Received: by mail-qt0-f195.google.com with SMTP id y38so5666052qta.3 for ; Sun, 16 Oct 2016 17:17:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=wiIzclRAnVNxiJSRQhzy6TbgUquzbPJbQUuWh+YzV94=; b=C0n2f1P7AAFwjD5wxjb7/2vYUAFnS0G7xZFu5Li0Z5C8wbyBxz6p2/twXbtJ+16ZAl WddcbWBeyChHtYSEE3KVOJrllk/d6KizXn0FK9FCUIlvAbNZI4dvh7Csjl7LJ7o7U//Y FfMD9koR3EPIx3Rg10AQCoxgKwhfoNB83yATdvpi+KWViJ/Ywxz9/Ww29EiRrNrO3Dgi 1/MTvM5MaNzhA6foMFozsybD2lJyLjB0yPq/y/o94pcxVqqCYx27OomAk2F+DDJmrIl2 e+DtN6FPAxiGmTMQ0U2jewaRduFIC5KiBvZ2fqdx1CxNXcL2Du6TBK6kxnORmmL1+tUT aDjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=wiIzclRAnVNxiJSRQhzy6TbgUquzbPJbQUuWh+YzV94=; b=BXU9O/E0iveAVLpBKdkboSYySzskjjDvzWZ7xKtrKu+xPWtikE0UE0h2vW6KpGJA68 YNoPIpWzVS0kDzle6so+QoGMWKqh3kMZ+O5/9iUur5Poie3Hn0CTHp7M3Dy/TkF5u3ib 0lpcmWSiwvHxY69sV1soFfBKW2a+hgiM0UvnkDx+9D95WXYuuliUGX9NaRxTK62WRCsy NNLy93ceiW3oyubU5GGgUH6aWy60zPUnmaKELRdmYlICnNv2TD0z22QdxnUfSdT1xaWG iJLHoCO2+Rw5+BDYj6XGL31BWL6I9qvixAeZc5+NbFYOGYJ8ez44NjgYFP4ubA1ACbXZ NKJw== X-Gm-Message-State: AA6/9RmAVqaLfwO0bUtwAFSMSzMOkObMLlhN0b3dHZ0u+cnHsPuaKQWz16VjsDmrWRS51g== X-Received: by 10.237.35.136 with SMTP id j8mr22673526qtc.117.1476663426662; Sun, 16 Oct 2016 17:17:06 -0700 (PDT) Received: from fedora (pool-173-77-250-23.nycmny.fios.verizon.net. [173.77.250.23]) by smtp.gmail.com with ESMTPSA id u39sm13652251qta.38.2016.10.16.17.17.05 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 16 Oct 2016 17:17:06 -0700 (PDT) From: Ronald Rojas To: xen-devel@lists.xen.org, ian.jackson@eu.citrix.com, wei.liu2@citrix.com, george.dunlap@citrix.com Date: Sun, 16 Oct 2016 20:16:32 -0400 Message-Id: <1476663392-4685-1-git-send-email-ronladred@gmail.com> X-Mailer: git-send-email 2.7.4 Cc: Ronald Rojas Subject: [Xen-devel] [PATCH] tools/xl: Use %u for uint32_t domids X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP domid is normally represented by uint32_t, but many format strings in xl_cmdimpl.c use %d when printing, which is signed. Use %u instead to print the unsigned integer domid. Signed-off-by: Ronald Rojas --- tools/libxl/xl_cmdimpl.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index cb43c00..b154e36 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -2674,7 +2674,7 @@ static int preserve_domain(uint32_t *r_domid, libxl_event *event, libxl_uuid_generate(&new_uuid); - LOG("Preserving domain %d %s with suffix%s", + LOG("Preserving domain %u %s with suffix%s", *r_domid, d_config->c_info.name, strtime); rc = libxl_domain_preserve(ctx, *r_domid, &d_config->c_info, strtime, new_uuid); @@ -2758,7 +2758,7 @@ static int domain_wait_event(uint32_t domid, libxl_event **event_r) for (;;) { ret = libxl_event_wait(ctx, event_r, LIBXL_EVENTMASK_ALL, 0,0); if (ret) { - LOG("Domain %d, failed to get event, quitting (rc=%d)", domid, ret); + LOG("Domain %u, failed to get event, quitting (rc=%d)", domid, ret); return ret; } if ((*event_r)->domid != domid) { @@ -3108,7 +3108,7 @@ start: } need_daemon = 0; } - LOG("Waiting for domain %s (domid %d) to die [pid %ld]", + LOG("Waiting for domain %s (domid %u) to die [pid %ld]", d_config.c_info.name, domid, (long)getpid()); ret = libxl_evenable_domain_death(ctx, domid, 0, &deathw); @@ -3134,7 +3134,7 @@ start: switch (event->type) { case LIBXL_EVENT_TYPE_DOMAIN_SHUTDOWN: - LOG("Domain %d has shut down, reason code %d 0x%x", domid, + LOG("Domain %u has shut down, reason code %d 0x%x", domid, event->u.domain_shutdown.shutdown_reason, event->u.domain_shutdown.shutdown_reason); switch (handle_domain_death(&domid, event, &d_config)) { @@ -3198,7 +3198,7 @@ start: } case LIBXL_EVENT_TYPE_DOMAIN_DEATH: - LOG("Domain %d has been destroyed.", domid); + LOG("Domain %u has been destroyed.", domid); libxl_event_free(ctx, event); ret = 0; goto out; @@ -3442,7 +3442,7 @@ static int set_memory_max(uint32_t domid, const char *mem) } if (libxl_domain_setmaxmem(ctx, domid, memorykb)) { - fprintf(stderr, "cannot set domid %d static max memory to : %s\n", domid, mem); + fprintf(stderr, "cannot set domid %u static max memory to : %s\n", domid, mem); return EXIT_FAILURE; } @@ -3476,7 +3476,7 @@ static int set_memory_target(uint32_t domid, const char *mem) } if (libxl_set_memory_target(ctx, domid, memorykb, 0, /* enforce */ 1)) { - fprintf(stderr, "cannot set domid %d dynamic max memory to : %s\n", domid, mem); + fprintf(stderr, "cannot set domid %u dynamic max memory to : %s\n", domid, mem); return EXIT_FAILURE; } @@ -4133,7 +4133,7 @@ static void shutdown_domain(uint32_t domid, { int rc; - fprintf(stderr, "Shutting down domain %d\n", domid); + fprintf(stderr, "Shutting down domain %u\n", domid); rc=libxl_domain_shutdown(ctx, domid); if (rc == ERROR_NOPARAVIRT) { if (fallback_trigger) { @@ -4165,7 +4165,7 @@ static void reboot_domain(uint32_t domid, libxl_evgen_domain_death **deathw, { int rc; - fprintf(stderr, "Rebooting domain %d\n", domid); + fprintf(stderr, "Rebooting domain %u\n", domid); rc=libxl_domain_reboot(ctx, domid); if (rc == ERROR_NOPARAVIRT) { if (fallback_trigger) { @@ -5625,7 +5625,7 @@ int main_config_update(int argc, char **argv) printf_info(default_output_format, -1, &d_config, stdout); if (!dryrun_only) { - fprintf(stderr, "setting dom%d configuration\n", domid); + fprintf(stderr, "setting dom%u configuration\n", domid); rc = libxl_userdata_store(ctx, domid, "xl", config_data, config_len); if (rc) { @@ -5951,7 +5951,7 @@ static int vcpuset(uint32_t domid, const char* nr_vcpus, int check_host) if (rc == ERROR_DOMAIN_NOTFOUND) fprintf(stderr, "Domain %u does not exist.\n", domid); else if (rc) - fprintf(stderr, "libxl_set_vcpuonline failed domid=%d max_vcpus=%d," \ + fprintf(stderr, "libxl_set_vcpuonline failed domid=%u max_vcpus=%d," \ " rc: %d\n", domid, max_vcpus, rc); libxl_bitmap_dispose(&cpumap); @@ -7113,7 +7113,7 @@ int main_domid(int argc, char **argv) return EXIT_FAILURE; } - printf("%d\n", domid); + printf("%u\n", domid); return EXIT_SUCCESS; } @@ -7138,7 +7138,7 @@ int main_domname(int argc, char **argv) domname = libxl_domid_to_name(ctx, domid); if (!domname) { - fprintf(stderr, "Can't get domain name of domain id '%d', maybe this domain does not exist.\n", domid); + fprintf(stderr, "Can't get domain name of domain id '%u', maybe this domain does not exist.\n", domid); return EXIT_FAILURE; }