From nobody Tue Feb 10 20:49:44 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 1658171745352269.16099113159396; Mon, 18 Jul 2022 12:15:45 -0700 (PDT) Received: from localhost ([::1]:47854 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oDWDY-00017C-6c for importer@patchew.org; Mon, 18 Jul 2022 15:15:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33076) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oDVb6-0001T3-K7 for qemu-devel@nongnu.org; Mon, 18 Jul 2022 14:36:00 -0400 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:49200) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oDVb4-0005xS-64 for qemu-devel@nongnu.org; Mon, 18 Jul 2022 14:36:00 -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 1oDVZZ-000B51-7O; Mon, 18 Jul 2022 19:34: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: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=b8cBQ0hbxis4dSEdi8mWivZRoMkvBo9m83x7qh5E/9U=; b=OVaKfl/HfnjAUqtYYR5aNkoqEN 41rCFnChYKwf7O9xIWJKVQpQPPrk2otloquQFiUOcqkk0dnr3qR32J1PH8j8K5UNSkcAcb/kB5h48 H35d76ZHyogp3mdP8SsYPr+G3/5rykCy1+AKFPKFUnLoV3+HBF6k0CgmMVomQA7nUdyIXJ3gEWbJI ma3ocSjfkNZMAB+O07+NMYtOFP9cQTt/BIAHqbAyLZAcblc6KLKZzrRLXfUI6VDYuT8cr7xmotfF3 wGAVVLnP7t4v1Eb6At6nq7GgNUkbICzVNE3VkpUuX3h/QP4xgzZDZkrV+AL+Qhpylcelk5A6siH7b IIC44xa9inf6Hdc0RVNjJMwV4jXIUAh5ZEfkdnyv8Kl/5C07mUWUUFMKoIUnuJL9TjrlKopg/Oyxe tXlFWc8LCd8n4TmuEjCbMVUIY7ME8PU1Bcg8xd/a0oQAtg85i1ZaE4OySpBUdrzMLgO0BYgg78wDr I9IQUOYV0hxSHokR44DvY2Zn+gLM5CN+2J5/E2WaAmtlbclTEdPzjvv56gGJzGAaygDzuaF8q26FM xsb4vYKsLnbsMc7/Hn4prjS0X4pSTo0NNkYATxpRY0jQznpkSUJUw1oQt+XgqlfqwNS2md8nPxmKJ it0zyXrbWBtbY0HKZgJtiP5uatzWnk+LFDcvke77o=; From: Mark Cave-Ayland To: peter.maydell@linaro.org, qemu-devel@nongnu.org Date: Mon, 18 Jul 2022 19:33:28 +0100 Message-Id: <20220718183339.124253-30-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 29/40] lasips2: rename LASIPS2Port parent pointer to lasips2 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: 1658171746935100001 This makes it clearer that the pointer is a reference to the LASIPS2 contai= ner device rather than an implied part of the QOM hierarchy. Signed-off-by: Mark Cave-Ayland Tested-by: Helge Deller Acked-by: Helge Deller Reviewed-by: Peter Maydell Message-Id: <20220712215251.7944-30-mark.cave-ayland@ilande.co.uk> Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/input/lasips2.c | 6 +++--- include/hw/input/lasips2.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/input/lasips2.c b/hw/input/lasips2.c index 5ceb38c1af..0f392e2bee 100644 --- a/hw/input/lasips2.c +++ b/hw/input/lasips2.c @@ -222,7 +222,7 @@ static uint64_t lasips2_reg_read(void *opaque, hwaddr a= ddr, unsigned size) } } =20 - if (port->parent->int_status) { + if (port->lasips2->int_status) { ret |=3D LASIPS2_STATUS_CMPINTR; } break; @@ -368,7 +368,7 @@ static void lasips2_kbd_port_init(Object *obj) memory_region_init_io(&lp->reg, obj, &lasips2_reg_ops, lp, "lasips2-kb= d", 0x100); lp->id =3D 0; - lp->parent =3D container_of(s, LASIPS2State, kbd_port); + lp->lasips2 =3D container_of(s, LASIPS2State, kbd_port); } =20 static void lasips2_kbd_port_class_init(ObjectClass *klass, void *data) @@ -405,7 +405,7 @@ static void lasips2_mouse_port_init(Object *obj) memory_region_init_io(&lp->reg, obj, &lasips2_reg_ops, lp, "lasips2-mo= use", 0x100); lp->id =3D 1; - lp->parent =3D container_of(s, LASIPS2State, mouse_port); + lp->lasips2 =3D container_of(s, LASIPS2State, mouse_port); } =20 static void lasips2_mouse_port_class_init(ObjectClass *klass, void *data) diff --git a/include/hw/input/lasips2.h b/include/hw/input/lasips2.h index 7199f16622..9fe9e63a66 100644 --- a/include/hw/input/lasips2.h +++ b/include/hw/input/lasips2.h @@ -37,7 +37,7 @@ typedef struct LASIPS2State LASIPS2State; struct LASIPS2Port { DeviceState parent_obj; =20 - LASIPS2State *parent; + LASIPS2State *lasips2; MemoryRegion reg; PS2State *ps2dev; uint8_t id; --=20 2.30.2