From nobody Sat Nov 15 01:00:27 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1592255831; cv=none; d=zohomail.com; s=zohoarc; b=jBTCckmAzvoTn6ovgioRE1OtJ3A1AYAHiT6wTV4VSjRv3CxXnp6n7ymXu6iCmoghATAVhCEq08mpZp8qbelC6iat5L8tL89tC3PRYyJj/ZDnfOOhpJrH1LHoVzV4mwnm4+Myog3agAnEZhuWBhlPY6ehljGFCGRKTvN5Q45smZ4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592255831; 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; bh=xCBKmkLID7OXDyqd1kaeiBRGzfo6TyzYzDgQqoHhgvE=; b=kjrg1Po3DPgheg6fvFN9F4drpjCw6lufiDX4b31zcj0xi51nl708RsKt7Sf4ZJhCa1fqfUW9iCUD+5YPJPMJVGfQrmuJgUhaVo3uq2BBJJsT3tQIKZbUrAIUvB3HArXlPR8tjb7LBKCebEo5njrVnIxr75Lx+65q/ol9hq2WO44= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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; 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 1592255831060625.2601746569284; Mon, 15 Jun 2020 14:17:11 -0700 (PDT) Received: from localhost ([::1]:47304 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jkwTd-0005s2-Jy for importer@patchew.org; Mon, 15 Jun 2020 17:17:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34080) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jkvul-0003hZ-W2 for qemu-devel@nongnu.org; Mon, 15 Jun 2020 16:41:08 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:23287 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jkvuk-0000lF-AC for qemu-devel@nongnu.org; Mon, 15 Jun 2020 16:41:07 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-216-Zh049f4VMSGzY9s_YmEhcw-1; Mon, 15 Jun 2020 16:40:45 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0D860100CCC4 for ; Mon, 15 Jun 2020 20:40:45 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-121.ams2.redhat.com [10.36.112.121]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D33B390344; Mon, 15 Jun 2020 20:40:44 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 1766F1132B4F; Mon, 15 Jun 2020 22:40:09 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592253665; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xCBKmkLID7OXDyqd1kaeiBRGzfo6TyzYzDgQqoHhgvE=; b=dawvt73IboAa5VXRugCuAx9MFAoF71Ig4C+ak2GvLYC3QT1ZVhksfK3j9drQ0T3Y9E/z2Q sTmfntaPT5qHZy5EcR30hGo/phjWGOxytXZGgeHQV4yKinlXF9AJTPTPkMnm3o8Sxt61FQ YpyzQIpAy0m3CatHduwr2YJELc9S1hM= X-MC-Unique: Zh049f4VMSGzY9s_YmEhcw-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 66/84] microbit: Tidy up sysbus_init_child_obj() @child argument Date: Mon, 15 Jun 2020 22:39:50 +0200 Message-Id: <20200615204008.3069956-67-armbru@redhat.com> In-Reply-To: <20200615204008.3069956-1-armbru@redhat.com> References: <20200615204008.3069956-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=205.139.110.120; envelope-from=armbru@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/15 16:38:57 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The callers of sysbus_init_child_obj() commonly pass either &child, sizeof(child), or pchild, sizeof(*pchild). Tidy up two that don't, mostly to keep future commits simpler. Signed-off-by: Markus Armbruster Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Paolo Bonzini Message-Id: <20200610053247.1583243-41-armbru@redhat.com> --- hw/arm/microbit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/arm/microbit.c b/hw/arm/microbit.c index ef213695bd..72fab429c4 100644 --- a/hw/arm/microbit.c +++ b/hw/arm/microbit.c @@ -39,7 +39,7 @@ static void microbit_init(MachineState *machine) Object *soc =3D OBJECT(&s->nrf51); Object *i2c =3D OBJECT(&s->i2c); =20 - sysbus_init_child_obj(OBJECT(machine), "nrf51", soc, sizeof(s->nrf51), + sysbus_init_child_obj(OBJECT(machine), "nrf51", &s->nrf51, sizeof(s->n= rf51), TYPE_NRF51_SOC); qdev_prop_set_chr(DEVICE(&s->nrf51), "serial0", serial_hd(0)); object_property_set_link(soc, OBJECT(system_memory), "memory", @@ -51,7 +51,7 @@ static void microbit_init(MachineState *machine) * hack until we implement the nRF51 TWI controller properly and the * magnetometer/accelerometer devices. */ - sysbus_init_child_obj(OBJECT(machine), "microbit.twi", i2c, + sysbus_init_child_obj(OBJECT(machine), "microbit.twi", &s->i2c, sizeof(s->i2c), TYPE_MICROBIT_I2C); object_property_set_bool(i2c, true, "realized", &error_fatal); mr =3D sysbus_mmio_get_region(SYS_BUS_DEVICE(i2c), 0); --=20 2.26.2