From nobody Tue Feb 10 17:13:40 2026 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=ilande.co.uk Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1656508155174383.7839917026672; Wed, 29 Jun 2022 06:09:15 -0700 (PDT) Received: from localhost ([::1]:46088 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o6XRS-0006VR-5u for importer@patchew.org; Wed, 29 Jun 2022 09:09:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60792) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o6X0L-0007hV-R6; Wed, 29 Jun 2022 08:41:14 -0400 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:50990) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o6X0I-0004fL-Ty; Wed, 29 Jun 2022 08:41:12 -0400 Received: from [2a00:23c4:8ba4:e500:b82f:56f9:46d7:80ab] (helo=kentang.home) by mail.ilande.co.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1o6Wz2-0002tZ-5M; Wed, 29 Jun 2022 13:39:52 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=ilande.co.uk; s=20220518; h=Subject:Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:To:From:Sender:Reply-To:Cc: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=lB2/N+UWeTMozzLfCLXvZRKYPj8HL2k9kFD1KcW+hj8=; b=F+dhJV2ygjTW0vMwXAAXm4jEkQ o5Bk54uUuBLDrpSUBHh/dPyWxmOp37FlEZiO35Nsp+ove8X+Q2RX9JriOO7QYp3Zim35WuICJ0gLy FSAQ/jFC3WtZ9I1G00ku7N6bLTIlRZ45A19WP+qIKPxPMDKuALt+47zWO23+ixdyyw1fUL9A6E3A0 s2nFldo5195B7AXIgF98m9B5GXzywZLbRgYQkZa3WjBXegDNZC7OqAo6APmYmU4H3vx7OtGR2PFGD 0QT/BsJJzS577HbahEn06/dzZ4EcEoEfRYMSN/mRMrTuaMuoul+z39RHuZKj05CLK57dgkEtxGg9b xgkXxXCrZ9jx4thiANpaggNgN6tITTqB2rIn9Zra2YuQv4ucNucv0Eeo8U4W2RINLtxITNpmL6Oq2 YPVNZHaOq0MJfKL4p/PBqksBhHEBQ61jFBonLhJPjCBoh6n94a6YulhenfrIPBcihNR7JBLfee+ET 3nT1L94GUf0sv9etMM5IPXLAtBrnRi3qKtO4U723KLR8kWhUHW2DbgzVrzIrd5wraA85YrotzfpQg XVKkS+bwNo8mykodZnPj1AScbM84lG0RHzBr89X6z2JNcwwxtXIJU4O2N+ENsZoCGES1pSeHE274p oEoaO/PNfeQm+E7164LAAd/Xp62ObmDuY26z73x3M=; From: Mark Cave-Ayland To: richard.henderson@linaro.org, deller@gmx.de, svens@stackframe.org, mst@redhat.com, pbonzini@redhat.com, peter.maydell@linaro.org, hpoussin@reactos.org, aleksandar.rikalo@syrmia.com, f4bug@amsat.org, qemu-devel@nongnu.org, qemu-arm@nongnu.org Date: Wed, 29 Jun 2022 13:39:57 +0100 Message-Id: <20220629124026.1077021-12-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220629124026.1077021-1-mark.cave-ayland@ilande.co.uk> References: <20220629124026.1077021-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 2a00:23c4:8ba4:e500:b82f:56f9:46d7:80ab X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH 11/40] pl050: don't use legacy ps2_mouse_init() function X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.ilande.co.uk) 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=2001:41c9:1:41f::167; envelope-from=mark.cave-ayland@ilande.co.uk; helo=mail.ilande.co.uk X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1656508156188100003 Content-Type: text/plain; charset="utf-8" Instantiate the PS2 mouse device within PL050MouseState using object_initialize_child() in pl050_mouse_init() and realize it in pl050_mouse_realize() accordingly. Signed-off-by: Mark Cave-Ayland Reviewed-by: Peter Maydell --- hw/input/pl050.c | 13 ++++++++++--- include/hw/input/pl050.h | 2 ++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/hw/input/pl050.c b/hw/input/pl050.c index 64b579e877..ec5e19285e 100644 --- a/hw/input/pl050.c +++ b/hw/input/pl050.c @@ -183,17 +183,24 @@ static void pl050_kbd_init(Object *obj) static void pl050_mouse_realize(DeviceState *dev, Error **errp) { PL050DeviceClass *pdc =3D PL050_GET_CLASS(dev); + PL050MouseState *s =3D PL050_MOUSE_DEVICE(dev); PL050State *ps =3D PL050(dev); =20 - ps->ps2dev =3D ps2_mouse_init(); + if (!sysbus_realize(SYS_BUS_DEVICE(&s->mouse), errp)) { + return; + } + + ps->ps2dev =3D PS2_DEVICE(&s->mouse); pdc->parent_realize(dev, errp); } =20 static void pl050_mouse_init(Object *obj) { - PL050State *s =3D PL050(obj); + PL050MouseState *s =3D PL050_MOUSE_DEVICE(obj); + PL050State *ps =3D PL050(obj); =20 - s->is_mouse =3D true; + ps->is_mouse =3D true; + object_initialize_child(obj, "mouse", &s->mouse, TYPE_PS2_MOUSE_DEVICE= ); } =20 static void pl050_kbd_class_init(ObjectClass *oc, void *data) diff --git a/include/hw/input/pl050.h b/include/hw/input/pl050.h index 28f6216dc3..89ec4fafc9 100644 --- a/include/hw/input/pl050.h +++ b/include/hw/input/pl050.h @@ -52,6 +52,8 @@ OBJECT_DECLARE_SIMPLE_TYPE(PL050MouseState, PL050_MOUSE_D= EVICE) =20 struct PL050MouseState { PL050State parent_obj; + + PS2MouseState mouse; }; =20 #endif --=20 2.30.2