]> xenbits.xensource.com Git - qemu-upstream-4.6-testing.git/commitdiff
spapr: support only ELF kernel images
authorAlexey Kardashevskiy <aik@ozlabs.ru>
Tue, 4 Feb 2014 04:04:16 +0000 (15:04 +1100)
committerAlexander Graf <agraf@suse.de>
Wed, 5 Mar 2014 02:06:46 +0000 (03:06 +0100)
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>
hw/ppc/spapr.c

index 5b21562ca5b943ce84ecaaca57306825c2f56782..851ce4b97a71b7297be97ba41e59898d86d79bad 100644 (file)
@@ -1312,11 +1312,6 @@ static void ppc_spapr_init(QEMUMachineInitArgs *args)
                                    NULL, &lowaddr, NULL, 0, ELF_MACHINE, 0);
             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);