From: Alexey Kardashevskiy <aik@ozlabs.ru>
Date: Tue, 4 Feb 2014 04:04:16 +0000 (+1100)
Subject: spapr: support only ELF kernel images
X-Git-Tag: TizenStudio_2.0_p2.3.2~208^2~1017^2~56
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=133e70ee8831992e309f74c20084bc50e3bcf8e0;p=sdk%2Femulator%2Fqemu.git

spapr: support only ELF kernel images

Currently everybody uses ELF kernel images with "-kernel" option on
pseries machine but QEMU still tries to boot from an image even it
fails to recognize it is ELF. This produces undefined behaviour if
the user tries a kernel image compiled for another architecture.

This removes support of raw kernel images.

Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: Alexander Graf <agraf@suse.de>
---

diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 5b21562..851ce4b 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -1313,11 +1313,6 @@ static void ppc_spapr_init(QEMUMachineInitArgs *args)
             kernel_le = kernel_size > 0;
         }
         if (kernel_size < 0) {
-            kernel_size = load_image_targphys(kernel_filename,
-                                              KERNEL_LOAD_ADDR,
-                                              load_limit - KERNEL_LOAD_ADDR);
-        }
-        if (kernel_size < 0) {
             fprintf(stderr, "qemu: could not load kernel '%s'\n",
                     kernel_filename);
             exit(1);