From patchwork Wed Feb 9 18:35:51 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aurelien Jarno X-Patchwork-Id: 82516 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 45A98B70E3 for ; Thu, 10 Feb 2011 05:42:22 +1100 (EST) Received: from localhost ([127.0.0.1]:45543 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PnEzc-00071X-0Y for incoming@patchwork.ozlabs.org; Wed, 09 Feb 2011 13:42:20 -0500 Received: from [140.186.70.92] (port=52699 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PnEtK-0004So-EM for qemu-devel@nongnu.org; Wed, 09 Feb 2011 13:35:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PnEtJ-0004Xy-2f for qemu-devel@nongnu.org; Wed, 09 Feb 2011 13:35:49 -0500 Received: from hall.aurel32.net ([88.191.126.93]:39955) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PnEtI-0004Xk-Ra for qemu-devel@nongnu.org; Wed, 09 Feb 2011 13:35:49 -0500 Received: from [2001:470:d4ed:0:5e26:aff:fe2b:6f5b] (helo=volta.aurel32.net) by hall.aurel32.net with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1PnEtI-0000wp-9A; Wed, 09 Feb 2011 19:35:48 +0100 Received: from aurel32 by volta.aurel32.net with local (Exim 4.72) (envelope-from ) id 1PnEtR-0001Dl-76; Wed, 09 Feb 2011 19:35:57 +0100 From: Aurelien Jarno To: qemu-devel@nongnu.org Date: Wed, 9 Feb 2011 19:35:51 +0100 Message-Id: <1297276551-4655-2-git-send-email-aurelien@aurel32.net> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1297276551-4655-1-git-send-email-aurelien@aurel32.net> References: <1297276551-4655-1-git-send-email-aurelien@aurel32.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 88.191.126.93 Cc: Aurelien Jarno Subject: [Qemu-devel] [PATCH 2/2] pc: remove test on TARGET_PHYS_ADDR_BITS == 32 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Both i386 and x86_64 targets are now using with target_phys_bits=64. Remove useless code. Signed-off-by: Aurelien Jarno --- hw/pc.c | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/hw/pc.c b/hw/pc.c index 4dfdc0b..92e3843 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -968,11 +968,6 @@ void pc_memory_init(ram_addr_t ram_size, *above_4g_mem_size_p = above_4g_mem_size; *below_4g_mem_size_p = below_4g_mem_size; -#if TARGET_PHYS_ADDR_BITS == 32 - if (above_4g_mem_size > 0) { - hw_error("To much RAM for 32-bit physical address"); - } -#endif linux_boot = (kernel_filename != NULL); /* allocate RAM */ @@ -982,12 +977,10 @@ void pc_memory_init(ram_addr_t ram_size, cpu_register_physical_memory(0x100000, below_4g_mem_size - 0x100000, ram_addr + 0x100000); -#if TARGET_PHYS_ADDR_BITS > 32 if (above_4g_mem_size > 0) { cpu_register_physical_memory(0x100000000ULL, above_4g_mem_size, ram_addr + below_4g_mem_size); } -#endif /* BIOS load */ if (bios_name == NULL)