From patchwork Wed Jul 21 20:05:15 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: jschopp@austin.ibm.com X-Patchwork-Id: 59494 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 779B1B70BD for ; Thu, 22 Jul 2010 06:17:37 +1000 (EST) Received: from localhost ([127.0.0.1]:41936 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1ObfcS-0006L7-3e for incoming@patchwork.ozlabs.org; Wed, 21 Jul 2010 16:10:20 -0400 Received: from [140.186.70.92] (port=36339 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1ObfZI-0005QU-5V for qemu-devel@nongnu.org; Wed, 21 Jul 2010 16:07:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1ObfZE-0003pm-2R for qemu-devel@nongnu.org; Wed, 21 Jul 2010 16:07:01 -0400 Received: from e1.ny.us.ibm.com ([32.97.182.141]:43402) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1ObfZE-0003YO-0I for qemu-devel@nongnu.org; Wed, 21 Jul 2010 16:07:00 -0400 Received: from d01relay03.pok.ibm.com (d01relay03.pok.ibm.com [9.56.227.235]) by e1.ny.us.ibm.com (8.14.4/8.13.1) with ESMTP id o6LJxtdl020521 for ; Wed, 21 Jul 2010 15:59:55 -0400 Received: from d03av03.boulder.ibm.com (d03av03.boulder.ibm.com [9.17.195.169]) by d01relay03.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o6LK5N3k220680 for ; Wed, 21 Jul 2010 16:05:26 -0400 Received: from d03av03.boulder.ibm.com (loopback [127.0.0.1]) by d03av03.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id o6LK5LFv004187 for ; Wed, 21 Jul 2010 14:05:22 -0600 Received: from localhost.localdomain (sig-9-65-27-113.mts.ibm.com [9.65.27.113]) by d03av03.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id o6LK5Lx8004135; Wed, 21 Jul 2010 14:05:21 -0600 From: Joel Schopp To: qemu-devel@nongnu.org Date: Wed, 21 Jul 2010 15:05:15 -0500 Message-Id: <1279742717-10804-2-git-send-email-jschopp@austin.ibm.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1279742717-10804-1-git-send-email-jschopp@austin.ibm.com> References: <1279742717-10804-1-git-send-email-jschopp@austin.ibm.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) Cc: Joel Schopp Subject: [Qemu-devel] [PATCH 1/3] remove dead code from hw/loader.c 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 Removing dead code. Above we already continued when rom->addr + valuegreaterthan0 < addr so this condition is always false. Signed-off-by: Joel Schopp --- hw/loader.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/hw/loader.c b/hw/loader.c index 79a6f95..49ac1fa 100644 --- a/hw/loader.c +++ b/hw/loader.c @@ -733,11 +733,6 @@ int rom_copy(uint8_t *dest, target_phys_addr_t addr, size_t size) s = rom->data; l = rom->romsize; - if (rom->addr < addr) { - d = dest; - s += (addr - rom->addr); - l -= (addr - rom->addr); - } if ((d + l) > (dest + size)) { l = dest - d; }