From nobody Tue Feb 10 11:12:43 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.218.68 as permitted sender) client-ip=209.85.218.68; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ej1-f68.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.218.68 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1599496394; cv=none; d=zohomail.com; s=zohoarc; b=gMMbTLdIskoirAAeIS1WLNY3eg0vtJe6Xo+ttK6IRim8Lk6o0cebtyZasbNCaP2OyDs/5Ux/5T8YaWnETcskUuP0hDaKEYSXg1+a9ybnQ89qsjT1e8W6GcxaPzSzJEyEEa0NnCk0L7Dqrd6ZlluUfW8W+o41ODMLew75MrDKj3U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599496394; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=39vGPecl12q7amHLWo3+1dhvTYjWZnqSb7DebE6TMyI=; b=Uw8M4eGySjN6zEyLDFxZ3QZXGHl0CBH/2KyMQls8oJ4Uroxm0jaWEQ3Kvn3MPOqhvHDXavFA08W45sQTuOFMk3nMmfSSN7dnTabpWMS90rczr35PuCGcEBvv1tjiqKPKa9uc0GKju6CxofDlXqTGlgfO+fXedEy5zTJCjW2wAYQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.218.68 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-ej1-f68.google.com (mail-ej1-f68.google.com [209.85.218.68]) by mx.zohomail.com with SMTPS id 1599496394426604.9521843474038; Mon, 7 Sep 2020 09:33:14 -0700 (PDT) Received: by mail-ej1-f68.google.com with SMTP id nw23so18925209ejb.4 for ; Mon, 07 Sep 2020 09:33:13 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (65.red-83-57-170.dynamicip.rima-tde.net. [83.57.170.65]) by smtp.gmail.com with ESMTPSA id u13sm15700199ejn.82.2020.09.07.09.33.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Sep 2020 09:33:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=39vGPecl12q7amHLWo3+1dhvTYjWZnqSb7DebE6TMyI=; b=c4ORQXt5p3mIsNygpyg8uGyXK2YdhgONePrYj9xNLEyo2y+IlL/DhZrcsR9aKI1A62 XpNHdReeRbZl+tnopgaVfG5JApL2ygDwLgrWz39hlj1MLRhjmeFxduRenhCB8enxLyi9 axXPgq9VWtqSfj52BAOxDmC8bnKLuir64hTNSMtP5inmjEQI1gdzHlCZby3SB6+RP94N 1ZUIwcx4Omyk6ZT87EABhnREynU00JGJlFvZ1YUxr7yXHC8rP+fYdznvHxoH2kwwVZhX Ywcvt2nX/b1dq6DoFAuOf1e/TRUdIb8bC4RjQk7q7hog4rvnrLKZoTUWlKmBWeXmxBC8 FIKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=39vGPecl12q7amHLWo3+1dhvTYjWZnqSb7DebE6TMyI=; b=PMsQBBs8y0PNqchfQ4HUFWsPmVjzHTODG6dNNBdpKjI7fswFuCMp3Rm+h8oiEVxVa3 o8zX/H5mOWeyVEsnaplMttZojaojiD2o23RgQjA2NhTVawGVwBn+nZO+U2dbWBNqgB0u 92JXT2SomHZr5dxLviEaokaWyVFycW/QTdKtnYRdoqzOFPC6KPZ6VcVW7LeZ2wSyXqbc 1IznhkfXAyjnLJ/T1u3FYGvQpwkkZQNmD60rsSwj+4W9wxCNTRKn0cg6IvumJ2N1qAhx qmE38swiKxTqof9nbEPBV6TEc3a9b1GrDATBwwIaJap59Ro2WCNHrTYtIDfGgtk6w05J L3Tg== X-Gm-Message-State: AOAM531AjTGUVHmsciMCFCfkszFg0OWm5is/MoCx02LQ2oi0MVIEa/Xz IUVhYNcMjJui/AIslTc6U9E= X-Google-Smtp-Source: ABdhPJxt1MMTkOVhjFJfnCIZZ7Uhj7zI8VlZiYK9WpwlPX97EA2DNAe9Tcvb3pTJLs8imJricYxiQA== X-Received: by 2002:a17:906:8d8:: with SMTP id o24mr21240332eje.384.1599496392492; Mon, 07 Sep 2020 09:33:12 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Andrzej Zaborowski , Peter Maydell , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Luc Michel , qemu-arm@nongnu.org, Andrew Jeffery , Joaquin de Andres , Joel Stanley , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Markus Armbruster Subject: [RFC PATCH v4 8/8] hw/arm/tosa: Make TYPE_TOSA_MISC_GPIO a plain QDev Date: Mon, 7 Sep 2020 18:32:57 +0200 Message-Id: <20200907163257.46527-9-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200907163257.46527-1-f4bug@amsat.org> References: <20200907163257.46527-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) TYPE_TOSA_MISC_GPIO doesn't need to be a SysBus device, make it a plain QDev. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- RFC because having to pass MachineState and call object_property_add_child() simply makes things more complex... but it seems to cleaner QOM design. Cc: Markus Armbruster --- hw/arm/tosa.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/hw/arm/tosa.c b/hw/arm/tosa.c index f23651fd775..524d5fcd10b 100644 --- a/hw/arm/tosa.c +++ b/hw/arm/tosa.c @@ -79,7 +79,7 @@ static void tosa_microdrive_attach(PXA2xxState *cpu) OBJECT_CHECK(TosaMiscGPIOState, (obj), TYPE_TOSA_MISC_GPIO) =20 typedef struct TosaMiscGPIOState { - SysBusDevice parent_obj; + DeviceState parent_obj; } TosaMiscGPIOState; =20 static void tosa_reset(void *opaque, int line, int level) @@ -96,7 +96,7 @@ static void tosa_misc_gpio_init(Object *obj) qdev_init_gpio_in_named(dev, tosa_reset, "reset", 1); } =20 -static void tosa_gpio_setup(PXA2xxState *cpu, +static void tosa_gpio_setup(MachineState *machine, PXA2xxState *cpu, DeviceState *scp0, DeviceState *scp1, TC6393xbState *tmio) @@ -104,7 +104,10 @@ static void tosa_gpio_setup(PXA2xxState *cpu, DeviceState *misc_gpio; LEDState *led[4]; =20 - misc_gpio =3D sysbus_create_simple(TYPE_TOSA_MISC_GPIO, -1, NULL); + misc_gpio =3D qdev_new(TYPE_TOSA_MISC_GPIO); + object_property_add_child(OBJECT(machine), "pcb-container", + OBJECT(misc_gpio)); + qdev_realize_and_unref(misc_gpio, NULL, &error_fatal); =20 /* MMC/SD host */ pxa2xx_mmci_handlers(cpu->mmc, @@ -253,7 +256,7 @@ static void tosa_init(MachineState *machine) scp0 =3D sysbus_create_simple("scoop", 0x08800000, NULL); scp1 =3D sysbus_create_simple("scoop", 0x14800040, NULL); =20 - tosa_gpio_setup(mpu, scp0, scp1, tmio); + tosa_gpio_setup(machine, mpu, scp0, scp1, tmio); =20 tosa_microdrive_attach(mpu); =20 @@ -307,7 +310,7 @@ static const TypeInfo tosa_ssp_info =3D { =20 static const TypeInfo tosa_misc_gpio_info =3D { .name =3D TYPE_TOSA_MISC_GPIO, - .parent =3D TYPE_SYS_BUS_DEVICE, + .parent =3D TYPE_DEVICE, .instance_size =3D sizeof(TosaMiscGPIOState), .instance_init =3D tosa_misc_gpio_init, /* --=20 2.26.2