summary refs log tree commit diff stats
path: root/hw
diff options
context:
space:
mode:
authorAlexey Kardashevskiy <aik@ozlabs.ru>2014-02-04 15:04:16 +1100
committerAlexander Graf <agraf@suse.de>2014-03-05 03:06:46 +0100
commit133e70ee8831992e309f74c20084bc50e3bcf8e0 (patch)
tree52f534d62d614e7a4c950897d860b550740add3e /hw
parenteb1e7c3e514665bb948357ef39845efd9af29de1 (diff)
downloadfocaccia-qemu-133e70ee8831992e309f74c20084bc50e3bcf8e0.tar.gz
focaccia-qemu-133e70ee8831992e309f74c20084bc50e3bcf8e0.zip
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>
Diffstat (limited to 'hw')
-rw-r--r--hw/ppc/spapr.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 5b21562ca5..851ce4b97a 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);