From nobody Sat May 4 04:03:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1557070264; cv=none; d=zoho.com; s=zohoarc; b=amZTHWgQFCGWtBZ2vPWzgXf5dDSL+auYNkLw4Jx9QIDDiqAmVplLlIs8TvIqIR+bpYCxiYonno0HT0wL+wFW1TfyUqgcqfq1f7O0422j/AArguHrIPuaNnnUdwfRko1GW4LU+B6/G4LoKqahQYYaON9sjXYFfqiBQzai72+yW+I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557070264; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=SGEOjNqayj2dF1sLNse7AU4902aNU8gYxpmAIiOEKqA=; b=c15m4sAGr3MRy0LsX0ocD/hyTFtZp+3svUBy4iEZ4y3Q3ATPGqSxmX0Hw1Qr6A3UQJ9JldCC7m/hwHLIC4KG9Ect8efjOcY4CKiGH6moOU2aroP6UeGPz0DQVM41/omyJ8RokjXuqY48d9vL/CDiHavIrM7mjdpnX6XvOFOsEY8= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1557070264702327.77487779290766; Sun, 5 May 2019 08:31:04 -0700 (PDT) Received: from localhost ([127.0.0.1]:42614 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hNJ6T-000150-LI for importer@patchew.org; Sun, 05 May 2019 11:31:01 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45831) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hNJ4T-0008Ll-Jp for qemu-devel@nongnu.org; Sun, 05 May 2019 11:28:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hNJ4S-0003QY-Nv for qemu-devel@nongnu.org; Sun, 05 May 2019 11:28:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56662) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hNJ4S-0003Q1-Hk; Sun, 05 May 2019 11:28:56 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9370036893; Sun, 5 May 2019 15:28:55 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-35.brq.redhat.com [10.40.204.35]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7F97A60C18; Sun, 5 May 2019 15:28:52 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Artyom Tarasenko , qemu-devel@nongnu.org, Mark Cave-Ayland Date: Sun, 5 May 2019 17:28:37 +0200 Message-Id: <20190505152839.18650-2-philmd@redhat.com> In-Reply-To: <20190505152839.18650-1-philmd@redhat.com> References: <20190505152839.18650-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Sun, 05 May 2019 15:28:55 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 1/3] hw/ppc/prep: use TYPE_MC146818_RTC instead of a hardcoded string X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-ppc@nongnu.org, "Michael S. Tsirkin" , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/ppc/prep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c index b7f459d4754..ebee3211480 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.c @@ -601,7 +601,7 @@ static int prep_set_cmos_checksum(DeviceState *dev, voi= d *opaque) uint16_t checksum =3D *(uint16_t *)opaque; ISADevice *rtc; =20 - if (object_dynamic_cast(OBJECT(dev), "mc146818rtc")) { + if (object_dynamic_cast(OBJECT(dev), TYPE_MC146818_RTC)) { rtc =3D ISA_DEVICE(dev); rtc_set_memory(rtc, 0x2e, checksum & 0xff); rtc_set_memory(rtc, 0x3e, checksum & 0xff); --=20 2.20.1 From nobody Sat May 4 04:03:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1557070410; cv=none; d=zoho.com; s=zohoarc; b=hW5I2YB3HrHiHHSv/5EtDiJvbEDZ3QnTYUTu/9LDIbydGxEqhE14bjzLKliZPd1erYCTSXOhJjUOECFZs/zYM98+7DuDpGKx12daRWt4bqOeqzrZrMLwgChN1Im28GMwPmjJinnA/AfBeV5ffZADuaFEBW4+72HMBoKn+BabVvI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557070410; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=848d22pZrKnwkZUgMMcpSos2MqguvxV3hf9yeKkWQ1w=; b=C/yg6pQUsJVe/aD/hhL2kFKKg+kPNbNUcu81Tfe7/HLbqdtq8mANfwgq9d1k3Nj2/qvz8y/x5oJzlR8XahInYDcrwcjUcLfUvFdlaEsnHxMNFbsQCOhXB0Ix1LobTcgMibKCGNlXzORFczCTxMHnUNPGX983YNEmAwRz7IJYVhM= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1557070410522767.8976786691561; Sun, 5 May 2019 08:33:30 -0700 (PDT) Received: from localhost ([127.0.0.1]:42636 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hNJ8i-0003Cl-IO for importer@patchew.org; Sun, 05 May 2019 11:33:20 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45859) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hNJ4W-0008OU-P2 for qemu-devel@nongnu.org; Sun, 05 May 2019 11:29:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hNJ4V-0003SZ-UG for qemu-devel@nongnu.org; Sun, 05 May 2019 11:29:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56684) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hNJ4V-0003S4-P9; Sun, 05 May 2019 11:28:59 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BA0F4356DB; Sun, 5 May 2019 15:28:58 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-35.brq.redhat.com [10.40.204.35]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0E38A60C18; Sun, 5 May 2019 15:28:55 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Artyom Tarasenko , qemu-devel@nongnu.org, Mark Cave-Ayland Date: Sun, 5 May 2019 17:28:38 +0200 Message-Id: <20190505152839.18650-3-philmd@redhat.com> In-Reply-To: <20190505152839.18650-1-philmd@redhat.com> References: <20190505152839.18650-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Sun, 05 May 2019 15:28:59 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 2/3] hw/ppc/40p: Move the MC146818 RTC to the board where it belongs X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-ppc@nongnu.org, "Michael S. Tsirkin" , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" The MC146818 RTC was incorrectly added to the i82378 chipset in commit a04ff940974a. In the next commit (506b7ddf8893) the PReP machine use the i82378. Since the MC146818 is specific to the PReP machine, move its use there. Fixes: a04ff940974a Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/isa/i82378.c | 4 ---- hw/ppc/prep.c | 3 +++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/hw/isa/i82378.c b/hw/isa/i82378.c index a5d67bc6d7a..c08970b24a2 100644 --- a/hw/isa/i82378.c +++ b/hw/isa/i82378.c @@ -21,7 +21,6 @@ #include "hw/pci/pci.h" #include "hw/i386/pc.h" #include "hw/timer/i8254.h" -#include "hw/timer/mc146818rtc.h" #include "hw/audio/pcspk.h" =20 #define TYPE_I82378 "i82378" @@ -105,9 +104,6 @@ static void i82378_realize(PCIDevice *pci, Error **errp) =20 /* 2 82C37 (dma) */ isa =3D isa_create_simple(isabus, "i82374"); - - /* timer */ - isa_create_simple(isabus, TYPE_MC146818_RTC); } =20 static void i82378_init(Object *obj) diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c index ebee3211480..7a0d311d43c 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.c @@ -675,6 +675,9 @@ static void ibm_40p_init(MachineState *machine) qdev_prop_set_uint32(dev, "ram-size", machine->ram_size); qdev_init_nofail(dev); =20 + /* RTC */ + isa_create_simple(isa_bus, TYPE_MC146818_RTC); + /* initialize CMOS checksums */ cmos_checksum =3D 0x6aa9; qbus_walk_children(BUS(isa_bus), prep_set_cmos_checksum, NULL, NULL, N= ULL, --=20 2.20.1 From nobody Sat May 4 04:03:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1557070323; cv=none; d=zoho.com; s=zohoarc; b=SdEUUlnQZ9Xi3EIrb65Jx06xhCnkXO4HETq/JI82C7SmwDTIvCClDsyqXS9s55VkXh2CEMchiPyr9fxu3O8icyhid8XUcSYBbqxZQPf4cvnLtQswLXmLVVeOdRt5nR17dwzGJ3I9Bfy0iMUVVkasMlgJiXiU1AV1YgIZ7GTO+yw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557070323; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=XO11N7JPTEbZadJdH/t4l1F46ImAIo9lQlfRdyfto7Q=; b=g8NdbctTHy2JcrZpZqqHy/ZlW35n+Hsu3HfFBDTTR5h2zH25UjxMII9J6OUBHgIvg14z9/kZ2h7GoqcPXz/VUlVC+M+oVtcHX1Hp9VAQzwuL2yDyxCxDjJWedqmrAU7/Llww1Mg55Gc0i/tKfVueeHS7diM7sIPf59tsrY8xAd0= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1557070323396975.0518261123094; Sun, 5 May 2019 08:32:03 -0700 (PDT) Received: from localhost ([127.0.0.1]:42616 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hNJ7Q-0002Aq-6X for importer@patchew.org; Sun, 05 May 2019 11:32:00 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45882) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hNJ4Z-0008Qs-MM for qemu-devel@nongnu.org; Sun, 05 May 2019 11:29:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hNJ4Y-0003UO-Qf for qemu-devel@nongnu.org; Sun, 05 May 2019 11:29:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57716) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hNJ4Y-0003Tx-LA; Sun, 05 May 2019 11:29:02 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EF34B30054AB; Sun, 5 May 2019 15:29:01 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-35.brq.redhat.com [10.40.204.35]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 68F9360C18; Sun, 5 May 2019 15:28:59 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Artyom Tarasenko , qemu-devel@nongnu.org, Mark Cave-Ayland Date: Sun, 5 May 2019 17:28:39 +0200 Message-Id: <20190505152839.18650-4-philmd@redhat.com> In-Reply-To: <20190505152839.18650-1-philmd@redhat.com> References: <20190505152839.18650-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Sun, 05 May 2019 15:29:02 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 3/3] hw/ppc/40p: use 1900 as a base year X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-ppc@nongnu.org, "Michael S. Tsirkin" , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Artyom Tarasenko AIX 5.1 expects the base year to be 1900. Adjust accordingly. Signed-off-by: Artyom Tarasenko Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/ppc/prep.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c index 7a0d311d43c..2a8009e20b4 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.c @@ -676,7 +676,9 @@ static void ibm_40p_init(MachineState *machine) qdev_init_nofail(dev); =20 /* RTC */ - isa_create_simple(isa_bus, TYPE_MC146818_RTC); + dev =3D DEVICE(isa_create(isa_bus, TYPE_MC146818_RTC)); + qdev_prop_set_int32(dev, "base_year", 1900); + qdev_init_nofail(dev); =20 /* initialize CMOS checksums */ cmos_checksum =3D 0x6aa9; --=20 2.20.1