From patchwork Mon Jul 29 05:08:11 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Aurelien Jarno X-Patchwork-Id: 262672 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 023292C010D for ; Mon, 29 Jul 2013 15:08:39 +1000 (EST) Received: from localhost ([::1]:35544 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3fhE-00006E-6L for incoming@patchwork.ozlabs.org; Mon, 29 Jul 2013 01:08:36 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33948) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3fh1-00005y-06 for qemu-devel@nongnu.org; Mon, 29 Jul 2013 01:08:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3fgz-0001eS-UA for qemu-devel@nongnu.org; Mon, 29 Jul 2013 01:08:22 -0400 Received: from hall.aurel32.net ([2001:470:1f0b:4a8::1]:56495) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3fgz-0001eN-N1 for qemu-devel@nongnu.org; Mon, 29 Jul 2013 01:08:21 -0400 Received: from [2001:470:d4ed:1:2db:dfff:fe14:52d] (helo=ohm.aurel32.net) by hall.aurel32.net with esmtpsa (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1V3fgx-0001Il-Jy; Mon, 29 Jul 2013 07:08:19 +0200 Received: from aurel32 by ohm.aurel32.net with local (Exim 4.80) (envelope-from ) id 1V3fgv-0001Y1-U1; Mon, 29 Jul 2013 07:08:17 +0200 From: Aurelien Jarno To: qemu-devel@nongnu.org Date: Mon, 29 Jul 2013 07:08:11 +0200 Message-Id: <1375074491-5905-1-git-send-email-aurelien@aurel32.net> X-Mailer: git-send-email 1.7.10.4 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:470:1f0b:4a8::1 Cc: Paul Burton , Leon Alrae , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Aurelien Jarno Subject: [Qemu-devel] [PATCH] mips_malta: fix copy of the 0x1fc00000 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Copy the whole 0x1fe000000 region into 0x1fc00000, independently of the loaded BIOS size. This fix the MIPS make check tests. Reported-by: Andreas Färber Cc: Paul Burton Cc: Leon Alrae Signed-off-by: Aurelien Jarno Tested-by: Andreas Färber --- hw/mips/mips_malta.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index 2dc66f7..1589b59 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -1036,9 +1036,9 @@ void mips_malta_init(QEMUMachineInitArgs *args) */ memory_region_init_ram(bios_copy, NULL, "bios.1fc", BIOS_SIZE); if (!rom_copy(memory_region_get_ram_ptr(bios_copy), - FLASH_ADDRESS, bios_size)) { + FLASH_ADDRESS, BIOS_SIZE)) { memcpy(memory_region_get_ram_ptr(bios_copy), - memory_region_get_ram_ptr(bios), bios_size); + memory_region_get_ram_ptr(bios), BIOS_SIZE); } memory_region_set_readonly(bios_copy, true); memory_region_add_subregion(system_memory, RESET_ADDRESS, bios_copy);