From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Liu Subject: [PATCH 2/4] libxl: fix overly lines and delete extraneous quotes Date: Tue, 15 Sep 2015 10:41:42 +0100 Message-ID: <1442310104-23932-3-git-send-email-wei.liu2@citrix.com> References: <1442310104-23932-1-git-send-email-wei.liu2@citrix.com> 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 1ZbmkH-0006zk-If for xen-devel@lists.xenproject.org; Tue, 15 Sep 2015 09:41:49 +0000 In-Reply-To: <1442310104-23932-1-git-send-email-wei.liu2@citrix.com> 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: Wei Liu , Ian Jackson , Ian Campbell List-Id: xen-devel@lists.xenproject.org Signed-off-by: Wei Liu --- tools/libxl/libxl.c | 21 +++++++++++++-------- tools/libxl/libxl_utils.c | 8 ++++++-- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index ce8965d..9b2047f 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -420,14 +420,14 @@ int libxl__domain_rename(libxl__gc *gc, uint32_t domid, if (rc == ERROR_INVAL) { /* no such domain, good */ } else if (rc != 0) { - LOG(ERROR, "unexpected error""checking for existing domain"); + LOG(ERROR, "unexpected error checking for existing domain"); goto x_rc; } else if (domid_e == domid) { /* domain already has this name, ok (but we do still * need the rest of the code as we may need to check * old_name, for example). */ } else { - LOG(ERROR, "domain with name \"%s\""" already exists.", new_name); + LOG(ERROR, "domain with name \"%s\" already exists.", new_name); rc = ERROR_INVAL; goto x_rc; } @@ -437,14 +437,15 @@ int libxl__domain_rename(libxl__gc *gc, uint32_t domid, got_old_name = xs_read(ctx->xsh, trans, name_path, &got_old_len); if (!got_old_name) { LOGEV(ERROR, errno, - "check old name"" for domain %"PRIu32" allegedly named `%s'", + "check old name for domain %"PRIu32" allegedly named `%s'", domid, old_name); goto x_fail; } if (strcmp(old_name, got_old_name)) { LOG(ERROR, - "domain %"PRIu32" allegedly named ""`%s' is actually named `%s' - racing ?", + "domain %"PRIu32" allegedly named " + "`%s' is actually named `%s' - racing ?", domid, old_name, got_old_name); @@ -456,7 +457,8 @@ int libxl__domain_rename(libxl__gc *gc, uint32_t domid, if (!xs_write(ctx->xsh, trans, name_path, new_name, strlen(new_name))) { LOG(ERROR, - "failed to write new name `%s'"" for domain %"PRIu32" previously named `%s'", + "failed to write new name `%s'" + " for domain %"PRIu32" previously named `%s'", new_name, domid, old_name); @@ -489,14 +491,16 @@ int libxl__domain_rename(libxl__gc *gc, uint32_t domid, trans = our_trans = 0; if (errno != EAGAIN) { LOG(ERROR, - "failed to commit new name `%s'"" for domain %"PRIu32" previously named `%s'", + "failed to commit new name `%s'" + " for domain %"PRIu32" previously named `%s'", new_name, domid, old_name); goto x_fail; } LOG(DEBUG, - "need to retry rename transaction"" for domain %"PRIu32" (name_path=\"%s\", new_name=\"%s\")", + "need to retry rename transaction" + " for domain %"PRIu32" (name_path=\"%s\", new_name=\"%s\")", domid, name_path, new_name); @@ -4784,7 +4788,8 @@ retry_transaction: new_target_memkb = target_memkb - videoram; if (new_target_memkb > memorykb) { LOG(ERROR, - "memory_dynamic_max must be less than or equal to"" memory_static_max\n"); + "memory_dynamic_max must be less than or equal to" + " memory_static_max\n"); abort_transaction = 1; goto out; } diff --git a/tools/libxl/libxl_utils.c b/tools/libxl/libxl_utils.c index e5385fb..e84bdf5 100644 --- a/tools/libxl/libxl_utils.c +++ b/tools/libxl/libxl_utils.c @@ -409,13 +409,17 @@ int libxl_read_file_contents(libxl_ctx *ctx, const char *filename, if (got == -1) { \ if (errno == EINTR) continue; \ if (!ctx) { GC_FREE; return errno; } \ - LOGE(ERROR, "failed to "#rw" %s%s%s", what ? what : "", what ? " from " : "", source); \ + LOGE(ERROR, "failed to "#rw" %s%s%s", \ + what ? what : "", what ? " from " : "", source); \ GC_FREE; \ return errno; \ } \ if (got == 0) { \ if (!ctx) { GC_FREE; return EPROTO; } \ - LOG(ERROR, zero_is_eof ? "file/stream truncated reading %s%s%s" : "file/stream write returned 0! writing %s%s%s", what ? what : "", what ? " from " : "", source); \ + LOG(ERROR, zero_is_eof \ + ? "file/stream truncated reading %s%s%s" \ + : "file/stream write returned 0! writing %s%s%s", \ + what ? what : "", what ? " from " : "", source); \ GC_FREE; \ return EPROTO; \ } \ -- 2.1.4