From nobody Sat Sep 6 18:12:21 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=reject dis=none) header.from=google.com ARC-Seal: i=1; a=rsa-sha256; t=1756938148; cv=none; d=zohomail.com; s=zohoarc; b=CF7Uk8puSwQ4YtBh1O2VxF0ViXt+lGp/Ja8FFp0NMfJmk9wW4+zbpdlLSByVCpWbS7HWGWBlNXSV+Hi8VFjWNPHiaYFdC/hJ4enIjglWAGaICigNre3IgGFG3pUfgwq0nT+3J7JsGia+99RywUXYUznZJtRb9s2sdOrCYvF7354= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756938148; h=Content-Type:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=+zcM05GvvS4GHeBuorcNVf0xKSlX7M5kidK6nG2nUik=; b=SdGcyAX43sb5PIPQ8BcN8cv7afcmFebf9qS+50K1kJD3Zkn7jA8GneN0l4fQFflN50sdsXORj4AdwTCpSFsEd1Qmre4vcfWE1dRbX5EDMiJwjob5yjvlDEhIuF2yL7ekimd57TxfnsRVC58HRST8MyUOeL1QYXpKGGiYSv5guLc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1756938148560360.6518161146338; Wed, 3 Sep 2025 15:22:28 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1utvrE-0005Cv-4f; Wed, 03 Sep 2025 18:21:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <3S7W4aAkKCuQROdOGUeGTMUUMRK.IUSWKSa-JKbKRTUTMTa.UXM@flex--lixiaoyan.bounces.google.com>) id 1utvBP-0005jv-50 for qemu-devel@nongnu.org; Wed, 03 Sep 2025 17:38:24 -0400 Received: from mail-pg1-x549.google.com ([2607:f8b0:4864:20::549]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <3S7W4aAkKCuQROdOGUeGTMUUMRK.IUSWKSa-JKbKRTUTMTa.UXM@flex--lixiaoyan.bounces.google.com>) id 1utvBN-0003Sl-Dt for qemu-devel@nongnu.org; Wed, 03 Sep 2025 17:38:22 -0400 Received: by mail-pg1-x549.google.com with SMTP id 41be03b00d2f7-b4f705186bbso192835a12.1 for ; Wed, 03 Sep 2025 14:38:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1756935499; x=1757540299; darn=nongnu.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=+zcM05GvvS4GHeBuorcNVf0xKSlX7M5kidK6nG2nUik=; b=N1mcdyl+PpiO6vqJ9ku8No1mCwHCfgdwSG4eV5i1Gm7W1rgHA8nwmPcx7s6FcmSDmU Lk5yr6VyoESLnFPuNJ33mki3gJq5o7pbV7EtoDKktWExEXV5eyHWFXF2DbJVulAu0b8E CZKgIGinJ4iEdkllWElmgDYranC7XzMWwWsCvLhbYzNwrMBgZvz1glOWaF/sps7h8XuV YJeRQt0zrfWJ6oI0VvJqyuXy7mcstSBSFCwg3idsC6wkxUWsXxHK8jPcVMx/aGT0dZ16 rtWOOCqgSQ9cYmjOmahM2SFtrZ7AGHlUF4K85x3zawlZuDftTGTNHx57Ioq90oVrYicD Yeuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756935499; x=1757540299; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=+zcM05GvvS4GHeBuorcNVf0xKSlX7M5kidK6nG2nUik=; b=LUdYxEhK8ZexedBuypZxRcDo1oPl8xSczaehe4hqU2XYBgUBPL3X4PPq9piDoDcj4x I4WTEtHQz0q2n45opA8HYpn+pJUEGNn+RuV8JZNOpAg3/2yrFqGfkbnhE9/yVv7v+J69 L70DC2oj542ERrHR8/XzkVQ9/xnHbCvW1VqkhIIhBfC24BtoDwLDoIX6FiSNWqA2dIEQ Z4p4hctFhFQbzFDfuKfK5RAb8FTOennWxK/AQvcrd61nYL5sWPNNUQy4Wn8UHYg3sVti 6n81gynhQixaUzhMz9SRubprqPD9zWh18ZlgEG4BDYYofIbHfadqzZjN39wQ4tP7cIXJ DGlQ== X-Forwarded-Encrypted: i=1; AJvYcCXtQK8Sw1qD5/OFq8ZAluRx+9Sa+1Kn2VwSZrEd1fWWRiPmITntKeang/IF3NzKkCP38oG5iUL/klMF@nongnu.org X-Gm-Message-State: AOJu0YzbXOZpgnp8kIMB2Q+jbEzIE+xGhk3JXFr6i4bn78ue7XAAdaGh oHxno3Qouqjofb7DFY/WbXuEtoscvCJLdK9XWYtDqKvx7kfCg3V77OOnMrxOhe4O5MoelDNO44o 0l4OzeIyifJZlW619Bg== X-Google-Smtp-Source: AGHT+IFcjX51J6O7Fyq91Ztstg7JQkQF43UdkglqQqw5eUmnPiM1PoCkackREdp2JddDcdT2E7C6UwTxO0nv0fY= X-Received: from pjbcz3.prod.google.com ([2002:a17:90a:d443:b0:329:b272:45a7]) (user=lixiaoyan job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:28cb:b0:327:b33e:39d5 with SMTP id 98e67ed59e1d1-328156e5d7emr23401472a91.37.1756935499113; Wed, 03 Sep 2025 14:38:19 -0700 (PDT) Date: Wed, 3 Sep 2025 21:38:06 +0000 In-Reply-To: <20250903213809.3779860-1-lixiaoyan@google.com> Mime-Version: 1.0 References: <20250903213809.3779860-1-lixiaoyan@google.com> X-Mailer: git-send-email 2.51.0.338.gd7d06c2dae-goog Message-ID: <20250903213809.3779860-3-lixiaoyan@google.com> Subject: [PATCH 2/5] tests/qtest: Add qtest for for ASPEED GPIO gpio-set property From: Coco Li To: peter.maydell@linaro.org, clg@kaod.org Cc: qemu-arm@nongnu.org, qemu-devel@nongnu.org, Felix Wu 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=2607:f8b0:4864:20::549; envelope-from=3S7W4aAkKCuQROdOGUeGTMUUMRK.IUSWKSa-JKbKRTUTMTa.UXM@flex--lixiaoyan.bounces.google.com; helo=mail-pg1-x549.google.com X-Spam_score_int: -86 X-Spam_score: -8.7 X-Spam_bar: -------- X-Spam_report: (-8.7 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, HK_RANDOM_FROM=0.938, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, USER_IN_DEF_DKIM_WL=-7.5 autolearn=no autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Wed, 03 Sep 2025 18:21:25 -0400 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @google.com) X-ZM-MESSAGEID: 1756938151323124100 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Felix Wu - Added qtests to test gpio-set property for ASPEED. - Added function to get uint in qdict. Signed-off-by: Felix Wu --- include/qobject/qdict.h | 1 + qobject/qdict.c | 13 ++++ tests/qtest/aspeed_gpio-test.c | 105 ++++++++++++++++++++++++++++++--- 3 files changed, 110 insertions(+), 9 deletions(-) diff --git a/include/qobject/qdict.h b/include/qobject/qdict.h index 903e6e5462..861996f08d 100644 --- a/include/qobject/qdict.h +++ b/include/qobject/qdict.h @@ -57,6 +57,7 @@ void qdict_put_str(QDict *qdict, const char *key, const c= har *value); =20 double qdict_get_double(const QDict *qdict, const char *key); int64_t qdict_get_int(const QDict *qdict, const char *key); +uint64_t qdict_get_uint(const QDict *qdict, const char *key); bool qdict_get_bool(const QDict *qdict, const char *key); QList *qdict_get_qlist(const QDict *qdict, const char *key); QDict *qdict_get_qdict(const QDict *qdict, const char *key); diff --git a/qobject/qdict.c b/qobject/qdict.c index a90ac9ae2f..0dafe6d421 100644 --- a/qobject/qdict.c +++ b/qobject/qdict.c @@ -209,6 +209,19 @@ int64_t qdict_get_int(const QDict *qdict, const char *= key) return qnum_get_int(qobject_to(QNum, qdict_get(qdict, key))); } =20 +/** + * qdict_get_uint(): Get an unsigned integer mapped by 'key' + * + * This function assumes that 'key' exists and it stores a + * QNum representable as uint. + * + * Return unsigned integer mapped by 'key'. + */ +uint64_t qdict_get_uint(const QDict *qdict, const char *key) +{ + return qnum_get_uint(qobject_to(QNum, qdict_get(qdict, key))); +} + /** * qdict_get_bool(): Get a bool mapped by 'key' * diff --git a/tests/qtest/aspeed_gpio-test.c b/tests/qtest/aspeed_gpio-test.c index 12675d4cbb..c2f9ca2298 100644 --- a/tests/qtest/aspeed_gpio-test.c +++ b/tests/qtest/aspeed_gpio-test.c @@ -27,28 +27,115 @@ #include "qemu/timer.h" #include "qobject/qdict.h" #include "libqtest-single.h" +#include "qemu/typedefs.h" =20 #define AST2600_GPIO_BASE 0x1E780000 =20 #define GPIO_ABCD_DATA_VALUE 0x000 #define GPIO_ABCD_DIRECTION 0x004 =20 +static uint32_t qtest_qom_get_uint32(QTestState *s, const char *path, + const char *property) +{ + QDict *r; + + uint32_t res; + r =3D qtest_qmp(s, "{ 'execute': 'qom-get', 'arguments': " + "{ 'path': %s, 'property': %s } }", path, property); + res =3D qdict_get_uint(r, "return"); + qobject_unref(r); + + return res; +} + +static void qtest_qom_set_uint32(QTestState *s, const char *path, + const char *property, uint32_t value) +{ + QDict *r; + + r =3D qtest_qmp(s, "{ 'execute': 'qom-set', 'arguments': " + "{ 'path': %s, 'property': %s, 'value': %" PRIu32 " }= }", + path, property, value); + qobject_unref(r); +} + +static const char *resp_get_error(QDict *r, const char* error_key) +{ + QDict *qdict; + + g_assert(r); + + qdict =3D qdict_get_qdict(r, "error"); + if (qdict) { + return qdict_get_str(qdict, error_key); + } + + return NULL; +} + +static bool qtest_qom_check_error(QTestState *s, const char *path, + const char *property, const char *error_= msg, + const char *error_msg_key) +{ + QDict *r; + bool b; + + r =3D qtest_qmp(s, "{ 'execute': 'qom-get', 'arguments': " + "{ 'path': %s, 'property': %s } }", path, property); + b =3D g_str_equal(resp_get_error(r, error_msg_key), error_msg); + qobject_unref(r); + + return b; +} + static void test_set_colocated_pins(const void *data) { QTestState *s =3D (QTestState *)data; - + const char path[] =3D "/machine/soc/gpio"; /* * gpioV4-7 occupy bits within a single 32-bit value, so we want to ma= ke * sure that modifying one doesn't affect the other. */ - qtest_qom_set_bool(s, "/machine/soc/gpio", "gpioV4", true); - qtest_qom_set_bool(s, "/machine/soc/gpio", "gpioV5", false); - qtest_qom_set_bool(s, "/machine/soc/gpio", "gpioV6", true); - qtest_qom_set_bool(s, "/machine/soc/gpio", "gpioV7", false); - g_assert(qtest_qom_get_bool(s, "/machine/soc/gpio", "gpioV4")); - g_assert(!qtest_qom_get_bool(s, "/machine/soc/gpio", "gpioV5")); - g_assert(qtest_qom_get_bool(s, "/machine/soc/gpio", "gpioV6")); - g_assert(!qtest_qom_get_bool(s, "/machine/soc/gpio", "gpioV7")); + qtest_qom_set_bool(s, path, "gpioV4", true); + qtest_qom_set_bool(s, path, "gpioV5", false); + qtest_qom_set_bool(s, path, "gpioV6", true); + qtest_qom_set_bool(s, path, "gpioV7", false); + g_assert(qtest_qom_get_bool(s, path, "gpioV4")); + g_assert(!qtest_qom_get_bool(s, path, "gpioV5")); + g_assert(qtest_qom_get_bool(s, path, "gpioV6")); + g_assert(!qtest_qom_get_bool(s, path, "gpioV7")); + + /* + * Testing the gpio-set[%d] properties, using individual gpio boolean + * properties to do cross check. + * We use gpioR4-7 for test, Setting them to be 0b1010. + */ + qtest_qom_set_uint32(s, path, "gpio-set[4]", 0x0); + g_assert(qtest_qom_get_uint32(s, path, "gpio-set[4]") =3D=3D 0x0); + qtest_qom_set_uint32(s, path, "gpio-set[4]", 0xa000); + g_assert(qtest_qom_get_uint32(s, path, "gpio-set[4]") =3D=3D 0xa000); + + g_assert(!qtest_qom_get_bool(s, path, "gpioR4")); + g_assert(qtest_qom_get_bool(s, path, "gpioR5")); + g_assert(!qtest_qom_get_bool(s, path, "gpioR6")); + g_assert(qtest_qom_get_bool(s, path, "gpioR7")); + + /* + * Testing the invalid indexing, the response info should contain foll= owing + * info: + * {key: "class", value: "GenericError"} + * + * For pins, it should follow "gpio%2[A-Z]%1d" or "gpio%3[18A-E]%1d" f= ormat. + */ + const char error_msg[] =3D "GenericError"; + const char error_msg_key[] =3D "class"; + + g_assert(qtest_qom_check_error(s, path, "gpioR+1", error_msg, + error_msg_key)); + g_assert(qtest_qom_check_error(s, path, "gpio-set[99]", error_msg, + error_msg_key)); + g_assert(qtest_qom_check_error(s, path, "gpio-set[-3]", error_msg, + error_msg_key)); } =20 static void test_set_input_pins(const void *data) --=20 2.51.0.338.gd7d06c2dae-goog