From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:47424) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R0u2H-0008Gz-Bb for qemu-devel@nongnu.org; Tue, 06 Sep 2011 07:41:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R0u2G-0001qZ-8T for qemu-devel@nongnu.org; Tue, 06 Sep 2011 07:41:49 -0400 Received: from mtagate1.uk.ibm.com ([194.196.100.161]:52462) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R0u2G-0001my-0j for qemu-devel@nongnu.org; Tue, 06 Sep 2011 07:41:48 -0400 Received: from d06nrmr1806.portsmouth.uk.ibm.com (d06nrmr1806.portsmouth.uk.ibm.com [9.149.39.193]) by mtagate1.uk.ibm.com (8.13.1/8.13.1) with ESMTP id p86BffgY027650 for ; Tue, 6 Sep 2011 11:41:41 GMT Received: from d06av06.portsmouth.uk.ibm.com (d06av06.portsmouth.uk.ibm.com [9.149.37.217]) by d06nrmr1806.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p86BffAb2535486 for ; Tue, 6 Sep 2011 12:41:41 +0100 Received: from d06av06.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av06.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p86Bffum002166 for ; Tue, 6 Sep 2011 05:41:41 -0600 Message-ID: <4E6606F3.5020102@de.ibm.com> Date: Tue, 06 Sep 2011 13:41:39 +0200 From: Christian Borntraeger MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH] s390: remove boot image detection to fix boot with newer kernels List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: agraf@suse.de Cc: Carsten Otte , programming.philipp.muens@googlemail.com, "qemu-devel@nongnu.org" 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 Signed-off-by: Christian Borntraeger --- 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 {