From nobody Tue Feb 10 15:03:04 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 1658170736845813.1174570881736; Mon, 18 Jul 2022 11:58:56 -0700 (PDT) Received: from localhost ([::1]:48852 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oDVxH-0004bQ-NU for importer@patchew.org; Mon, 18 Jul 2022 14:58:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60726) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oDVZj-0008W7-0G for qemu-devel@nongnu.org; Mon, 18 Jul 2022 14:34:38 -0400 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:49086) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oDVZg-0005ah-MR for qemu-devel@nongnu.org; Mon, 18 Jul 2022 14:34:33 -0400 Received: from [2a00:23c4:8ba6:5100:d563:eb67:74b1:7b0] (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 1oDVYL-000B51-8U; Mon, 18 Jul 2022 19:33:13 +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:Content-Type: MIME-Version:References:In-Reply-To:Message-Id:Date:To:From:Sender:Reply-To: Cc: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=tjFhHSw3zB10mQiwL5g5ScMLvNBYRGN1yjFyUwrQztY=; b=osgWpIZoyoDmANi6L3LoODD6oL MhZl/CdsXPSgky2jLl4T5y1fJliNMGtqgJ1qhwbKA2Y/xrKcPe3slQ+eAib982tGljNfEyQItPjUK HV7YMOrSp2qOCdoRu+9Ps/+e7E8KB0bKrRgkYJU8cYcxr6HDYHhs69B7aEeKkxL+p/pZcxiqf9SiH Klz2EbCMtq44PiE1wCNdXGfzAbaCNmxRog461o/p4+G3L5yE4tSK0Ml0zsuvjogu/cRRn9sPWsvN2 2wTR2I90Ac3jvLnLkm4B7pKh0+8RKwCB0UU0Vg7lYu0ApWrPRSngDvLEOoSQA7KaFxkX2P969KNuL ANICAcNrGUNqo8QKzneAuLC2h4RLXbXzSN+z9RqXzPRHxn3aDoG8OnBc0PYiUM/4yPX+M4ZhPWwu4 8c8Dedosp8M79iMUQ66gh8iwVXe9iEz9Jyg9fDZQIBfJpT4wnkb6aCx3KZb69s4XExHewXazcETnV NtdRNkCbuMrwg30GTJTWP4ThKCp7pW/2gi4gw4/j4VRwFDXueXxu6aMbQVwrN3YEjTu92D1AOJkEW 0GFn34XzkQTwa1eB5SskZw5UIpHsKFfewvNeaJ7qbc4IVBlx3NAH1wxuHZCMAGLNgc067NxClFRgW Z987QmthDBv2waOdWM/nu5B2Y7ASORlQ8/rzDR/zc=; From: Mark Cave-Ayland To: peter.maydell@linaro.org, qemu-devel@nongnu.org Date: Mon, 18 Jul 2022 19:33:09 +0100 Message-Id: <20220718183339.124253-11-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220718183339.124253-1-mark.cave-ayland@ilande.co.uk> References: <20220718183339.124253-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 2a00:23c4:8ba6:5100:d563:eb67:74b1:7b0 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PULL 10/40] pl050: don't use legacy ps2_kbd_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: 1658170738203100001 Instantiate the PS2 keyboard device within PL050KbdState using object_initialize_child() in pl050_kbd_init() and realize it in pl050_kbd_realize() accordingly. Signed-off-by: Mark Cave-Ayland Tested-by: Helge Deller Acked-by: Helge Deller Reviewed-by: Peter Maydell Message-Id: <20220712215251.7944-11-mark.cave-ayland@ilande.co.uk> Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- 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 fcc40758a3..64b579e877 100644 --- a/hw/input/pl050.c +++ b/hw/input/pl050.c @@ -160,17 +160,24 @@ static void pl050_realize(DeviceState *dev, Error **e= rrp) static void pl050_kbd_realize(DeviceState *dev, Error **errp) { PL050DeviceClass *pdc =3D PL050_GET_CLASS(dev); + PL050KbdState *s =3D PL050_KBD_DEVICE(dev); PL050State *ps =3D PL050(dev); =20 - ps->ps2dev =3D ps2_kbd_init(); + if (!sysbus_realize(SYS_BUS_DEVICE(&s->kbd), errp)) { + return; + } + + ps->ps2dev =3D PS2_DEVICE(&s->kbd); pdc->parent_realize(dev, errp); } =20 static void pl050_kbd_init(Object *obj) { - PL050State *s =3D PL050(obj); + PL050KbdState *s =3D PL050_KBD_DEVICE(obj); + PL050State *ps =3D PL050(obj); =20 - s->is_mouse =3D false; + ps->is_mouse =3D false; + object_initialize_child(obj, "kbd", &s->kbd, TYPE_PS2_KBD_DEVICE); } =20 static void pl050_mouse_realize(DeviceState *dev, Error **errp) diff --git a/include/hw/input/pl050.h b/include/hw/input/pl050.h index 203f03a194..28f6216dc3 100644 --- a/include/hw/input/pl050.h +++ b/include/hw/input/pl050.h @@ -43,6 +43,8 @@ OBJECT_DECLARE_SIMPLE_TYPE(PL050KbdState, PL050_KBD_DEVIC= E) =20 struct PL050KbdState { PL050State parent_obj; + + PS2KbdState kbd; }; =20 #define TYPE_PL050_MOUSE_DEVICE "pl050_mouse" --=20 2.30.2