From: Lu Gao <Lu.Gao@verisilicon.com>
To: Lu Gao <Lu.Gao@verisilicon.com>,
"qemu-devel@nongnu.org" <qemu-devel@nongnu.org>
Cc: "Jianxian Wen" <Jianxian.Wen@verisilicon.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Daniel P. Berrangé" <berrange@redhat.com>,
"Eduardo Habkost" <eduardo@habkost.net>
Subject: RE: [PATCH] qom/object_interfaces: Handle `len-` property first
Date: Tue, 24 Oct 2023 08:53:31 +0000 [thread overview]
Message-ID: <34781C803212B140A51E6B66D9092E5D02BEDA7B26@SHASXM06.verisilicon.com> (raw)
Message-ID: <20231024085331.BeSonkslcdvibZfz3BTYHh1FbYYoN7S381IbEE4sTMs@z> (raw)
In-Reply-To: <20230921141634.26233-1-lu.gao@verisilicon.com>
ping
https://patchew.org/QEMU/20230921141634.26233-1-lu.gao@verisilicon.com/
Could you please help review the patch?
Thanks.
B.R.
-----Original Message-----
From: Lu Gao
Sent: Thursday, September 21, 2023 10:17 PM
To: qemu-devel@nongnu.org
Cc: Lu Gao; Jianxian Wen; Paolo Bonzini; Daniel P. Berrangé; Eduardo Habkost
Subject: [PATCH] qom/object_interfaces: Handle `len-` property first
From: "Gao, Lu" <lu.gao@verisilicon.com>
Array property needs corresponding `len-` property set first to add
actual array properties. Then we need to make sure `len-` property is
set first before array property.
But when the model is used with like
`-device driver[,prop[=value][,...]]`
in QEMU command line options, this is not guaranteed in current
property set from qdict. Array property might be
handled before 'len-' property, then leads to an error.
Signed-off-by: Lu Gao <lu.gao@verisilicon.com>
Signed-off-by: Jianxian Wen <jianxian.wen@verisilicon.com>
---
qom/object_interfaces.c | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c
index 7d31589b04..87500401a4 100644
--- a/qom/object_interfaces.c
+++ b/qom/object_interfaces.c
@@ -18,6 +18,7 @@
#include "qapi/opts-visitor.h"
#include "qemu/config-file.h"
#include "qemu/keyval.h"
+#include "hw/qdev-properties.h"
bool user_creatable_complete(UserCreatable *uc, Error **errp)
{
@@ -52,8 +53,22 @@ static void object_set_properties_from_qdict(Object *obj, const QDict *qdict,
return;
}
for (e = qdict_first(qdict); e; e = qdict_next(qdict, e)) {
- if (!object_property_set(obj, e->key, v, errp)) {
- goto out;
+ /* set "len-" first for the array props to be allocated first */
+ if (strncmp(e->key, PROP_ARRAY_LEN_PREFIX,
+ strlen(PROP_ARRAY_LEN_PREFIX)) == 0) {
+ if (!object_property_set(obj, e->key, v, errp)) {
+ goto out;
+ }
+ }
+ }
+
+ for (e = qdict_first(qdict); e; e = qdict_next(qdict, e)) {
+ /* "len-" has been set above */
+ if (strncmp(e->key, PROP_ARRAY_LEN_PREFIX,
+ strlen(PROP_ARRAY_LEN_PREFIX)) != 0) {
+ if (!object_property_set(obj, e->key, v, errp)) {
+ goto out;
+ }
}
}
visit_check_struct(v, errp);
--
2.17.1
next prev parent reply other threads:[~2023-10-24 8:59 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-21 14:16 [PATCH] qom/object_interfaces: Handle `len-` property first Lu Gao
2023-10-24 8:53 ` Lu Gao via [this message]
2023-10-24 8:53 ` Lu Gao
2023-10-24 9:20 ` Daniel P. Berrangé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=34781C803212B140A51E6B66D9092E5D02BEDA7B26@SHASXM06.verisilicon.com \
--to=lu.gao@verisilicon.com \
--cc=Jianxian.Wen@verisilicon.com \
--cc=berrange@redhat.com \
--cc=eduardo@habkost.net \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).