[Qemu-devel] [PATCH] s390: remove boot image detection to fix boot with newer kernels

[Christian Borntraeger]

Alex,

Newer kernels will not always have a 0dd0 (basr 13,0) at address 0x10000.
(e.g. current linux-next). We must not rely on specific code at certain
addresses, so lets just remove this check.

Reported-by: Philipp Muens <address@hidden>
Signed-off-by: Christian Borntraeger <address@hidden>

---
 hw/s390-virtio.c |    5 -----
 1 file changed, 5 deletions(-)

Index: b/hw/s390-virtio.c
===================================================================
--- a/hw/s390-virtio.c
+++ b/hw/s390-virtio.c
@@ -193,11 +193,6 @@ static void s390_init(ram_addr_t my_ram_
     if (kernel_filename) {
         kernel_size = load_image(kernel_filename, qemu_get_ram_ptr(0));
 
-        if (lduw_be_phys(KERN_IMAGE_START) != 0x0dd0) {
-            fprintf(stderr, "Specified image is not an s390 boot image\n");
-            exit(1);
-        }
-
         env->psw.addr = KERN_IMAGE_START;
         env->psw.mask = 0x0000000180000000ULL;
     } else {