From nobody Tue Feb 10 17:14:37 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 1657663459986718.7253486004339; Tue, 12 Jul 2022 15:04:19 -0700 (PDT) Received: from localhost ([::1]:49694 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oBNzP-0007wN-0m for importer@patchew.org; Tue, 12 Jul 2022 18:04:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43016) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oBNp3-00009W-JF; Tue, 12 Jul 2022 17:53:38 -0400 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:42078) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oBNp1-0007px-VT; Tue, 12 Jul 2022 17:53:37 -0400 Received: from [2a00:23c4:8ba5:df00:fd7d:1c3a:1dd0:c576] (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 1oBNnd-000Bqt-4z; Tue, 12 Jul 2022 22:52:12 +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=wUk1zNrealyYpxuRQ0CWaiPac3SrxCFs2IC+S6zjZnw=; b=b4kNktV9109dN1iPAHyskoKUK3 9g8prECE2ErjKWvXBPpt3zvklx7nGLau3G+uw4mPsahqDvOuRxT47gCC6ghtUzbc7Hf7wRt+pxqar VHhJxHb5/O/Y8NbPL/ZVF+W1ybqFQxVQJ9j6bdKoyzQZ0RPkWAPwgMhj+nyxNL7BQDyPxjzc/b/b6 8Otv3CAUFj4qXvpQ4Ct6WjXG+0KibBWQrpbtXSiDSI9buqz4w3481eQLQeJ8HW7Sk8lR7ANhHz0YI ZG+rjT8g+G61Ep+S0jvXqDGRBaWjKmav9YgNoCLJ/sk3tfk57EHgUlT1njRqCvv+f5v3OkQWQK6lo RgPp00B8dSbVMnBHxe/Idbl5ay1ip9P0kpCHmbRJ1YPSF0TwLTDgd4EL3V/UJmNxc6MB2UD0GAPnz 5hg79zOgH6Z8Cz5Z0bSaKNchLiVTir8MaY8Ytw/rEg72T+tvOQQLkTXaNmmVwIfdOfuW79YFwnhX6 kdzEhavrXU9gmS1HxZAIfeBYLOMfOIbmNg4S97cEaAS4E9Jih9Xi8z89cdAK6CBeMzcHv/7kfwljK mtGYFELCc/EeA/UUscZKi0CD7nkz/V2yYk/zdRYcstpHdVe76lpaM0wxxXqyA2hMaC96O50p+kJGd SkIbmKelDmZUMw1QdrsGSg+d/k4X7irdSQ6M3l4RE=; From: Mark Cave-Ayland To: richard.henderson@linaro.org, deller@gmx.de, svens@stackframe.org, 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: Tue, 12 Jul 2022 22:52:20 +0100 Message-Id: <20220712215251.7944-10-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220712215251.7944-1-mark.cave-ayland@ilande.co.uk> References: <20220712215251.7944-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 2a00:23c4:8ba5:df00:fd7d:1c3a:1dd0:c576 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH v2 09/40] pl050: introduce pl050_mouse_class_init() and pl050_mouse_realize() 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: 1657663461306100001 Content-Type: text/plain; charset="utf-8" Introduce a new pl050_mouse_class_init() function containing a call to device_class_set_parent_realize() which calls a new pl050_mouse_realize() function to initialise the PS2 mouse device. Signed-off-by: Mark Cave-Ayland Tested-by: Helge Deller Acked-by: Helge Deller Reviewed-by: Peter Maydell --- hw/input/pl050.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/hw/input/pl050.c b/hw/input/pl050.c index 24363c007e..fcc40758a3 100644 --- a/hw/input/pl050.c +++ b/hw/input/pl050.c @@ -153,10 +153,6 @@ static void pl050_realize(DeviceState *dev, Error **er= rp) { PL050State *s =3D PL050(dev); =20 - if (s->is_mouse) { - s->ps2dev =3D ps2_mouse_init(); - } - qdev_connect_gpio_out(DEVICE(s->ps2dev), PS2_DEVICE_IRQ, qdev_get_gpio_in_named(dev, "ps2-input-irq", 0)); } @@ -177,6 +173,15 @@ static void pl050_kbd_init(Object *obj) s->is_mouse =3D false; } =20 +static void pl050_mouse_realize(DeviceState *dev, Error **errp) +{ + PL050DeviceClass *pdc =3D PL050_GET_CLASS(dev); + PL050State *ps =3D PL050(dev); + + ps->ps2dev =3D ps2_mouse_init(); + pdc->parent_realize(dev, errp); +} + static void pl050_mouse_init(Object *obj) { PL050State *s =3D PL050(obj); @@ -201,11 +206,21 @@ static const TypeInfo pl050_kbd_info =3D { .class_init =3D pl050_kbd_class_init, }; =20 +static void pl050_mouse_class_init(ObjectClass *oc, void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(oc); + PL050DeviceClass *pdc =3D PL050_CLASS(oc); + + device_class_set_parent_realize(dc, pl050_mouse_realize, + &pdc->parent_realize); +} + static const TypeInfo pl050_mouse_info =3D { .name =3D TYPE_PL050_MOUSE_DEVICE, .parent =3D TYPE_PL050, .instance_init =3D pl050_mouse_init, .instance_size =3D sizeof(PL050MouseState), + .class_init =3D pl050_mouse_class_init, }; =20 static void pl050_init(Object *obj) --=20 2.30.2