From patchwork Thu Nov 1 16:29:24 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 196273 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 854662C00F3 for ; Fri, 2 Nov 2012 03:29:36 +1100 (EST) Received: from localhost ([::1]:53307 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTxeA-00074i-Km for incoming@patchwork.ozlabs.org; Thu, 01 Nov 2012 12:29:34 -0400 Received: from eggs.gnu.org ([208.118.235.92]:52283) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTxe2-000739-Jl for qemu-devel@nongnu.org; Thu, 01 Nov 2012 12:29:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TTxe1-0001DC-OY for qemu-devel@nongnu.org; Thu, 01 Nov 2012 12:29:26 -0400 Received: from mout.web.de ([212.227.17.11]:58130) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTxe1-0001Cz-EG; Thu, 01 Nov 2012 12:29:25 -0400 Received: from mchn199C.mchp.siemens.de ([95.157.56.37]) by smtp.web.de (mrweb001) with ESMTPSA (Nemesis) id 0M2unu-1TCqV02YYI-00sXxN; Thu, 01 Nov 2012 17:29:24 +0100 Message-ID: <5092A364.4040807@web.de> Date: Thu, 01 Nov 2012 17:29:24 +0100 From: Jan Kiszka User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 To: qemu-devel , qemu-trivial X-Enigmail-Version: 1.4.5 X-Provags-ID: V02:K0:h3HQlDI82SZMouv5QDQYfa6WINPVyndX9yzyqy6sLBU KxyK/xfJU/vj3HmnWLCKgs4finHvy+Et00ROP3jXLtf/kT0ZiF JvEDL4le3pagxeU1De38bisby1N3JeJCt8p2hmFtEibGyQivfP ZDLSPerixlARUl7qQNTcSaZhYIwbvAFO2OAJJroVHwsNjieuTA PhZGWXi9T1myCMPQ70ymQ== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 212.227.17.11 Subject: [Qemu-devel] [PATCH] pc: Drop redundant test for ROM memory region X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Jan Kiszka Just a few lines above, we already initialize rom_memory accordingly. Signed-off-by: Jan Kiszka --- hw/pc_piix.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/pc_piix.c b/hw/pc_piix.c index 85529b2..cfa839c 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -178,7 +178,7 @@ static void pc_init1(MemoryRegion *system_memory, fw_cfg = pc_memory_init(system_memory, kernel_filename, kernel_cmdline, initrd_filename, below_4g_mem_size, above_4g_mem_size, - pci_enabled ? rom_memory : system_memory, &ram_memory); + rom_memory, &ram_memory); } gsi_state = g_malloc0(sizeof(*gsi_state));