From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eduard - Gabriel Munteanu Subject: [PATCH] pc: fix segfault introduced by 3d53f5c36ff6 Date: Thu, 20 May 2010 09:14:04 +0300 Message-ID: <1274336044-28624-1-git-send-email-eduard.munteanu@linux360.ro> Cc: kraxel@redhat.com, yamahata@valinux.co.jp, joro@8bytes.org, kvm@vger.kernel.org, qemu-devel@nongnu.org, Eduard - Gabriel Munteanu To: blauwirbel@gmail.com Return-path: Received: from mail-fx0-f46.google.com ([209.85.161.46]:58756 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753775Ab0ETGOi (ORCPT ); Thu, 20 May 2010 02:14:38 -0400 Received: by fxm10 with SMTP id 10so3126917fxm.19 for ; Wed, 19 May 2010 23:14:36 -0700 (PDT) Sender: kvm-owner@vger.kernel.org List-ID: 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