From patchwork Mon Apr 23 14:48:31 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artyom Tarasenko X-Patchwork-Id: 154466 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 130EFB6FC3 for ; Tue, 24 Apr 2012 00:50:14 +1000 (EST) Received: from localhost ([::1]:33892 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SMKai-0004Jn-02 for incoming@patchwork.ozlabs.org; Mon, 23 Apr 2012 10:50:12 -0400 Received: from eggs.gnu.org ([208.118.235.92]:52843) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SMKaX-0004H0-Ts for qemu-devel@nongnu.org; Mon, 23 Apr 2012 10:50:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SMKaR-0001qi-Kj for qemu-devel@nongnu.org; Mon, 23 Apr 2012 10:50:01 -0400 Received: from mail-bk0-f45.google.com ([209.85.214.45]:57310) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SMKaR-0001n6-Az for qemu-devel@nongnu.org; Mon, 23 Apr 2012 10:49:55 -0400 Received: by bkty15 with SMTP id y15so529059bkt.4 for ; Mon, 23 Apr 2012 07:49:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=oRIWP/G6HOQfW+Ua2XiWRQv/tMYvhNB7WemMw7+pKvM=; b=eCat38XSh87AxwzVqKT7FrGzKPX6oKm9dVeswmqJ9oaGvZ+6LcSBlS2hhjixS1cF3a 3KBrdSoP3HtDGRfs0X2Co8Xgw9mdK1wJhTErFwUyVsEeCaA5KOGSKPtodFL+OvsRBGBa iPTko+sM5NKBswzynmCV2QfZDOweefG1+Rv77COgQt1Urllpy4sdlpi3/0iuDgdc/8/H QOdyPkGB+pDbmB3Nox3CGK5b+HBTSjId66+XETas+PRSIGX0lP4CBIUEunTPpShWYwt7 xbISYXSWbFJVMarElb30DCNxpSoN2G9+crkLqVV/sok5hMapov+Q8yzT5YJeu5MGyyzH dneQ== Received: by 10.204.151.81 with SMTP id b17mr5075869bkw.17.1335192592281; Mon, 23 Apr 2012 07:49:52 -0700 (PDT) Received: from localhost (e180188168.adsl.alicedsl.de. [85.180.188.168]) by mx.google.com with ESMTPS id c4sm25705163bkh.0.2012.04.23.07.49.50 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 23 Apr 2012 07:49:50 -0700 (PDT) From: Artyom Tarasenko To: qemu-devel@nongnu.org Date: Mon, 23 Apr 2012 16:48:31 +0200 Message-Id: <680819a0427eb4e47b78c2b7c48a699d199745c6.1335191489.git.atar4qemu@gmail.com> X-Mailer: git-send-email 1.7.1 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.214.45 Cc: blauwirbel@gmail.com, Artyom Tarasenko Subject: [Qemu-devel] [PATCH] fix BCD mask for date (Solaris 2.5 guest hang fix) 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 Fix BCD mask for date. The most visible effect of this patch is Solaris 2.5.1 doesn't hang at boot if the day of month is >21. Signed-off-by: Artyom Tarasenko --- hw/m48t59.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/m48t59.c b/hw/m48t59.c index 60bbb00..0c50f45 100644 --- a/hw/m48t59.c +++ b/hw/m48t59.c @@ -239,7 +239,7 @@ void m48t59_write (void *opaque, uint32_t addr, uint32_t val) break; case 0x1FF5: /* alarm date */ - tmp = from_bcd(val & 0x1F); + tmp = from_bcd(val & 0x3F); if (tmp != 0) { NVRAM->alarm.tm_mday = tmp; NVRAM->buffer[0x1FF5] = val; @@ -310,8 +310,8 @@ void m48t59_write (void *opaque, uint32_t addr, uint32_t val) break; case 0x1FFD: case 0x07FD: - /* date */ - tmp = from_bcd(val & 0x1F); + /* date (BCD) */ + tmp = from_bcd(val & 0x3F); if (tmp != 0) { get_time(NVRAM, &tm); tm.tm_mday = tmp;