From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:51063)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <pbonzini@redhat.com>) id 1V6yQA-0000sY-P6
	for qemu-devel@nongnu.org; Wed, 07 Aug 2013 03:44:43 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <pbonzini@redhat.com>) id 1V6yQ6-00039i-TL
	for qemu-devel@nongnu.org; Wed, 07 Aug 2013 03:44:38 -0400
Date: Wed, 7 Aug 2013 03:44:23 -0400 (EDT)
From: Paolo Bonzini <pbonzini@redhat.com>
Message-ID: <2105695087.10531203.1375861463223.JavaMail.root@redhat.com>
In-Reply-To: <CAG1x_oET1u3TMPu3r_zzd3ZXsTWQLiaM0zAc+RkHFCwvJjGOvg@mail.gmail.com>
References: <CAG1x_oET1u3TMPu3r_zzd3ZXsTWQLiaM0zAc+RkHFCwvJjGOvg@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH for-1.6] Bugfix for loading multiboot
	kernels
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Martijn van den Broek <martijn.vdbrk@gmail.com>
Cc: qemu-stable@nongnu.org, qemu-devel@nongnu.org, chouteau@adacore.com, agraf@suse.de



----- Original Message -----
> From: "Martijn van den Broek" <martijn.vdbrk@gmail.com>
> To: qemu-devel@nongnu.org
> Cc: chouteau@adacore.com, pbonzini@redhat.com, agraf@suse.de
> Sent: Tuesday, August 6, 2013 8:45:39 PM
> Subject: [PATCH] Bugfix for loading multiboot kernels
> 
> 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 <martijn.vdbrk@gmail.com>
> ---
>  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
> 

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>

and marking the patch for 1.5 and 1.6:

Cc: qemu-stable@nongnu.org

Paolo