From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50235) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V6mGO-0006ph-1a for qemu-devel@nongnu.org; Tue, 06 Aug 2013 14:45:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V6mGK-00034k-W6 for qemu-devel@nongnu.org; Tue, 06 Aug 2013 14:45:43 -0400 Received: from mail-oa0-x233.google.com ([2607:f8b0:4003:c02::233]:40178) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V6mGK-00034V-Nr for qemu-devel@nongnu.org; Tue, 06 Aug 2013 14:45:40 -0400 Received: by mail-oa0-f51.google.com with SMTP id h1so1510681oag.38 for ; Tue, 06 Aug 2013 11:45:39 -0700 (PDT) MIME-Version: 1.0 Date: Tue, 6 Aug 2013 20:45:39 +0200 Message-ID: From: Martijn van den Broek Content-Type: text/plain; charset=ISO-8859-1 Subject: [Qemu-devel] [PATCH] Bugfix for loading multiboot kernels List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, agraf@suse.de, chouteau@adacore.com This patch fixes a bug in rom_copy introduced by commit d60fa42e8bae39440f997ebfe8fe328269a57d16. rom_copy failed to load roms with a "datasize" of 0. As a result, multiboot kernels were not loaded correctly when they contain a segment with a "file size" of 0. https://bugs.launchpad.net/qemu/+bug/1208944 Signed-off-by: Martijn van den Broek --- hw/core/loader.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/hw/core/loader.c b/hw/core/loader.c index c3c28cf..6875b7e 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -814,9 +814,6 @@ int rom_copy(uint8_t *dest, hwaddr addr, size_t size) if (rom->addr > end) { break; } - if (!rom->data) { - continue; - } d = dest + (rom->addr - addr); s = rom->data; @@ -826,7 +823,9 @@ int rom_copy(uint8_t *dest, hwaddr addr, size_t size) l = dest - d; } - memcpy(d, s, l); + if (l > 0) { + memcpy(d, s, l); + } if (rom->romsize > rom->datasize) { /* If datasize is less than romsize, it means that we didn't -- 1.8.1.msysgit.1