From nobody Mon Feb 9 09:43:21 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1601484638; cv=none; d=zohomail.com; s=zohoarc; b=V6orXv1pa9226kBdTd44fqmzgHNf9NVgFr+LGTGWf68VXsVYSNzUQ1b4t14AHhJAhg6ln7GqnEAPLGYuXOrIoL0+bCu1etnUn7OuQAvPFmfp8mLeSHii7ydMo1S411h8Qr2uY4FKLZaZNM9ghi4kQGsCuf/evoRkZzUfArxYa1w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601484638; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=ex4gpJ0pAFE1dfNikKPuxcXqvVmymiM2aiqFym1Iy/Y=; b=hTZEDrdoNO7S6jOme0nxiu5zB28IHitZVyvCrixkjGTwPE7INBNhg5WET0JofTb1NfYKZM9dQBQCPd1Jg2I7sye4Wi5gVfQyaJFUjWTNk91irYdTYep15NPJ/utG6hlazUuGlCq+3vB2gYdjIKJApcK2oTASDUxLcPbFX24ozJg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1601484638234593.9397916079694; Wed, 30 Sep 2020 09:50:38 -0700 (PDT) Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-480-3E1ck-EENzW0dp0lez4ryQ-1; Wed, 30 Sep 2020 12:50:31 -0400 Received: by mail-wr1-f69.google.com with SMTP id l9so817013wrq.20 for ; Wed, 30 Sep 2020 09:50:30 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (74.red-83-53-161.dynamicip.rima-tde.net. [83.53.161.74]) by smtp.gmail.com with ESMTPSA id l19sm3842702wmi.8.2020.09.30.09.50.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Sep 2020 09:50:28 -0700 (PDT) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601484634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ex4gpJ0pAFE1dfNikKPuxcXqvVmymiM2aiqFym1Iy/Y=; b=fzHzhtoulxwssc742+zu7HpOQ5UIaL5za750vytoKpr+jc8lxuEeLXcMrSWEesubck0fmO x4E6OF9Hr2TK1bXnsrAJ/dyhwELarL6pYQrQvnwWDtJTS6nmt5xZ9k5I6NQ/DODShRht9K CGin5QBAjKuMpDn0fbJc41Kw+LmQUzQ= X-MC-Unique: 3E1ck-EENzW0dp0lez4ryQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ex4gpJ0pAFE1dfNikKPuxcXqvVmymiM2aiqFym1Iy/Y=; b=lGR3or3pXA3rRctBC8yPbHmwk7BcJTJTKeEBxH9i0A9Uz6joUUes3cXKlqEFQ1MTjF 7EH1b0u6PxGKfpbmAGJIzQzCnsvpoxUNx7xE52pqmWvObIbjpDwmCYMQfcTYr4Olm+oW 1EHNn/RmXhgxx21JbVxB+jrzllDm9+K+7jSKSFCNSrNA8/sb1PqVrTBAKccWPTPMON4C BYEbBfM7E7Dt04eiWY1vtjL8NwUwbJZ89VF0VYz6mJ9K9+F1l9IpLcAbAGXPnjqvtfWG LrXQvrAAkkOdxwxsZfn0xuuc715n0CJKMUPUglXXGC+fUIU+REMKRYkCcBN9wkc4JsEM e5HA== X-Gm-Message-State: AOAM530XtnrjhozkysNAPIWPRfEI2Eh9U8MXLMAKccH1rJfj9wFQMC2h BIKgBiZlw/JnhNTMC99z7K5vMqltdKSM0oi3zMv7mw/DZtF/seMxHoHSDIwlmn2FHzhYiy8KyUK cCVmhzywO/yOIDg== X-Received: by 2002:a5d:4591:: with SMTP id p17mr4087802wrq.408.1601484629281; Wed, 30 Sep 2020 09:50:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzaxdidazBw5vpOugL9EXkBK5RJseRGSh4EGDFBeaOMYTSn9rB+tfKYUFxKWLnmit7u398T8g== X-Received: by 2002:a5d:4591:: with SMTP id p17mr4087771wrq.408.1601484629067; Wed, 30 Sep 2020 09:50:29 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Laurent Vivier Cc: Ronnie Sahlberg , Eric Blake , Kevin Wolf , Marcel Apfelbaum , Richard Henderson , Michael Roth , Eduardo Habkost , Peter Lieven , Markus Armbruster , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , qemu-block@nongnu.org, Paolo Bonzini , Max Reitz , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PATCH v3 07/11] hw/core/qdev-properties: Export some integer-related functions Date: Wed, 30 Sep 2020 18:49:45 +0200 Message-Id: <20200930164949.1425294-8-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200930164949.1425294-1-philmd@redhat.com> References: <20200930164949.1425294-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) We are going to split this file and reuse these static functions. Declare them in the local "qdev-prop-internal.h" header. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- v3: Also export qdev_propinfo_get_size32 introduced in commits 914e74cda9 ("qdev-properties: add size32 property type") and 031ffd9a61 ("qdev-properties: add getter for size32 and blocksize"). --- hw/core/qdev-prop-internal.h | 11 +++++++++ hw/core/qdev-properties.c | 46 +++++++++++++++++++----------------- 2 files changed, 35 insertions(+), 22 deletions(-) diff --git a/hw/core/qdev-prop-internal.h b/hw/core/qdev-prop-internal.h index 2a8c9a306a..9cf5cc1d51 100644 --- a/hw/core/qdev-prop-internal.h +++ b/hw/core/qdev-prop-internal.h @@ -15,5 +15,16 @@ void qdev_propinfo_set_enum(Object *obj, Visitor *v, con= st char *name, =20 void qdev_propinfo_set_default_value_enum(ObjectProperty *op, const Property *prop); +void qdev_propinfo_set_default_value_int(ObjectProperty *op, + const Property *prop); +void qdev_propinfo_set_default_value_uint(ObjectProperty *op, + const Property *prop); + +void qdev_propinfo_get_uint16(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp); +void qdev_propinfo_get_int32(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp); +void qdev_propinfo_get_size32(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp); =20 #endif diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c index 31dfe441e2..37e309077a 100644 --- a/hw/core/qdev-properties.c +++ b/hw/core/qdev-properties.c @@ -271,12 +271,14 @@ static void set_uint8(Object *obj, Visitor *v, const = char *name, void *opaque, visit_type_uint8(v, name, ptr, errp); } =20 -static void set_default_value_int(ObjectProperty *op, const Property *prop) +void qdev_propinfo_set_default_value_int(ObjectProperty *op, + const Property *prop) { object_property_set_default_int(op, prop->defval.i); } =20 -static void set_default_value_uint(ObjectProperty *op, const Property *pro= p) +void qdev_propinfo_set_default_value_uint(ObjectProperty *op, + const Property *prop) { object_property_set_default_uint(op, prop->defval.u); } @@ -285,13 +287,13 @@ const PropertyInfo qdev_prop_uint8 =3D { .name =3D "uint8", .get =3D get_uint8, .set =3D set_uint8, - .set_default_value =3D set_default_value_uint, + .set_default_value =3D qdev_propinfo_set_default_value_uint, }; =20 /* --- 16bit integer --- */ =20 -static void get_uint16(Object *obj, Visitor *v, const char *name, - void *opaque, Error **errp) +void qdev_propinfo_get_uint16(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp) { DeviceState *dev =3D DEVICE(obj); Property *prop =3D opaque; @@ -317,9 +319,9 @@ static void set_uint16(Object *obj, Visitor *v, const c= har *name, =20 const PropertyInfo qdev_prop_uint16 =3D { .name =3D "uint16", - .get =3D get_uint16, + .get =3D qdev_propinfo_get_uint16, .set =3D set_uint16, - .set_default_value =3D set_default_value_uint, + .set_default_value =3D qdev_propinfo_set_default_value_uint, }; =20 /* --- 32bit integer --- */ @@ -349,8 +351,8 @@ static void set_uint32(Object *obj, Visitor *v, const c= har *name, visit_type_uint32(v, name, ptr, errp); } =20 -static void get_int32(Object *obj, Visitor *v, const char *name, void *opa= que, - Error **errp) +void qdev_propinfo_get_int32(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp) { DeviceState *dev =3D DEVICE(obj); Property *prop =3D opaque; @@ -378,14 +380,14 @@ const PropertyInfo qdev_prop_uint32 =3D { .name =3D "uint32", .get =3D get_uint32, .set =3D set_uint32, - .set_default_value =3D set_default_value_uint, + .set_default_value =3D qdev_propinfo_set_default_value_uint, }; =20 const PropertyInfo qdev_prop_int32 =3D { .name =3D "int32", - .get =3D get_int32, + .get =3D qdev_propinfo_get_int32, .set =3D set_int32, - .set_default_value =3D set_default_value_int, + .set_default_value =3D qdev_propinfo_set_default_value_int, }; =20 /* --- 64bit integer --- */ @@ -444,14 +446,14 @@ const PropertyInfo qdev_prop_uint64 =3D { .name =3D "uint64", .get =3D get_uint64, .set =3D set_uint64, - .set_default_value =3D set_default_value_uint, + .set_default_value =3D qdev_propinfo_set_default_value_uint, }; =20 const PropertyInfo qdev_prop_int64 =3D { .name =3D "int64", .get =3D get_int64, .set =3D set_int64, - .set_default_value =3D set_default_value_int, + .set_default_value =3D qdev_propinfo_set_default_value_int, }; =20 /* --- string --- */ @@ -820,8 +822,8 @@ const PropertyInfo qdev_prop_pci_devfn =3D { =20 /* --- 32bit unsigned int 'size' type --- */ =20 -static void get_size32(Object *obj, Visitor *v, const char *name, void *op= aque, - Error **errp) +void qdev_propinfo_get_size32(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp) { DeviceState *dev =3D DEVICE(obj); Property *prop =3D opaque; @@ -861,9 +863,9 @@ static void set_size32(Object *obj, Visitor *v, const c= har *name, void *opaque, =20 const PropertyInfo qdev_prop_size32 =3D { .name =3D "size", - .get =3D get_size32, + .get =3D qdev_propinfo_get_size32, .set =3D set_size32, - .set_default_value =3D set_default_value_uint, + .set_default_value =3D qdev_propinfo_set_default_value_uint, }; =20 /* --- blocksize --- */ @@ -919,9 +921,9 @@ const PropertyInfo qdev_prop_blocksize =3D { .name =3D "size", .description =3D "A power of two between " MIN_BLOCK_SIZE_STR " and " MAX_BLOCK_SIZE_STR, - .get =3D get_size32, + .get =3D qdev_propinfo_get_size32, .set =3D set_blocksize, - .set_default_value =3D set_default_value_uint, + .set_default_value =3D qdev_propinfo_set_default_value_uint, }; =20 /* --- pci host address --- */ @@ -1190,7 +1192,7 @@ const PropertyInfo qdev_prop_arraylen =3D { .name =3D "uint32", .get =3D get_uint32, .set =3D set_prop_arraylen, - .set_default_value =3D set_default_value_uint, + .set_default_value =3D qdev_propinfo_set_default_value_uint, }; =20 /* --- public helpers --- */ @@ -1401,7 +1403,7 @@ const PropertyInfo qdev_prop_size =3D { .name =3D "size", .get =3D get_size, .set =3D set_size, - .set_default_value =3D set_default_value_uint, + .set_default_value =3D qdev_propinfo_set_default_value_uint, }; =20 /* --- object link property --- */ --=20 2.26.2