From: Felix Wu <flwu@google.com>
- Added qtests to test gpio-set property for ASPEED.
- Added function to get uint in qdict.
Signed-off-by: Felix Wu <flwu@google.com>
---
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 char *value);
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)));
}
+/**
+ * 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"
#define AST2600_GPIO_BASE 0x1E780000
#define GPIO_ABCD_DATA_VALUE 0x000
#define GPIO_ABCD_DIRECTION 0x004
+static uint32_t qtest_qom_get_uint32(QTestState *s, const char *path,
+ const char *property)
+{
+ QDict *r;
+
+ uint32_t res;
+ r = qtest_qmp(s, "{ 'execute': 'qom-get', 'arguments': "
+ "{ 'path': %s, 'property': %s } }", path, property);
+ res = 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 = 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 = 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 = qtest_qmp(s, "{ 'execute': 'qom-get', 'arguments': "
+ "{ 'path': %s, 'property': %s } }", path, property);
+ b = 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 = (QTestState *)data;
-
+ const char path[] = "/machine/soc/gpio";
/*
* gpioV4-7 occupy bits within a single 32-bit value, so we want to make
* 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]") == 0x0);
+ qtest_qom_set_uint32(s, path, "gpio-set[4]", 0xa000);
+ g_assert(qtest_qom_get_uint32(s, path, "gpio-set[4]") == 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 following
+ * info:
+ * {key: "class", value: "GenericError"}
+ *
+ * For pins, it should follow "gpio%2[A-Z]%1d" or "gpio%3[18A-E]%1d" format.
+ */
+ const char error_msg[] = "GenericError";
+ const char error_msg_key[] = "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));
}
static void test_set_input_pins(const void *data)
--
2.51.0.788.g6d19910ace-googOn 10/15/25 03:18, Coco Li wrote:
> From: Felix Wu <flwu@google.com>
>
> - Added qtests to test gpio-set property for ASPEED.
> - Added function to get uint in qdict.
>
> Signed-off-by: Felix Wu <flwu@google.com>
> ---
> include/qobject/qdict.h | 1 +
> qobject/qdict.c | 13 ++++
> tests/qtest/aspeed_gpio-test.c | 105 ++++++++++++++++++++++++++++++---
> 3 files changed, 110 insertions(+), 9 deletions(-)
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Thanks,
C.
>
> 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 char *value);
>
> 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)));
> }
>
> +/**
> + * 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"
>
> #define AST2600_GPIO_BASE 0x1E780000
>
> #define GPIO_ABCD_DATA_VALUE 0x000
> #define GPIO_ABCD_DIRECTION 0x004
>
> +static uint32_t qtest_qom_get_uint32(QTestState *s, const char *path,
> + const char *property)
> +{
> + QDict *r;
> +
> + uint32_t res;
> + r = qtest_qmp(s, "{ 'execute': 'qom-get', 'arguments': "
> + "{ 'path': %s, 'property': %s } }", path, property);
> + res = 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 = 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 = 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 = qtest_qmp(s, "{ 'execute': 'qom-get', 'arguments': "
> + "{ 'path': %s, 'property': %s } }", path, property);
> + b = 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 = (QTestState *)data;
> -
> + const char path[] = "/machine/soc/gpio";
> /*
> * gpioV4-7 occupy bits within a single 32-bit value, so we want to make
> * 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]") == 0x0);
> + qtest_qom_set_uint32(s, path, "gpio-set[4]", 0xa000);
> + g_assert(qtest_qom_get_uint32(s, path, "gpio-set[4]") == 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 following
> + * info:
> + * {key: "class", value: "GenericError"}
> + *
> + * For pins, it should follow "gpio%2[A-Z]%1d" or "gpio%3[18A-E]%1d" format.
> + */
> + const char error_msg[] = "GenericError";
> + const char error_msg_key[] = "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));
> }
>
> static void test_set_input_pins(const void *data)
© 2016 - 2025 Red Hat, Inc.