From nobody Sun May 19 12:45:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.53 as permitted sender) client-ip=209.85.221.53; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f53.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1639832686; cv=none; d=zohomail.com; s=zohoarc; b=lbp5NjDIS6+mS0TXlXP9OCGxsNx2wg7BWEZdtzZTfG/IN+tiNX0dPbHoubZiR8nreIlLWagUOfw4ZzEA/V10BA5vHZQ5bARv0JZZ5/ZtsyaC1ZFR0iaatqP3xKOArw9wWyG60dIrXRAASPksdkpIWrXEDSaLOJFygOEzGNtKIwk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639832686; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=nYRF7Ay5OmCxJuygY/6kEra6OgWNJoLw6b9JAs3k8BU=; b=O5v5JR/Egi4ncrecWtKv1Wx2nO8xX61HLWvS+gqDp4rMrMkpVdZalSkfy82upzaF5e555VfV4ib0SqnCzBeXTsG49AyPZIzkmlANu5s1mlkY6hcSYkGCobdZCwGWLrH2JdWlSxTzMmI34aSX2FhwbtmRl0wPrSN0P4ClP8SpreQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by mx.zohomail.com with SMTPS id 1639832686097394.4361598431823; Sat, 18 Dec 2021 05:04:46 -0800 (PST) Received: by mail-wr1-f53.google.com with SMTP id v11so9344423wrw.10 for ; Sat, 18 Dec 2021 05:04:45 -0800 (PST) Return-Path: Return-Path: Received: from x1w.. (174.red-83-50-185.dynamicip.rima-tde.net. [83.50.185.174]) by smtp.gmail.com with ESMTPSA id n1sm12456386wrc.54.2021.12.18.05.04.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Dec 2021 05:04:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nYRF7Ay5OmCxJuygY/6kEra6OgWNJoLw6b9JAs3k8BU=; b=Shd/zgl3ELASaHx9wYSpKSpYkTvs9+mfYx8Zs1hReJVHtAkLgsaC4VCZX/62bHNpYx bcj1eIlZynEEPlR44NHnZirUCNq5Snpm9GcNG2Ac0UE3KD/uwy5Kwg+SGrsgVtlMNyZC qyOE1WCt7ZGA5kXjvfo+0xsDIezMmvoZmJPJ+/ioRq511m2WEAJZca+Cw+5cDaUiTeoC L8yN1ZstmBSRzOeGR35qPvZmLjATm1e2pyG6eyqXBJLQmy2QJJ9dNI5iB/lps6nGa91o nkaoz8hkvs15im8aFY1tc0vDR1Dv+epQAOMzMNXe1/M9F81bVNBdp5GYbBDSPpBewp5d u+3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=nYRF7Ay5OmCxJuygY/6kEra6OgWNJoLw6b9JAs3k8BU=; b=nc0B5eVtKZIRSkL631pAqFiY3j0fNpUvOCFTQHB/eOC0a1e/8ppHIm3tnvtUSWUd4m /nCBqkXo3X7dbshOSdXp1t/u9ccwQl16Tf9Zsn9ey760oN2JGyaWApizdVdryo8RG64k M7PUwdw7obMyFcuRak26Lf3cyq+wHIbEhUHme79b822RnueAuJgrCTxccdLCDb2K929y RilLku7Za2n90cE+3b7XXcSSyCWc1fuk3l+G3B9EYoIa+r8vx3VYu5xgL2Pn4mtdjfij TksWi+tf+agfbA6E0AdA01mlEf0PgpmyABdPkJ8VTgNrFxfdcrt3/6nBTlTR6DFb8zVs 7umw== X-Gm-Message-State: AOAM533VJPUaONldWgWUOYoQ9fdbtrlvZ4Ypmq84qi0Fg9YSEJZgwbt3 +c5qYLLSmAauCJ47ahxHP64= X-Google-Smtp-Source: ABdhPJze2AoGxcaNhhLfnqvIHl4vgbhOWKltiE50QHLnG110Iwfpjyxn5rdDtpz2b5jJZbN0nRWfnw== X-Received: by 2002:a05:6000:1aca:: with SMTP id i10mr6427715wry.407.1639832684399; Sat, 18 Dec 2021 05:04:44 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Yanan Wang , Richard Henderson , Eduardo Habkost , qemu-trivial@nongnu.org, Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 1/5] hw/qdev: Cosmetic around documentation Date: Sat, 18 Dec 2021 14:04:33 +0100 Message-Id: <20211218130437.1516929-2-f4bug@amsat.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211218130437.1516929-1-f4bug@amsat.org> References: <20211218130437.1516929-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1639832687381100001 Add empty lines to have a clearer distinction between different functions declarations. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Yanan Wang --- include/hw/qdev-core.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index 20d3066595e..59a822ffceb 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -321,6 +321,7 @@ compat_props_add(GPtrArray *arr, * The returned object has a reference count of 1. */ DeviceState *qdev_new(const char *name); + /** * qdev_try_new: Try to create a device on the heap * @name: device type to create @@ -329,6 +330,7 @@ DeviceState *qdev_new(const char *name); * does not exist, rather than asserting. */ DeviceState *qdev_try_new(const char *name); + /** * qdev_realize: Realize @dev. * @dev: device to realize @@ -347,6 +349,7 @@ DeviceState *qdev_try_new(const char *name); * qdev_realize_and_unref() instead. */ bool qdev_realize(DeviceState *dev, BusState *bus, Error **errp); + /** * qdev_realize_and_unref: Realize @dev and drop a reference * @dev: device to realize @@ -372,6 +375,7 @@ bool qdev_realize(DeviceState *dev, BusState *bus, Erro= r **errp); * would be incorrect. For that use case you want qdev_realize(). */ bool qdev_realize_and_unref(DeviceState *dev, BusState *bus, Error **errp); + /** * qdev_unrealize: Unrealize a device * @dev: device to unrealize @@ -450,6 +454,7 @@ typedef enum { * For named input GPIO lines, use qdev_get_gpio_in_named(). */ qemu_irq qdev_get_gpio_in(DeviceState *dev, int n); + /** * qdev_get_gpio_in_named: Get one of a device's named input GPIO lines * @dev: Device whose GPIO we want @@ -497,6 +502,7 @@ qemu_irq qdev_get_gpio_in_named(DeviceState *dev, const= char *name, int n); * For named output GPIO lines, use qdev_connect_gpio_out_named(). */ void qdev_connect_gpio_out(DeviceState *dev, int n, qemu_irq pin); + /** * qdev_connect_gpio_out: Connect one of a device's anonymous output GPIO = lines * @dev: Device whose GPIO to connect @@ -524,6 +530,7 @@ void qdev_connect_gpio_out(DeviceState *dev, int n, qem= u_irq pin); */ void qdev_connect_gpio_out_named(DeviceState *dev, const char *name, int n, qemu_irq pin); + /** * qdev_get_gpio_out_connector: Get the qemu_irq connected to an output GP= IO * @dev: Device whose output GPIO we are interested in @@ -541,6 +548,7 @@ void qdev_connect_gpio_out_named(DeviceState *dev, cons= t char *name, int n, * by the platform-bus subsystem. */ qemu_irq qdev_get_gpio_out_connector(DeviceState *dev, const char *name, i= nt n); + /** * qdev_intercept_gpio_out: Intercept an existing GPIO connection * @dev: Device to intercept the outbound GPIO line from @@ -582,6 +590,7 @@ BusState *qdev_get_child_bus(DeviceState *dev, const ch= ar *name); * hold of an input GPIO line to manipulate it. */ void qdev_init_gpio_in(DeviceState *dev, qemu_irq_handler handler, int n); + /** * qdev_init_gpio_out: create an array of anonymous output GPIO lines * @dev: Device to create output GPIOs for @@ -610,6 +619,7 @@ void qdev_init_gpio_in(DeviceState *dev, qemu_irq_handl= er handler, int n); * handler. */ void qdev_init_gpio_out(DeviceState *dev, qemu_irq *pins, int n); + /** * qdev_init_gpio_out: create an array of named output GPIO lines * @dev: Device to create output GPIOs for @@ -623,6 +633,7 @@ void qdev_init_gpio_out(DeviceState *dev, qemu_irq *pin= s, int n); */ void qdev_init_gpio_out_named(DeviceState *dev, qemu_irq *pins, const char *name, int n); + /** * qdev_init_gpio_in_named_with_opaque: create an array of input GPIO lines * for the specified device --=20 2.33.1 From nobody Sun May 19 12:45:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.53 as permitted sender) client-ip=209.85.221.53; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f53.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1639832690; cv=none; d=zohomail.com; s=zohoarc; b=QWZsO7XG/VTqqFH77Qja1bu7oHotVFCIvIFON2K8MFMiaXQaC89CyFDurUJvX78E/ph98syMXoj7z8H82yYk7zlUkdXlSppNsTCc4IlQ64UBay7IQ56gn24wLtwiEmJRu76Dc06bTVrM8Yrjl7p66R/mywMVNhbW8NkYM22NTto= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639832690; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=JR83GSnIQSf/gotcsojhbGa6MQnVjlAzL2fPx52q0GE=; b=NuPHIQiyMOKVGuI0V5gkSbLS/M5hg6iY8Lm2aG8QaNUaYdGhApTy+twPQz+XeGdwpDBuJJRmv9oAMQfYsdHmJCX3TjzahUCaJIYipfbUcgtkp89vb8y2lLqVBGKRcP2shhA+aPwxbKEHAEL4ZOJdB/m+hpBy6ozRZtOcIi5ehJU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by mx.zohomail.com with SMTPS id 1639832690893361.5125662721821; Sat, 18 Dec 2021 05:04:50 -0800 (PST) Received: by mail-wr1-f53.google.com with SMTP id j9so9479051wrc.0 for ; Sat, 18 Dec 2021 05:04:50 -0800 (PST) Return-Path: Return-Path: Received: from x1w.. (174.red-83-50-185.dynamicip.rima-tde.net. [83.50.185.174]) by smtp.gmail.com with ESMTPSA id h1sm10276981wrf.33.2021.12.18.05.04.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Dec 2021 05:04:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JR83GSnIQSf/gotcsojhbGa6MQnVjlAzL2fPx52q0GE=; b=XCRRY13YbQg7C7Jfke5MOtxJbewc82LW1pEWww3XqG9HgHyD9jQL+YG0psdUNHHIqO 0fOWlllFRWQLefRdli8QPet+y2VSYcxJQWv9WIgesIleWdwgQTeAEQGa+m4RnZ4uZvcT SxX5h59doT3u77naosGpKbu2TnywB0W6Qo2pRWj5TTZ/+1I00YXCZt2OYgR/4jK2QxS9 GMYmokIL8i4rIokNnximxChKMpZf/UHmkVbEzBB07K7/YYxWThYE49R4S3Fu9I1+qo4o VPAc5VHRpyBVQOYFT9lrfcLM/f8hgBo8iz1Pkt5TkQiEHkuf4h1f9Z5aGxC+VKG/fbgS uyNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=JR83GSnIQSf/gotcsojhbGa6MQnVjlAzL2fPx52q0GE=; b=CR8AoMu8XgNbDyo049vmjRtWRdNRAuPTZc66B+vnapSTJHTpJMD/oKosVG3S/kIYgZ TIjox4GM3M3O9ZLpKucRQAuWizI6vbxounZKwJqFJZWlVVi4HVEJdVx23PkfgF/RKLgx VRDtt0USflpOFzlwXyYCtxrACDQuAHctHBAXo+WriDaOhjdwueE0YNYoRey9BtN1mZZR l69Xp0j6h3aaUF97u2J0KWqCt6r7mK+RnrjV/Fw3/q2d1y3VDg0wwDTM4vJwixeG9Wy+ Crr4/dGVOQ40RqJqgpBMCVc0k/hN5XclNOv1rsmdqXvA0b9A8QlP4Jh2a1+GLVQzUC7x ITgg== X-Gm-Message-State: AOAM533dg4VG3ZBnQLCO0w0BsT+oP5LG2TzO00TMzoH64QfPohqOviAp NRdK39kNE9ls9bO2pqUFp7g= X-Google-Smtp-Source: ABdhPJwqVcjYRet+XNFh+OWmWl9Xh/+qfKR/gI2eAXg628WJxfVrFxDET7oVLvBWHjjelDa28cu4jw== X-Received: by 2002:adf:eb05:: with SMTP id s5mr5956723wrn.448.1639832689087; Sat, 18 Dec 2021 05:04:49 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Yanan Wang , Richard Henderson , Eduardo Habkost , qemu-trivial@nongnu.org, Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 2/5] hw/qdev: Correct qdev_init_gpio_out_named() documentation Date: Sat, 18 Dec 2021 14:04:34 +0100 Message-Id: <20211218130437.1516929-3-f4bug@amsat.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211218130437.1516929-1-f4bug@amsat.org> References: <20211218130437.1516929-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1639832692129100001 qdev_init_gpio_out_named() is described as qdev_init_gpio_out(), and referring to itself in an endless loop, which is confusing. Fix. Reported-by: Yanan Wang Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Yanan Wang --- include/hw/qdev-core.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index 59a822ffceb..dcf20c69b89 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -621,7 +621,7 @@ void qdev_init_gpio_in(DeviceState *dev, qemu_irq_handl= er handler, int n); void qdev_init_gpio_out(DeviceState *dev, qemu_irq *pins, int n); =20 /** - * qdev_init_gpio_out: create an array of named output GPIO lines + * qdev_init_gpio_out_named: create an array of named output GPIO lines * @dev: Device to create output GPIOs for * @pins: Pointer to qemu_irq or qemu_irq array for the GPIO lines * @name: Name to give this array of GPIO lines --=20 2.33.1 From nobody Sun May 19 12:45:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.50 as permitted sender) client-ip=209.85.128.50; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f50.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1639832695; cv=none; d=zohomail.com; s=zohoarc; b=lmLh+qMQ/z5rn6OX6keLmWqbfJIHDjcspZHSN0gp++YK8RR0HL8cTZ2Dwo273cgjkXTH4d5Q69dI+ZQJ1KH9eyAZzS0xm7yRC+2Z1EAXwxpcZ5se6R89Se555i2V7MIpDoFbxfsGR43rsILXi8YMuTMseUl12gLYSPT6FrciK00= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639832695; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=4bKHxb95nFSAADwowuqlt0XUJr9p4AbCeYHUfbFYBto=; b=SwqJF8ED9OMZFzX3ltZYpXsWzH2eiN3Go3XdEjUZROA0TqejSDuSFS5TALonUyDcB2/bqHzJR1Z22Z4685ZmPW0x7Xn0FImsj8LJal0Ft3xrH9zbMnruh8TZZjiJ6JruILZXpKgpbQVNLzff0mH4Uf5qP27ZN37/v9pR5xsVW8w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by mx.zohomail.com with SMTPS id 1639832695770544.0575094378279; Sat, 18 Dec 2021 05:04:55 -0800 (PST) Received: by mail-wm1-f50.google.com with SMTP id a83-20020a1c9856000000b00344731e044bso3275861wme.1 for ; Sat, 18 Dec 2021 05:04:55 -0800 (PST) Return-Path: Return-Path: Received: from x1w.. (174.red-83-50-185.dynamicip.rima-tde.net. [83.50.185.174]) by smtp.gmail.com with ESMTPSA id t8sm13269522wmq.32.2021.12.18.05.04.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Dec 2021 05:04:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4bKHxb95nFSAADwowuqlt0XUJr9p4AbCeYHUfbFYBto=; b=Jf/yaXKR2rvRYppPqyZH4KBsZCy9yQjO+3cxiFjbwawun9yI4JlEECT0nuZl9WcQsd El8+wwip2GWXzsPPHfq01s2ZplCCv2UzyutBjegIPwXimuvo3ulGifGUR7n849Q4OoOo ZA50E0LPwLCf+9ADJYw7Gmckjy89NxJlZYhPFrwERsOlEx68UCGKwM2+VQClYXNdGFhN DfVHg8eZ0YScZZFqQv+Q8TFxtgEhpyx6lpUmlzact6wOkwBSNB+OsLTFRVwEgDnb4J2O HJtDFJKWFsXSwYLvU9+fR1tCHzJhnwqpOAglrFmf9jt649KGpq6V0cYX4a2AWyvOpMmY FncQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=4bKHxb95nFSAADwowuqlt0XUJr9p4AbCeYHUfbFYBto=; b=Dxoo9hFp4cCKaNeY3Ho4wSQH5IvAWhMbCMUdhJTC0VvwxbufVI/c0gSBaJqgIXvavd xBl9WiIBBpwbzcqEzJSnTvhck7KybfAiaGCRgEUOPgktsEobLPLUx8ELrz7Iki5Sfqj7 geUYvAomGjw7au68zOFHn1FcRBPgQbawj6e5/BuMNkVfTvcDEoRLPwOSqcTZSwMpGNQv XdLllPXntYUA4nwkeYM0FY+xpw7VtBytuvbGW+h21DNMgoNovbwDQMTrdZfGTKw5OHsN iINw+pvmDrVC0DNaUTSZFnBufhDeNWelVktMt6srkXGDpJqq1uMBB1GmjXdMr6IabLM/ Bq6Q== X-Gm-Message-State: AOAM532kD/3XS2KCG48QwJ9bIZ53Fmt2Lnt9lwqn4giBVD6X8kodxKRT yp23UvpMqSunekK60LaLJwM= X-Google-Smtp-Source: ABdhPJwm3SrZRDIDHIiDb6y2pSTFlCP+bVQURovf3iLgUgeX8U2ojrNb0PH7baXnn5CYjPVZyE44cw== X-Received: by 2002:a7b:c054:: with SMTP id u20mr6686218wmc.133.1639832693991; Sat, 18 Dec 2021 05:04:53 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Yanan Wang , Richard Henderson , Eduardo Habkost , qemu-trivial@nongnu.org, Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 3/5] hw/qdev: Correct qdev_connect_gpio_out_named() documentation Date: Sat, 18 Dec 2021 14:04:35 +0100 Message-Id: <20211218130437.1516929-4-f4bug@amsat.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211218130437.1516929-1-f4bug@amsat.org> References: <20211218130437.1516929-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1639832697209100001 qdev_connect_gpio_out_named() is described as qdev_connect_gpio_out(), and referring to itself in an endless loop, which is confusing. Fix. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Yanan Wang --- include/hw/qdev-core.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index dcf20c69b89..424c48daf6e 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -504,7 +504,8 @@ qemu_irq qdev_get_gpio_in_named(DeviceState *dev, const= char *name, int n); void qdev_connect_gpio_out(DeviceState *dev, int n, qemu_irq pin); =20 /** - * qdev_connect_gpio_out: Connect one of a device's anonymous output GPIO = lines + * qdev_connect_gpio_out_named: Connect one of a device's named output + * GPIO lines * @dev: Device whose GPIO to connect * @name: Name of the output GPIO array * @n: Number of the anonymous output GPIO line (which must be in range) @@ -526,7 +527,7 @@ void qdev_connect_gpio_out(DeviceState *dev, int n, qem= u_irq pin); * qemu_irqs at once, or to connect multiple outbound GPIOs to the * same qemu_irq; see qdev_connect_gpio_out() for details. * - * For named output GPIO lines, use qdev_connect_gpio_out_named(). + * For anonymous output GPIO lines, use qdev_connect_gpio_out(). */ void qdev_connect_gpio_out_named(DeviceState *dev, const char *name, int n, qemu_irq pin); --=20 2.33.1 From nobody Sun May 19 12:45:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.52 as permitted sender) client-ip=209.85.128.52; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f52.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1639832700; cv=none; d=zohomail.com; s=zohoarc; b=fQqPNEbGeTSsaNbC1686YVlIzmoHcxs62bNj97tKxcWoqnPh1sxaZeUupfCCMVas3jwQb2eN6ZkJhh8xnUMq0ToD5otI+NWQL9GRlnj7f+R3WbJYL5g/f5dHqxde5TDVaMxkn7LQ6Dz5Dfi9K+e/4ipE46+nQFbpwqzxbiiNy9Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639832700; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=GIRB66yypPPrKrwEsR87//zR2i3jDtWRs1HuHZDcrWg=; b=jOvCvHT0qyz9y0wLJWp79upW1FNu8GKQUdHLd7NIpubfVTSAvDdPdcCDVWO89Up0Mi/UFV9W+NPs7MlG0u4mnFn2HyQqbWJmRygjQthfQdP9519045IPekjYg0psK6TmkVDYrpD16XNqkhb7ntkvvADCR1eLeTgGCzhobodcIOc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by mx.zohomail.com with SMTPS id 1639832700240979.9578150386219; Sat, 18 Dec 2021 05:05:00 -0800 (PST) Received: by mail-wm1-f52.google.com with SMTP id b73so3465037wmd.0 for ; Sat, 18 Dec 2021 05:04:59 -0800 (PST) Return-Path: Return-Path: Received: from x1w.. (174.red-83-50-185.dynamicip.rima-tde.net. [83.50.185.174]) by smtp.gmail.com with ESMTPSA id o4sm8757967wmc.43.2021.12.18.05.04.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Dec 2021 05:04:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GIRB66yypPPrKrwEsR87//zR2i3jDtWRs1HuHZDcrWg=; b=Qb027waV4mbmfuORIRqAGvEgCBvkYqTvd3A38adXSokl7radPDN4ZoGtxoX4pT4RXV SdsC99+ZyJjfo3fwWxReSHeuD23zpAqolN99TK1bMYiWbjx7xUVAWk0+lPzkgUh37ojO zJ7GfIQEAHk3m7uwQCX0a9QLxKdsOt2LV0JdphsNFWWcJ0NjgAgJTRKIdB/rB3N5EHWs mytcqldg8aUCBhx9r1fDNQ9SYIdT99TNChg53KjKX39SFkOFoU3pp8iSveA+sPa/77yL RgNfZkCRD498XYck/5nwI6mYA8ZoJ1FmlPpqCmV72jn6tYpBd+R3Cn8FX83EezVZ6gI3 0/KQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=GIRB66yypPPrKrwEsR87//zR2i3jDtWRs1HuHZDcrWg=; b=DDiDLlpKepjio+JArGAvF5wKEuMs0Sq6KdOnTCWjb8E3rfVbN0rymQJWViCxBgZcvL Mltg7TIQ4KrA95No37p3hzoaDqP7qACQYktrx7zvhyqwOLWIAvD7OvdY5JOBHG48g+4f w1aQ2e95ZeKNFMzCQfcEfWV/sLjzhJrAEyaRgnz7SHaYRG/iEH2FxrOAfPqtG9i8dUYj Xgv2iZGHyHjOHtyIIKmdjbUdInck5VpwIyZTUCtjLWSHpYuvlxoj81FjTt68g2BgFodn HcQxML9Un7hyGDr5J4lQWTOUEdot0iNKSo4zmUGqpsRPp6Ma9q85/+rx540Gg7GZxmxc +eyw== X-Gm-Message-State: AOAM533gUrthwv9Yp5+vQ/X9x9/oWHZVGPdF30M8Hmlw5BYGKnv/Wp8R TaGaIxPsfHgAOUbIdK9xiSU= X-Google-Smtp-Source: ABdhPJzga44jJ38Mi7jDzm22dZ+3rQE4TCaz9skhBBO1E6Tj/g8xPcrfw5k6G3O5wCnql6RPVXwcIg== X-Received: by 2002:a1c:238c:: with SMTP id j134mr4451644wmj.5.1639832698527; Sat, 18 Dec 2021 05:04:58 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Yanan Wang , Richard Henderson , Eduardo Habkost , qemu-trivial@nongnu.org, Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 4/5] hw/qdev: Rename qdev_connect_gpio_out*() 'input_pin' parameter Date: Sat, 18 Dec 2021 14:04:36 +0100 Message-Id: <20211218130437.1516929-5-f4bug@amsat.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211218130437.1516929-1-f4bug@amsat.org> References: <20211218130437.1516929-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1639832702056100001 @pin is an input where we connect a device output. Rename it @input_pin to simplify the documentation. Reviewed-by: Yanan Wang Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/qdev-core.h | 6 +++--- hw/core/gpio.c | 13 +++++++------ 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index 424c48daf6e..d19c9417520 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -476,7 +476,7 @@ qemu_irq qdev_get_gpio_in_named(DeviceState *dev, const= char *name, int n); * qdev_connect_gpio_out: Connect one of a device's anonymous output GPIO = lines * @dev: Device whose GPIO to connect * @n: Number of the anonymous output GPIO line (which must be in range) - * @pin: qemu_irq to connect the output line to + * @input_pin: qemu_irq to connect the output line to * * This function connects an anonymous output GPIO line on a device * up to an arbitrary qemu_irq, so that when the device asserts that @@ -509,7 +509,7 @@ void qdev_connect_gpio_out(DeviceState *dev, int n, qem= u_irq pin); * @dev: Device whose GPIO to connect * @name: Name of the output GPIO array * @n: Number of the anonymous output GPIO line (which must be in range) - * @pin: qemu_irq to connect the output line to + * @input_pin: qemu_irq to connect the output line to * * This function connects an anonymous output GPIO line on a device * up to an arbitrary qemu_irq, so that when the device asserts that @@ -530,7 +530,7 @@ void qdev_connect_gpio_out(DeviceState *dev, int n, qem= u_irq pin); * For anonymous output GPIO lines, use qdev_connect_gpio_out(). */ void qdev_connect_gpio_out_named(DeviceState *dev, const char *name, int n, - qemu_irq pin); + qemu_irq input_pin); =20 /** * qdev_get_gpio_out_connector: Get the qemu_irq connected to an output GP= IO diff --git a/hw/core/gpio.c b/hw/core/gpio.c index 8e6b4f5edf3..80d07a6ec99 100644 --- a/hw/core/gpio.c +++ b/hw/core/gpio.c @@ -115,17 +115,18 @@ qemu_irq qdev_get_gpio_in(DeviceState *dev, int n) } =20 void qdev_connect_gpio_out_named(DeviceState *dev, const char *name, int n, - qemu_irq pin) + qemu_irq input_pin) { char *propname =3D g_strdup_printf("%s[%d]", name ? name : "unnamed-gpio-out", n); - if (pin && !OBJECT(pin)->parent) { + if (input_pin && !OBJECT(input_pin)->parent) { /* We need a name for object_property_set_link to work */ object_property_add_child(container_get(qdev_get_machine(), "/unattached"), - "non-qdev-gpio[*]", OBJECT(pin)); + "non-qdev-gpio[*]", OBJECT(input_pin)); } - object_property_set_link(OBJECT(dev), propname, OBJECT(pin), &error_ab= ort); + object_property_set_link(OBJECT(dev), propname, + OBJECT(input_pin), &error_abort); g_free(propname); } =20 @@ -165,9 +166,9 @@ qemu_irq qdev_intercept_gpio_out(DeviceState *dev, qemu= _irq icpt, return disconnected; } =20 -void qdev_connect_gpio_out(DeviceState *dev, int n, qemu_irq pin) +void qdev_connect_gpio_out(DeviceState *dev, int n, qemu_irq input_pin) { - qdev_connect_gpio_out_named(dev, NULL, n, pin); + qdev_connect_gpio_out_named(dev, NULL, n, input_pin); } =20 void qdev_pass_gpios(DeviceState *dev, DeviceState *container, --=20 2.33.1 From nobody Sun May 19 12:45:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) client-ip=209.85.221.52; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f52.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1639832704; cv=none; d=zohomail.com; s=zohoarc; b=RipDOpOwSk+aGSgJ2mUPZoyzWdTQIDi5QBXwMD0eQWMndgVfmUgVlmvRGl8tJXVpBLEL7JoRoazpm5UxI5ow37JZSbL33mXz4SmrP55gEZYscsRlvSzhWJuFn3q19hIHkJEEY0YWn9L58hOhuWgWfihbh7Hq4xRcvXt2IRjS4a4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639832704; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=8/1cFQTZGSmutFWyDr1r0PKcIlyY0ksRKQJO1ZCewVA=; b=bcBqHmsxs7JUNL/yvF2cmiwhbhVBHKdBnMN8g6N3LXfzeePOMg2BsFUiJpE+Iwe+xeWpFj2FH90vEKWK+k1X7P3cW1dxbJi1stOTpXqEEFP9WGe7FaEPI7GX/0BxPPGPtU8kcYYvubuXZcdhK/1OM24sycNR+s+pVIkj9AjacVw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mx.zohomail.com with SMTPS id 1639832704745220.0741598186802; Sat, 18 Dec 2021 05:05:04 -0800 (PST) Received: by mail-wr1-f52.google.com with SMTP id s1so9426668wrg.1 for ; Sat, 18 Dec 2021 05:05:04 -0800 (PST) Return-Path: Return-Path: Received: from x1w.. (174.red-83-50-185.dynamicip.rima-tde.net. [83.50.185.174]) by smtp.gmail.com with ESMTPSA id m17sm9929469wrw.11.2021.12.18.05.05.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Dec 2021 05:05:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8/1cFQTZGSmutFWyDr1r0PKcIlyY0ksRKQJO1ZCewVA=; b=HI1A2NgnIVCuzXwDavJARF8J3mH+LCFBBl1keRinrAJSUQuEagYX5kVJ/+hQGxWZqI S/jgykCdIUYD8hm5pKIFXmHXQjSz7Wflx4rtPK8acRNsXfTW66uO49rnTT1BYOpMYJ91 wK+G3BDaUfXSZGocRDvK7qlf9D5tK/tsKLaYiHoISPkOC4NppAqojRpW24NrjbOMMhUr DfzYY9L5lEyhQLUJmVfrcAMYO8xfiA68hCNU1a0dTdveeZqgX5W1VDF5GTXoGYx2vaPk +x6VFlH8c/0XYvHBsEcc/0G3RZp/pTERQk31Y/HmnQn3yCGKtaE6GKzgZchI1CVJZUP6 F2QA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=8/1cFQTZGSmutFWyDr1r0PKcIlyY0ksRKQJO1ZCewVA=; b=PKuOiP5dWc9up+kLvWyF7BTScogg6h1SOhV6LTx7YaMXI0vF3DnOeuzS48073FuSUZ mlwOmrUYdgSuIPqgHbB6JyD/yjk3F4gLxX+ZDk38YRp8go3Al4Yb7gD13S5motml+Q3a /89pokociDnCNiYcxGvTSlkvskV9uEobYyAJj9RjAN3IVU53ACOT7KqyeoO2oikohlta EgtKLVLKqxs+kyPACYVNED3v7cfCVwA9FClVgAICRIagGzdanazU1rICGR2m4sV5xw5N 9evH0ijwIKZxYC/JESmSCFJMbnaFsxBVmvE43oNPHmM3ZMvQZDdO6eE3cdiRzJlv81Le 0Jew== X-Gm-Message-State: AOAM5312V/41r/vqdCd6/Hu57THNYWji0kwFY3l8BGGf2d1vJm4a4Mnp IotFPVArXV3o6WxLXf7aWeI1P4DYJyM= X-Google-Smtp-Source: ABdhPJzinvdzh16oEvDcoKPyGLRL4VlpZWXSHHQeFx8690Y3ZRi0z4BitHYtQ/sL/2YBJelq3ljFvw== X-Received: by 2002:adf:d843:: with SMTP id k3mr466019wrl.303.1639832703030; Sat, 18 Dec 2021 05:05:03 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Yanan Wang , Richard Henderson , Eduardo Habkost , qemu-trivial@nongnu.org, Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 5/5] hw/input/pckbd: Open-code i8042_setup_a20_line() wrapper Date: Sat, 18 Dec 2021 14:04:37 +0100 Message-Id: <20211218130437.1516929-6-f4bug@amsat.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211218130437.1516929-1-f4bug@amsat.org> References: <20211218130437.1516929-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1639832706582100001 Since the named GPIO lines are a "public" interface to the device, we can directly call qdev_connect_gpio_out_named(), making it consistent with how the other A20 input source (port92) is wired. Suggested-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Yanan Wang --- include/hw/input/i8042.h | 1 - hw/i386/pc.c | 3 ++- hw/input/pckbd.c | 5 ----- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/include/hw/input/i8042.h b/include/hw/input/i8042.h index 1d90432daef..1cd53b8d221 100644 --- a/include/hw/input/i8042.h +++ b/include/hw/input/i8042.h @@ -21,6 +21,5 @@ void i8042_mm_init(qemu_irq kbd_irq, qemu_irq mouse_irq, MemoryRegion *region, ram_addr_t size, hwaddr mask); void i8042_isa_mouse_fake_event(ISAKBDState *isa); -void i8042_setup_a20_line(ISADevice *dev, qemu_irq a20_out); =20 #endif /* HW_INPUT_I8042_H */ diff --git a/hw/i386/pc.c b/hw/i386/pc.c index a2ef40ecbc2..e2f7cd4aec6 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1045,7 +1045,8 @@ static void pc_superio_init(ISABus *isa_bus, bool cre= ate_fdctrl, bool no_vmport) port92 =3D isa_create_simple(isa_bus, TYPE_PORT92); =20 a20_line =3D qemu_allocate_irqs(handle_a20_line_change, first_cpu, 2); - i8042_setup_a20_line(i8042, a20_line[0]); + qdev_connect_gpio_out_named(DEVICE(i8042), + I8042_A20_LINE, 0, a20_line[0]); qdev_connect_gpio_out_named(DEVICE(port92), PORT92_A20_LINE, 0, a20_line[1]); g_free(a20_line); diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c index baba62f357a..7fd4477d742 100644 --- a/hw/input/pckbd.c +++ b/hw/input/pckbd.c @@ -680,11 +680,6 @@ void i8042_isa_mouse_fake_event(ISAKBDState *isa) ps2_mouse_fake_event(s->mouse); } =20 -void i8042_setup_a20_line(ISADevice *dev, qemu_irq a20_out) -{ - qdev_connect_gpio_out_named(DEVICE(dev), I8042_A20_LINE, 0, a20_out); -} - static const VMStateDescription vmstate_kbd_isa =3D { .name =3D "pckbd", .version_id =3D 3, --=20 2.33.1