From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:55392) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TU069-0007dw-ST for qemu-devel@nongnu.org; Thu, 01 Nov 2012 15:06:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TU068-0007Va-TV for qemu-devel@nongnu.org; Thu, 01 Nov 2012 15:06:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:21012) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TU068-0007VN-L2 for qemu-devel@nongnu.org; Thu, 01 Nov 2012 15:06:36 -0400 From: Stefan Hajnoczi Date: Thu, 1 Nov 2012 20:05:54 +0100 Message-Id: <1351796754-21703-16-git-send-email-stefanha@redhat.com> In-Reply-To: <1351796754-21703-1-git-send-email-stefanha@redhat.com> References: <1351796754-21703-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PATCH 9/9] pc: Drop redundant test for ROM memory region List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: Jan Kiszka , qemu-devel@nongnu.org, Stefan Hajnoczi From: Jan Kiszka Just a few lines above, we already initialize rom_memory accordingly. Signed-off-by: Jan Kiszka Signed-off-by: Stefan Hajnoczi --- hw/pc_piix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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)); -- 1.7.12.1