From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37690) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W5qFS-0006uu-K5 for qemu-devel@nongnu.org; Wed, 22 Jan 2014 00:21:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W5qFI-0007XM-3J for qemu-devel@nongnu.org; Wed, 22 Jan 2014 00:21:10 -0500 Received: from e23smtp01.au.ibm.com ([202.81.31.143]:50786) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W5qFH-0007X0-A4 for qemu-devel@nongnu.org; Wed, 22 Jan 2014 00:21:00 -0500 Received: from /spool/local by e23smtp01.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 22 Jan 2014 15:20:49 +1000 From: Alexey Kardashevskiy Date: Wed, 22 Jan 2014 16:20:41 +1100 Message-Id: <1390368041-2184-5-git-send-email-aik@ozlabs.ru> In-Reply-To: <1390368041-2184-1-git-send-email-aik@ozlabs.ru> References: <1390368041-2184-1-git-send-email-aik@ozlabs.ru> Subject: [Qemu-devel] [PATCH 4/4] spapr: add more details error description of why load_elf() failed List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Alexey Kardashevskiy , Peter Maydell , qemu-ppc@nongnu.org, Alexander Graf This makes use of new error codes which load_elf() can return. Signed-off-by: Alexey Kardashevskiy --- hw/ppc/spapr.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 851ce4b..18a4872 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1306,15 +1306,26 @@ static void ppc_spapr_init(QEMUMachineInitArgs *args) kernel_size = load_elf(kernel_filename, translate_kernel_address, NULL, NULL, &lowaddr, NULL, 1, ELF_MACHINE, 0); - if (kernel_size < 0) { + if (kernel_size == ELF_LOAD_WRONG_ENDIAN) { kernel_size = load_elf(kernel_filename, translate_kernel_address, NULL, NULL, &lowaddr, NULL, 0, ELF_MACHINE, 0); kernel_le = kernel_size > 0; } if (kernel_size < 0) { - fprintf(stderr, "qemu: could not load kernel '%s'\n", - kernel_filename); + switch (kernel_size) { + case ELF_LOAD_WRONG_ARCH: + fprintf(stderr, "qemu: could not load kernel '%s' from incompatible arhitecture\n", + kernel_filename); + break; + case ELF_LOAD_NOT_ELF: + fprintf(stderr, "qemu: '%s' is not ELF\n", kernel_filename); + break; + default: + fprintf(stderr, "qemu: could not load kernel '%s'\n", + kernel_filename); + break; + } exit(1); } -- 1.8.4.rc4