From nobody Tue Feb 10 00:59:12 2026 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; dkim=fail; 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 ARC-Seal: i=1; a=rsa-sha256; t=1558500566; cv=none; d=zoho.com; s=zohoarc; b=bkzCHtZl+KnDqZGjkcWxUrbm8PVPEzcHFzfy1EN9Celt/kjgxNtO+iA/1oJBSoBoe1j6+Q2DZSlE/r1l1TT0OjTTSfGw8oh+rFNZv5j+XEa16m1n+GGyFsJxKZyA9YmA/FrL8SuzIlk6zExOKZuMNc4OSDAGqtaIUofqA4q0pD0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558500566; 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=pIJ09CJD0v0BZ2VtQOW8gEBxBrbpOAEQulmHydvdfeI=; b=iUCyOcUJ8Jc8etnl3KLx/0WAhTDaxqN6jcHsCUglfCraekVjlfNy+OCW+92fL0Ca7cqeSrF3mdrcmGZK5QhVPmOyQ9c6dVcAZbMTa1Nayqqo3MjpX8D95lhlkq4Cw+vIbRloISog9y+6owcXH1mBXZcbHmb5jcG76yUC+e6+oAA= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; 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 Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1558500566700379.5703785843848; Tue, 21 May 2019 21:49:26 -0700 (PDT) Received: from localhost ([127.0.0.1]:35724 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTJBl-0005Il-Mv for importer@patchew.org; Wed, 22 May 2019 00:49:17 -0400 Received: from eggs.gnu.org ([209.51.188.92]:47112) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTJ8p-0003Ls-L7 for qemu-devel@nongnu.org; Wed, 22 May 2019 00:46:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hTJ8o-0006a7-Ki for qemu-devel@nongnu.org; Wed, 22 May 2019 00:46:15 -0400 Received: from ozlabs.org ([203.11.71.1]:33513) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hTJ8l-0006Wg-6c; Wed, 22 May 2019 00:46:13 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 4580Ss5xgKz9sNK; Wed, 22 May 2019 14:46:05 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1558500365; bh=wYkYWuH7ycMxiKGkoDj9ZRZOWZRg8x2Va/UMRnZg9lM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kDEYQ+i/kQz9ocszrRtmGeEs32S4bipHDkSb1Yrb++5yUJYSraK+9OxDwPowLuVa3 DdPhkvDHblijISKgYQFZdNKWkSThTUKvqAFke6FvJtN1HizSixv2TUEvI0GyS9n77F Kd1RvXhc1DM072mAwoWGyl0kGp0NIEXI15FOu4AU= From: David Gibson To: peter.maydell@linaro.org Date: Wed, 22 May 2019 14:45:27 +1000 Message-Id: <20190522044600.16534-6-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190522044600.16534-1-david@gibson.dropbear.id.au> References: <20190522044600.16534-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 203.11.71.1 Subject: [Qemu-devel] [PULL 05/38] 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: lvivier@redhat.com, qemu-devel@nongnu.org, groug@kaod.org, qemu-ppc@nongnu.org, clg@kaod.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Philippe Mathieu-Daud=C3=A9 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 Message-Id: <20190505152839.18650-3-philmd@redhat.com> Signed-off-by: David Gibson --- 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 a5d67bc6d7..c08970b24a 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 ebee321148..7a0d311d43 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.21.0