From patchwork Wed Jul 8 00:11:42 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [08/31] petitboot: Simplify kexec Date: Tue, 07 Jul 2009 14:11:42 -0000 From: Geoff Levand X-Patchwork-Id: 29550 Message-Id: <20090708001135.483781401@am.sony.com> To: Jeremy Kerr Cc: cbe-oss-dev@ozlabs.org Simplify the pb_run_kexec() routine. Signed-off-by: Geoff Levand --- ui/common/ui-system.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) --- a/ui/common/ui-system.c +++ b/ui/common/ui-system.c @@ -92,34 +92,34 @@ static int run_kexec_local(const char *l /** * pb_run_kexec - Run kexec with the supplied boot options. - * - * For the convenience of the user, tries to load both files before - * returning error. */ int pb_run_kexec(const struct pb_kexec_data *kd) { int result; - char *l_image; - char *l_initrd; + char *l_image = NULL; + char *l_initrd = NULL; pb_log("%s: image: '%s'\n", __func__, kd->image); pb_log("%s: initrd: '%s'\n", __func__, kd->initrd); pb_log("%s: args: '%s'\n", __func__, kd->args); - if (kd->image) + if (kd->image) { l_image = pb_load_file(NULL, kd->image); - else { - l_image = NULL; - pb_log("%s: error null image\n", __func__); + if (!l_image) + return -1; } - l_initrd = kd->initrd ? pb_load_file(NULL, kd->initrd) : NULL; + if (kd->initrd) { + l_initrd = pb_load_file(NULL, kd->initrd); + if (!l_initrd) + return -1; + } + + if (!l_image && !l_initrd) + return -1; - if (!l_image || (kd->initrd && !l_initrd)) - result = -1; - else - result = run_kexec_local(l_image, l_initrd, kd->args); + result = run_kexec_local(l_image, l_initrd, kd->args); talloc_free(l_image); talloc_free(l_initrd);