From: Andrew Cooper <andrew.cooper3@citrix.com>
To: Xen-devel <xen-devel@lists.xen.org>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>,
Ian Jackson <Ian.Jackson@eu.citrix.com>,
Ian Campbell <Ian.Campbell@citrix.com>,
Wei Liu <wei.liu2@citrix.com>
Subject: [PATCH] tools/libxl: Drop dead code following calls to libxl__exec()
Date: Thu, 19 Nov 2015 12:43:52 +0000 [thread overview]
Message-ID: <1447937032-29560-1-git-send-email-andrew.cooper3@citrix.com> (raw)
libxl__exec() doesn't ever return. Inform the compiler of this, and
remove all dead code.
No functional change.
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Ian Campbell <Ian.Campbell@citrix.com>
CC: Ian Jackson <Ian.Jackson@eu.citrix.com>
CC: Wei Liu <wei.liu2@citrix.com>
---
tools/libxl/libxl.c | 1 -
tools/libxl/libxl_aoutils.c | 2 --
tools/libxl/libxl_bootloader.c | 1 -
tools/libxl/libxl_internal.h | 2 +-
4 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c
index 854e957..6ad9e13 100644
--- a/tools/libxl/libxl.c
+++ b/tools/libxl/libxl.c
@@ -1983,7 +1983,6 @@ int libxl_vncviewer_exec(libxl_ctx *ctx, uint32_t domid, int autopass)
}
libxl__exec(gc, autopass_fd, -1, -1, args[0], args, NULL);
- abort();
x_fail:
GC_FREE;
diff --git a/tools/libxl/libxl_aoutils.c b/tools/libxl/libxl_aoutils.c
index d5fbc4d..9e493cd 100644
--- a/tools/libxl/libxl_aoutils.c
+++ b/tools/libxl/libxl_aoutils.c
@@ -603,8 +603,6 @@ int libxl__async_exec_start(libxl__async_exec_state *aes)
/* child */
libxl__exec(gc, aes->stdfds[0], aes->stdfds[1],
aes->stdfds[2], args[0], args, aes->env);
- /* notreached */
- abort();
}
return 0;
diff --git a/tools/libxl/libxl_bootloader.c b/tools/libxl/libxl_bootloader.c
index 95dde98..9caf212 100644
--- a/tools/libxl/libxl_bootloader.c
+++ b/tools/libxl/libxl_bootloader.c
@@ -556,7 +556,6 @@ static void bootloader_gotptys(libxl__egc *egc, libxl__openpty_state *op)
r = login_tty(libxl__carefd_fd(bl->ptys[0].slave));
if (r) { LOGE(ERROR, "login_tty failed"); exit(-1); }
libxl__exec(gc, -1, -1, -1, bl->args[0], (char **) bl->args, env);
- exit(-1);
}
/* parent */
diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h
index 590870a..58d07cd 100644
--- a/tools/libxl/libxl_internal.h
+++ b/tools/libxl/libxl_internal.h
@@ -1578,7 +1578,7 @@ _hidden int libxl__xenstore_child_wait_deprecated(libxl__gc *gc,
*/
_hidden void libxl__exec(libxl__gc *gc, int stdinfd, int stdoutfd,
int stderrfd, const char *arg0, char *const args[],
- char *const env[]);
+ char *const env[]) __attribute__((noreturn));
/* from xl_create */
--
2.1.4
next reply other threads:[~2015-11-19 12:43 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-19 12:43 Andrew Cooper [this message]
2015-11-24 16:52 ` [PATCH] tools/libxl: Drop dead code following calls to libxl__exec() 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=1447937032-29560-1-git-send-email-andrew.cooper3@citrix.com \
--to=andrew.cooper3@citrix.com \
--cc=Ian.Campbell@citrix.com \
--cc=Ian.Jackson@eu.citrix.com \
--cc=wei.liu2@citrix.com \
--cc=xen-devel@lists.xen.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).