From nobody Tue Feb 10 12:27:06 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 1657663678653990.4929801048426; Tue, 12 Jul 2022 15:07:58 -0700 (PDT) Received: from localhost ([::1]:59842 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oBO2v-0006Wt-Lg for importer@patchew.org; Tue, 12 Jul 2022 18:07:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43088) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oBNpK-0000sj-51; Tue, 12 Jul 2022 17:53:54 -0400 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:42166) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oBNpI-0007rj-GD; Tue, 12 Jul 2022 17:53:53 -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 1oBNnt-000Bqt-0R; Tue, 12 Jul 2022 22:52:28 +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=W6HLJM8fGFCrC12DPqqsd/SWzorPBsUx+TvXB8qW3AQ=; b=1JaI12BUv5e8bWYvgNiupwxsdJ 41Xl5eJiSXZOUy5KMhnPtx8jZcYmvI/FAGWJLM2011IuRtRx5DAGNh05BHtXjm0QN9BFhtwlEgKl2 LEo5RUy4DpqTMh/j/lNqB+lv3CtxRKNvYiXlCk+u+pGKsOyoCDKgMbrYzI8xNaaNBGW8I1fOob4cy 37HpjxwUm1E6vExAl6yrCW9Yw81qNRtzOn2+YGR1EO4Jvwp60BYVAFek2NiW5VP6rW9BifzPP3nh4 eGPsxdyUIPy+wazq2uVjH7+SwwL9EyG9lCDYYbMEIJ3cqpBQftettKPzosH1Pal4wIIkBzVc5tQWM 9GLElKE+2hIXC0bHfGkml3vNTFvJQlJLcYatdYGqKKUv0ZMwSHPdh7h0zxK3/xX9R7Wkt3WtxJ4PT DFce3ZtsCT9gzph0Mi+wnrQ2/xsm3gk2irH5B/mt4Xl3pUxEAXF0NQbk7g947OmsI+EK5MZImoHbe iZkZqjQWTMEZi5Fl+0VnPlsSnCnThgqaKzYGaiNK6cQyJ/X+jAURBqDaIpwoGJaoAvrJjAkUSVlgP DG6O8AaXkaqIJghBNnEtl6DAysFmQSdlNw7ogmzBcwpVkECFO/RU9Y2FhDtC/bqHrVb9bFkjpBS/L uG73Bt/uZtdq7Qb7nb+Pfvpfbej3I9x0/t8XGlg+c=; 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:24 +0100 Message-Id: <20220712215251.7944-14-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 13/40] lasips2: remove the qdev base property and the lasips2_properties array 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: 1657663680598100001 Content-Type: text/plain; charset="utf-8" The base property was only needed for use by vmstate_register() in order to preserve migration compatibility. Now that the lasips2 migration state is registered through the DeviceClass vmsd field, the base property and also the lasips2_properties array can be removed completely as they are no longer required. Signed-off-by: Mark Cave-Ayland Tested-by: Helge Deller Acked-by: Helge Deller Reviewed-by: Peter Maydell --- hw/hppa/machine.c | 3 +-- hw/input/lasips2.c | 9 +-------- include/hw/input/lasips2.h | 3 +-- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c index 44ecd446c3..6080037cf1 100644 --- a/hw/hppa/machine.c +++ b/hw/hppa/machine.c @@ -280,8 +280,7 @@ static void machine_hppa_init(MachineState *machine) } =20 /* PS/2 Keyboard/Mouse */ - dev =3D DEVICE(lasips2_initfn(LASI_PS2KBD_HPA, - qdev_get_gpio_in(lasi_dev, + dev =3D DEVICE(lasips2_initfn(qdev_get_gpio_in(lasi_dev, LASI_IRQ_PS2KBD_HPA))); memory_region_add_subregion(addr_space, LASI_PS2KBD_HPA, sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), diff --git a/hw/input/lasips2.c b/hw/input/lasips2.c index d4fa248729..40f77baf3e 100644 --- a/hw/input/lasips2.c +++ b/hw/input/lasips2.c @@ -255,12 +255,11 @@ static void lasips2_set_mouse_irq(void *opaque, int n= , int level) lasips2_update_irq(port->parent); } =20 -LASIPS2State *lasips2_initfn(hwaddr base, qemu_irq irq) +LASIPS2State *lasips2_initfn(qemu_irq irq) { DeviceState *dev; =20 dev =3D qdev_new(TYPE_LASIPS2); - qdev_prop_set_uint64(dev, "base", base); sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); =20 sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, irq); @@ -307,18 +306,12 @@ static void lasips2_init(Object *obj) "ps2-mouse-input-irq", 1); } =20 -static Property lasips2_properties[] =3D { - DEFINE_PROP_UINT64("base", LASIPS2State, base, UINT64_MAX), - DEFINE_PROP_END_OF_LIST(), -}; - static void lasips2_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); =20 dc->realize =3D lasips2_realize; dc->vmsd =3D &vmstate_lasips2; - device_class_set_props(dc, lasips2_properties); set_bit(DEVICE_CATEGORY_INPUT, dc->categories); } =20 diff --git a/include/hw/input/lasips2.h b/include/hw/input/lasips2.h index 03f0c9e9f9..f051c970f0 100644 --- a/include/hw/input/lasips2.h +++ b/include/hw/input/lasips2.h @@ -39,7 +39,6 @@ typedef struct LASIPS2Port { struct LASIPS2State { SysBusDevice parent_obj; =20 - hwaddr base; LASIPS2Port kbd; LASIPS2Port mouse; qemu_irq irq; @@ -48,6 +47,6 @@ struct LASIPS2State { #define TYPE_LASIPS2 "lasips2" OBJECT_DECLARE_SIMPLE_TYPE(LASIPS2State, LASIPS2) =20 -LASIPS2State *lasips2_initfn(hwaddr base, qemu_irq irq); +LASIPS2State *lasips2_initfn(qemu_irq irq); =20 #endif /* HW_INPUT_LASIPS2_H */ --=20 2.30.2