From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=54289 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OF0rT-00063q-1z
	for qemu-devel@nongnu.org; Thu, 20 May 2010 04:12:13 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <yamahata@valinux.co.jp>) id 1OF0rI-0000xt-1s
	for qemu-devel@nongnu.org; Thu, 20 May 2010 04:12:10 -0400
Received: from mail.valinux.co.jp ([210.128.90.3]:48923)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <yamahata@valinux.co.jp>) id 1OF0rH-0000x8-Ps
	for qemu-devel@nongnu.org; Thu, 20 May 2010 04:12:00 -0400
Date: Thu, 20 May 2010 17:08:40 +0900
From: Isaku Yamahata <yamahata@valinux.co.jp>
Subject: Re: [Qemu-devel] [PATCH] pc: fix segfault introduced by 3d53f5c36ff6
Message-ID: <20100520080839.GC14708@valinux.co.jp>
References: <1274336044-28624-1-git-send-email-eduard.munteanu@linux360.ro>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1274336044-28624-1-git-send-email-eduard.munteanu@linux360.ro>
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/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: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro>
Cc: blauwirbel@gmail.com, joro@8bytes.org, qemu-devel@nongnu.org, kvm@vger.kernel.org, kraxel@redhat.com

Thank you for fixing it. Probably I was too in hurry when rebasing the patches.

Acked-by: Isaku Yamahata <yamahata@valinux.co.jp>

On Thu, May 20, 2010 at 09:14:04AM +0300, Eduard - Gabriel Munteanu wrote:
> Commit 3d53f5c36ff6 introduced a segfault by erroneously making fw_cfg a
> 'void **' and passing it around in different ways.
> 
> Signed-off-by: Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro>
> ---
>  hw/pc.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/pc.c b/hw/pc.c
> index fee08c9..4a4a706 100644
> --- a/hw/pc.c
> +++ b/hw/pc.c
> @@ -822,7 +822,7 @@ void pc_memory_init(ram_addr_t ram_size,
>      ram_addr_t ram_addr, bios_offset, option_rom_offset;
>      ram_addr_t below_4g_mem_size, above_4g_mem_size = 0;
>      int bios_size, isa_bios_size;
> -    void **fw_cfg;
> +    void *fw_cfg;
>  
>      if (ram_size >= 0xe0000000 ) {
>          above_4g_mem_size = ram_size - 0xe0000000;
> @@ -905,7 +905,7 @@ void pc_memory_init(ram_addr_t ram_size,
>      rom_set_fw(fw_cfg);
>  
>      if (linux_boot) {
> -        load_linux(*fw_cfg, kernel_filename, initrd_filename, kernel_cmdline, below_4g_mem_size);
> +        load_linux(fw_cfg, kernel_filename, initrd_filename, kernel_cmdline, below_4g_mem_size);
>      }
>  
>      for (i = 0; i < nb_option_roms; i++) {
> -- 
> 1.6.4.4
> 
> 

-- 
yamahata