From: Isaku Yamahata Subject: Re: [Qemu-devel] [PATCH] pc: fix segfault introduced by 3d53f5c36ff6 Date: Thu, 20 May 2010 17:08:40 +0900 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 Cc: blauwirbel@gmail.com, kvm@vger.kernel.org, joro@8bytes.org, qemu-devel@nongnu.org, kraxel@redhat.com To: Eduard - Gabriel Munteanu Return-path: Received: from mail.valinux.co.jp ([210.128.90.3]:32858 "EHLO mail.valinux.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754488Ab0ETIL4 (ORCPT ); Thu, 20 May 2010 04:11:56 -0400 Content-Disposition: inline In-Reply-To: <1274336044-28624-1-git-send-email-eduard.munteanu@linux360.ro> Sender: kvm-owner@vger.kernel.org List-ID: Thank you for fixing it. Probably I was too in hurry when rebasing the patches. Acked-by: Isaku Yamahata 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 > --- > 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