From nobody Wed Oct 1 05:22:31 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.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 (zohomail.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=1583390484; cv=none; d=zohomail.com; s=zohoarc; b=XbPdXM40CGm7R2Gw6pGPYq/N06dJO8XKL23xB0XwztCfCuNVxf+a7HGpCxIWt7HOkhrhOOJO+z/4vMLi3jApPlrVliZLwABNNSZ7bErtpqWeM5JQargJAKZlKkZyZu89Ixv5seZwsCfyhwS8L2wwMh8w6TA53TO+/b8zlY1pEXs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583390484; h=Content-Type: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; bh=VHmTBUUzcwCjnHm+QiE14goAKu0vekIrlo6ayNZjIDY=; b=bXf/Iak9qboFvjMueQNi1UxkkCWxd66Zm/tleKovDoJ8voL39OkIvfsBSd2GWoY5SzbAEEssSMsOkXP0GHJkAzUbjT49VWtlw33LlNoGPf7VsZjurE1F+Jiv6+mj6t1KbRY3oEvKxLIJkjw8sX0tzNdGthAeKW77DrvBFezQFEE= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.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 (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1583390484821111.67803682429633; Wed, 4 Mar 2020 22:41:24 -0800 (PST) Received: from localhost ([::1]:43946 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9kCB-0007J1-Rp for importer@patchew.org; Thu, 05 Mar 2020 01:41:23 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60657) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9kAB-0003oJ-Vc for qemu-devel@nongnu.org; Thu, 05 Mar 2020 01:39:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j9kAA-0006Ww-Mk for qemu-devel@nongnu.org; Thu, 05 Mar 2020 01:39:19 -0500 Received: from szxga07-in.huawei.com ([45.249.212.35]:34374 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j9kAA-0006UO-BG for qemu-devel@nongnu.org; Thu, 05 Mar 2020 01:39:18 -0500 Received: from DGGEMS407-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 73CE7614AEAA49713910; Thu, 5 Mar 2020 14:39:15 +0800 (CST) Received: from localhost.huawei.com (10.175.104.216) by DGGEMS407-HUB.china.huawei.com (10.3.19.207) with Microsoft SMTP Server id 14.3.439.0; Thu, 5 Mar 2020 14:39:07 +0800 From: Pan Nengyuan To: Subject: [PATCH v4 2/3] mac_via: fix incorrect creation of mos6522 device in mac_via Date: Thu, 5 Mar 2020 14:54:21 +0800 Message-ID: <20200305065422.12707-3-pannengyuan@huawei.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20200305065422.12707-1-pannengyuan@huawei.com> References: <20200305065422.12707-1-pannengyuan@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.104.216] X-CFilter-Loop: Reflected X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 45.249.212.35 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, zhang.zhanghailiang@huawei.com, Pan Nengyuan , Mark Cave-Ayland , Laurent Vivier , euler.robot@huawei.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This patch fix a bug in mac_via where it failed to actually realize devices= it was using. And move the init codes which inits the mos6522 objects and properties on t= hem from realize() into init(). However, we keep qdev_set_parent_bus in realize(), otherwise i= t will cause device-introspect-test test fail. Then do the realize mos6522 device in the= mac_vir_realize. Signed-off-by: Pan Nengyuan --- Cc: Laurent Vivier Cc: Mark Cave-Ayland --- v4->v3: - split v3 into two patches, this patch fix incorrect creation of mos6522, = move inits and props from realize into init. The v3 is: https://patchwork.kernel.org/patch/11407635/ --- hw/misc/mac_via.c | 43 ++++++++++++++++++++++++++++++------------- 1 file changed, 30 insertions(+), 13 deletions(-) diff --git a/hw/misc/mac_via.c b/hw/misc/mac_via.c index b7d0012794..4c5ad08805 100644 --- a/hw/misc/mac_via.c +++ b/hw/misc/mac_via.c @@ -868,24 +868,24 @@ static void mac_via_reset(DeviceState *dev) static void mac_via_realize(DeviceState *dev, Error **errp) { MacVIAState *m =3D MAC_VIA(dev); - MOS6522State *ms; struct tm tm; int ret; + Error *err =3D NULL; =20 - /* Init VIAs 1 and 2 */ - sysbus_init_child_obj(OBJECT(dev), "via1", &m->mos6522_via1, - sizeof(m->mos6522_via1), TYPE_MOS6522_Q800_VIA1); + qdev_set_parent_bus(DEVICE(&m->mos6522_via1), sysbus_get_default()); + qdev_set_parent_bus(DEVICE(&m->mos6522_via2), sysbus_get_default()); =20 - sysbus_init_child_obj(OBJECT(dev), "via2", &m->mos6522_via2, - sizeof(m->mos6522_via2), TYPE_MOS6522_Q800_VIA2); + object_property_set_bool(OBJECT(&m->mos6522_via1), true, "realized", &= err); + if (err !=3D NULL) { + error_propagate(errp, err); + return; + } =20 - /* Pass through mos6522 output IRQs */ - ms =3D MOS6522(&m->mos6522_via1); - object_property_add_alias(OBJECT(dev), "irq[0]", OBJECT(ms), - SYSBUS_DEVICE_GPIO_IRQ "[0]", &error_abort); - ms =3D MOS6522(&m->mos6522_via2); - object_property_add_alias(OBJECT(dev), "irq[1]", OBJECT(ms), - SYSBUS_DEVICE_GPIO_IRQ "[0]", &error_abort); + object_property_set_bool(OBJECT(&m->mos6522_via2), true, "realized", &= err); + if (err !=3D NULL) { + error_propagate(errp, err); + return; + } =20 /* Pass through mos6522 input IRQs */ qdev_pass_gpios(DEVICE(&m->mos6522_via1), dev, "via1-irq"); @@ -932,6 +932,7 @@ static void mac_via_init(Object *obj) { SysBusDevice *sbd =3D SYS_BUS_DEVICE(obj); MacVIAState *m =3D MAC_VIA(obj); + MOS6522State *ms; =20 /* MMIO */ memory_region_init(&m->mmio, obj, "mac-via", 2 * VIA_SIZE); @@ -948,6 +949,22 @@ static void mac_via_init(Object *obj) /* ADB */ qbus_create_inplace((BusState *)&m->adb_bus, sizeof(m->adb_bus), TYPE_ADB_BUS, DEVICE(obj), "adb.0"); + + /* Init VIAs 1 and 2 */ + object_initialize_child(OBJECT(m), "via1", &m->mos6522_via1,=20 + sizeof(m->mos6522_via1), TYPE_MOS6522_Q800_VIA= 1, + &error_abort, NULL); + object_initialize_child(OBJECT(m), "via2", &m->mos6522_via2, + sizeof(m->mos6522_via2), TYPE_MOS6522_Q800_VIA= 2, + &error_abort, NULL); + + /* Pass through mos6522 output IRQs */ + ms =3D MOS6522(&m->mos6522_via1); + object_property_add_alias(OBJECT(m), "irq[0]", OBJECT(ms), + SYSBUS_DEVICE_GPIO_IRQ "[0]", &error_abort); + ms =3D MOS6522(&m->mos6522_via2); + object_property_add_alias(OBJECT(m), "irq[1]", OBJECT(ms), + SYSBUS_DEVICE_GPIO_IRQ "[0]", &error_abort); } =20 static void postload_update_cb(void *opaque, int running, RunState state) --=20 2.18.2