From patchwork Sat Oct 15 13:50:49 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Blue Swirl X-Patchwork-Id: 119972 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3CBA9B70FF for ; Sun, 16 Oct 2011 00:51:20 +1100 (EST) Received: from localhost ([::1]:58005 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RF4dx-0006Ha-FB for incoming@patchwork.ozlabs.org; Sat, 15 Oct 2011 09:51:17 -0400 Received: from eggs.gnu.org ([140.186.70.92]:38453) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RF4dq-0006HU-TE for qemu-devel@nongnu.org; Sat, 15 Oct 2011 09:51:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RF4dp-00084K-U6 for qemu-devel@nongnu.org; Sat, 15 Oct 2011 09:51:10 -0400 Received: from mail-gy0-f173.google.com ([209.85.160.173]:59106) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RF4dp-00084G-RS for qemu-devel@nongnu.org; Sat, 15 Oct 2011 09:51:09 -0400 Received: by gyg10 with SMTP id 10so2297773gyg.4 for ; Sat, 15 Oct 2011 06:51:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=mime-version:from:date:message-id:subject:to:content-type; bh=/OcAQ6KR+ALmPPXlYDyxmCsvfN5SMadpZQ9xZhrISwE=; b=vqfneH2QaAT7mJV+yvcfzp3U7y2fJPglvrYj+cjHU0waw0Y3mwG5iKLyGh2+LO+wgE h8QK9omCM44q8Kt1EBBDrmTBCIk9SFZy/iB3hcBuifpEcF4Fxs9LPqe6TccMLf94es/8 R7tACNAvokc8ZnMIA/ysapsn08hwUFCpjbZEg= Received: by 10.182.217.33 with SMTP id ov1mr7278518obc.26.1318686669226; Sat, 15 Oct 2011 06:51:09 -0700 (PDT) MIME-Version: 1.0 Received: by 10.182.121.8 with HTTP; Sat, 15 Oct 2011 06:50:49 -0700 (PDT) From: Blue Swirl Date: Sat, 15 Oct 2011 13:50:49 +0000 Message-ID: To: qemu-devel , Avi Kivity X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.160.173 Subject: [Qemu-devel] [PATCH 1/2] m48t59: drop obsolete address base arithmetic 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 Remove now incorrect address base arithmetic, missed by 9936d6e42392f1440505dfa9df065eabd251cadf. Fixes Sparc64 boot. Signed-off-by: Blue Swirl --- hw/m48t59.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) case 0: @@ -505,7 +504,6 @@ static uint32_t NVRAM_readb (void *opaque, uint32_t addr) M48t59State *NVRAM = opaque; uint32_t retval; - addr -= NVRAM->io_base; switch (addr) { case 3: retval = m48t59_read(NVRAM, NVRAM->addr); diff --git a/hw/m48t59.c b/hw/m48t59.c index f318e67..dba5796 100644 --- a/hw/m48t59.c +++ b/hw/m48t59.c @@ -480,7 +480,6 @@ static void NVRAM_writeb (void *opaque, uint32_t addr, uint32_t val) { M48t59State *NVRAM = opaque; - addr -= NVRAM->io_base; NVRAM_PRINTF("%s: 0x%08x => 0x%08x\n", __func__, addr, val); switch (addr) {