From patchwork Thu May 20 06:14:04 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduard - Gabriel Munteanu X-Patchwork-Id: 101126 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o4K6EfPH020305 for ; Thu, 20 May 2010 06:14:41 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753836Ab0ETGOi (ORCPT ); Thu, 20 May 2010 02:14:38 -0400 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:from:to:cc:subject :date:message-id:x-mailer; bh=do2C9FN3ROnvhD59gBuZectV2psHNL48Pk4GbmWbHS0=; b=Fsso5dG1q1u19IQBH8W42oJFs3g7YK/mQHKgiRKTGzpkiY7mj1wxAeQ2yBYWFITQxT 24qXVpVHPTc5eCRNn8JdF4qCFQc7eW4i8DJlTvYw1cqGh63yjQTOCnD5qMb2j8rpDhkb /lRA9JCaHV0OatLy6RREU7WKlCVLZs7WZa9uM= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer; b=PdyHXYbnsi0e1WDAE4DoRLAr9KmOF9RTKOsZTXlLNe0l2guFXMvxTtJOcdolzmNLks E2jxq7yxm7I/QwByOLvYUyv9Rt2pR7sS5Ly7RB/KpFdQ9isHvr/KMeUjIZi2xQBheh1I oKoeqO+Y57v2w3yn3zqJKdDFF9hdmC4qXQnpA= Received: by 10.204.15.1 with SMTP id i1mr4792bka.207.1274336076505; Wed, 19 May 2010 23:14:36 -0700 (PDT) Received: from localhost.localdomain ([188.25.93.183]) by mx.google.com with ESMTPS id s17sm27504416bkd.16.2010.05.19.23.14.35 (version=SSLv3 cipher=RC4-MD5); Wed, 19 May 2010 23:14:36 -0700 (PDT) From: Eduard - Gabriel Munteanu To: blauwirbel@gmail.com Cc: kraxel@redhat.com, yamahata@valinux.co.jp, joro@8bytes.org, kvm@vger.kernel.org, qemu-devel@nongnu.org, 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> X-Mailer: git-send-email 1.6.4.4 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Thu, 20 May 2010 06:14:41 +0000 (UTC) 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++) {