From nobody Wed Feb 11 08:40:13 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 165324747078114.565019261197676; Sun, 22 May 2022 12:24:30 -0700 (PDT) Received: from localhost ([::1]:57912 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nsrBl-0001ph-QC for importer@patchew.org; Sun, 22 May 2022 15:24:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41852) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nsqC7-0008In-8F; Sun, 22 May 2022 14:20:47 -0400 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:47942) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nsqBy-0003rH-Ly; Sun, 22 May 2022 14:20:41 -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 1nsqAV-0007pH-Cc; Sun, 22 May 2022 19:19:11 +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=CkGI+yMYz98UoKIk+686p+wq9HrH384uQjmkoONqm1M=; b=OhmwKAKXj3BwPtv+4dnZWdKSIj jXrC0TKGVlE+EZK3qBsUPEG8yWIYdaVNletjtr+pnkJK4rgrN6G9zhUR0/uVKCjPgRplFjiV8Ti0D ozu/dKVH1Z/ja4teFarx/lAn8SFHN3JYjqeWaku6dr+mrRuEIKKcf+eu2vFt6/iJjsPXGjDQf3Tef /IksOk1hdgD8reXZlk1NK3PuCUgrntneSrupNROR3VvbsRy7WlaIDrJOGYP++KTJDiu+4F1BvVjmO DivHHUgTxevXbmvGHxinUUStuerC5c8SvUtfeg15VYe1ikQHgRO2TFO1Q7PZ53R7IbOAujHDcBHM3 QUGlopDCNVdtJQKEnH4F3lkG6FHLB+rgpsU/gCKyq285bVblXvKMF8twTbodKNSzv+CIteUvVmxnw sPaqoxrDWmjYSRckCDIKqkykkjXfZNor59m6T4wHvEB9PTRH/GLtw3+aMO3X33MrhsuhGy50Rcapp fz5Hz1+W8BESW56gUuPCd68IWJnFlc+6A/dzg4RXwKoeuG3zJPuND3UeAl4Yg6fwV9R7YvHhYiEMr H1jkK3SM/Hh3RLn+RbzAy18JNWdfZ2dXjbu3pJQJxCvPV0knODN4VAQSeGHY7aINg7rOZ/fX1bg5M Xq4T07qlavKeyzaNuJESLU+671Q6QtSSZOCPG2DR4=; From: Mark Cave-Ayland To: richard.henderson@linaro.org, deller@gmx.de, mst@redhat.com, pbonzini@redhat.com, peter.maydell@linaro.org, hpoussin@reactos.org, aleksandar.rikalo@syrmia.com, f4bug@amsat.org, jiaxun.yang@flygoat.com, qemu-arm@nongnu.org, qemu-devel@nongnu.org Date: Sun, 22 May 2022 19:18:23 +0100 Message-Id: <20220522181836.864-38-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220522181836.864-1-mark.cave-ayland@ilande.co.uk> References: <20220522181836.864-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 37/50] lasips2: QOMify LASIPS2State 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: 1653247471626100001 Content-Type: text/plain; charset="utf-8" Currently lasip2_init() creates a new LASIPS2State directly which is used b= y the HPPA machine. Introduce a new LASIPS2 QOM type that will soon be used to allow t= he HPPA machine to be wired up using standard qdev GPIOs. Signed-off-by: Mark Cave-Ayland Reviewed-by: Peter Maydell --- hw/input/lasips2.c | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/hw/input/lasips2.c b/hw/input/lasips2.c index adfde1684f..db0a791e6c 100644 --- a/hw/input/lasips2.c +++ b/hw/input/lasips2.c @@ -24,6 +24,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "hw/qdev-properties.h" +#include "hw/sysbus.h" #include "hw/input/ps2.h" #include "hw/input/lasips2.h" #include "exec/hwaddr.h" @@ -31,6 +32,7 @@ #include "exec/address-spaces.h" #include "migration/vmstate.h" #include "hw/irq.h" +#include "qapi/error.h" =20 =20 struct LASIPS2State; @@ -45,11 +47,16 @@ typedef struct LASIPS2Port { bool irq; } LASIPS2Port; =20 -typedef struct LASIPS2State { +struct LASIPS2State { + SysBusDevice parent_obj; + LASIPS2Port kbd; LASIPS2Port mouse; qemu_irq irq; -} LASIPS2State; +}; + +#define TYPE_LASIPS2 "lasips2" +OBJECT_DECLARE_SIMPLE_TYPE(LASIPS2State, LASIPS2) =20 static const VMStateDescription vmstate_lasips2 =3D { .name =3D "lasips2", @@ -265,8 +272,11 @@ void lasips2_init(MemoryRegion *address_space, hwaddr base, qemu_irq irq) { LASIPS2State *s; + DeviceState *dev; =20 - s =3D g_new0(LASIPS2State, 1); + dev =3D qdev_new(TYPE_LASIPS2); + sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); + s =3D LASIPS2(dev); =20 s->irq =3D irq; s->mouse.id =3D 1; @@ -286,3 +296,16 @@ void lasips2_init(MemoryRegion *address_space, "lasips2-mouse", 0x100); memory_region_add_subregion(address_space, base + 0x100, &s->mouse.reg= ); } + +static const TypeInfo lasips2_info =3D { + .name =3D TYPE_LASIPS2, + .parent =3D TYPE_SYS_BUS_DEVICE, + .instance_size =3D sizeof(LASIPS2State) +}; + +static void lasips2_register_types(void) +{ + type_register_static(&lasips2_info); +} + +type_init(lasips2_register_types) --=20 2.20.1