From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=36384 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OFCWe-0007Im-PV for qemu-devel@nongnu.org; Thu, 20 May 2010 16:39:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OFCWI-0000hp-3e for qemu-devel@nongnu.org; Thu, 20 May 2010 16:39:07 -0400 Received: from mail-pw0-f45.google.com ([209.85.160.45]:43859) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OFCWH-0000hk-SE for qemu-devel@nongnu.org; Thu, 20 May 2010 16:39:06 -0400 Received: by pwj8 with SMTP id 8so112756pwj.4 for ; Thu, 20 May 2010 13:39:05 -0700 (PDT) MIME-Version: 1.0 In-Reply-To: <1274336044-28624-1-git-send-email-eduard.munteanu@linux360.ro> References: <1274336044-28624-1-git-send-email-eduard.munteanu@linux360.ro> From: Blue Swirl Date: Thu, 20 May 2010 20:38:44 +0000 Message-ID: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] Re: [PATCH] pc: fix segfault introduced by 3d53f5c36ff6 List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eduard - Gabriel Munteanu Cc: yamahata@valinux.co.jp, joro@8bytes.org, kraxel@redhat.com, kvm@vger.kernel.org, qemu-devel@nongnu.org Good catch. Thanks, applied. On Thu, May 20, 2010 at 6:14 AM, 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 > --- > =C2=A0hw/pc.c | =C2=A0 =C2=A04 ++-- > =C2=A01 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, > =C2=A0 =C2=A0 ram_addr_t ram_addr, bios_offset, option_rom_offset; > =C2=A0 =C2=A0 ram_addr_t below_4g_mem_size, above_4g_mem_size =3D 0; > =C2=A0 =C2=A0 int bios_size, isa_bios_size; > - =C2=A0 =C2=A0void **fw_cfg; > + =C2=A0 =C2=A0void *fw_cfg; > > =C2=A0 =C2=A0 if (ram_size >=3D 0xe0000000 ) { > =C2=A0 =C2=A0 =C2=A0 =C2=A0 above_4g_mem_size =3D ram_size - 0xe0000000; > @@ -905,7 +905,7 @@ void pc_memory_init(ram_addr_t ram_size, > =C2=A0 =C2=A0 rom_set_fw(fw_cfg); > > =C2=A0 =C2=A0 if (linux_boot) { > - =C2=A0 =C2=A0 =C2=A0 =C2=A0load_linux(*fw_cfg, kernel_filename, initrd_= filename, kernel_cmdline, below_4g_mem_size); > + =C2=A0 =C2=A0 =C2=A0 =C2=A0load_linux(fw_cfg, kernel_filename, initrd_f= ilename, kernel_cmdline, below_4g_mem_size); > =C2=A0 =C2=A0 } > > =C2=A0 =C2=A0 for (i =3D 0; i < nb_option_roms; i++) { > -- > 1.6.4.4 > >