From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48237) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bzmda-0004Vn-Nr for qemu-devel@nongnu.org; Thu, 27 Oct 2016 11:30:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bzmdW-00019B-PR for qemu-devel@nongnu.org; Thu, 27 Oct 2016 11:30:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44746) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1bzmdW-00018s-I5 for qemu-devel@nongnu.org; Thu, 27 Oct 2016 11:30:34 -0400 Date: Thu, 27 Oct 2016 17:30:30 +0200 From: Igor Mammedov Message-ID: <20161027173030.3d0e341d@nial.brq.redhat.com> In-Reply-To: <20161027145742.GL5057@thinpad.lan.raisama.net> References: <1477499426-9550-1-git-send-email-ehabkost@redhat.com> <1477499426-9550-6-git-send-email-ehabkost@redhat.com> <20161027165139.2a6e630f@nial.brq.redhat.com> <20161027145742.GL5057@thinpad.lan.raisama.net> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v3 5/8] qdev: Register static properties as class properties List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eduardo Habkost Cc: qemu-devel@nongnu.org, Markus Armbruster , Andreas =?UTF-8?B?RsOkcmJlcg==?= , "Daniel P. Berrange" On Thu, 27 Oct 2016 12:57:42 -0200 Eduardo Habkost wrote: > On Thu, Oct 27, 2016 at 04:51:39PM +0200, Igor Mammedov wrote: > > On Wed, 26 Oct 2016 14:30:23 -0200 > > Eduardo Habkost wrote: > > > > > Instead of registering qdev static properties on instance_init, > > > register them as class properties, at qdev_class_set_props(). > > > > > > qdev_property_add_legacy() was replaced by an equivalent > > > qdev_class_property_add_legacy() function. > > > qdev_property_add_static(), on the other hand, can't be > > > eliminated yet because it is used by arm_cpu_post_init(). > > > > > > Signed-off-by: Eduardo Habkost > > > --- > > > Changes series v1 -> v2: > > > * (none) > > > > > > Changes v2 -> v3: > > > * Fix code alignemnt > > > * Reported-by: Igor Mammedov > > > --- > > > hw/core/qdev.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++---------- > > > 1 file changed, 59 insertions(+), 12 deletions(-) > > > > > > diff --git a/hw/core/qdev.c b/hw/core/qdev.c > > > index 85952e8..a88753c 100644 > > > --- a/hw/core/qdev.c > > > +++ b/hw/core/qdev.c > > > @@ -739,12 +739,12 @@ static void qdev_get_legacy_property(Object *obj, Visitor *v, > > > } > > > > > > /** > > > - * qdev_property_add_legacy: > > > - * @dev: Device to add the property to. > > > + * qdev_class_property_add_legacy: > > > + * @oc: Device to add the property to. > > s/Device/Class/ > > Thanks, I will fix it. > > > > > > > > * @prop: The qdev property definition. > > > * @errp: location to store error information. > > > * > > > - * Add a legacy QOM property to @dev for qdev property @prop. > > > + * Add a legacy QOM property to @oc for qdev property @prop. > > > * On error, store error in @errp. > > > * > > > * Legacy properties are string versions of QOM properties. The format of > > [...] > > > > "make V=1 check" fails for me with this patch applied: > > > > QTEST_QEMU_BINARY=aarch64-softmmu/qemu-system-aarch64 QTEST_QEMU_IMG=qemu-img MALLOC_PERTURB_=${MALLOC_PERTURB_:-$((RANDOM % 255 + 1))} gtester -k --verbose -m=quick tests/device-introspect-test tests/qom-test > > TEST: tests/device-introspect-test... (pid=275141) > > /aarch64/device/introspect/list: OK > > /aarch64/device/introspect/none: OK > > /aarch64/device/introspect/abstract: OK > > /aarch64/device/introspect/concrete: Unexpected error in object_property_find() at /home/imammedo/builds/qemu/qom/object.c:1002: > > Property '.disable_vnet_hdr' not found > > Oops! Caused by the e1000e PropertyInfo hack that I tried to > remove yesterday. See "e1000e: QOM property & configuration > cleanups". It's property registration ordering issue exposed by 3/8 simple this this series should include after 3/8: diff --git a/hw/net/e1000e.c b/hw/net/e1000e.c index 368d284..b26760d 100644 --- a/hw/net/e1000e.c +++ b/hw/net/e1000e.c @@ -671,7 +671,6 @@ static void e1000e_class_init(ObjectClass *class, void *data) dc->desc = "Intel 82574L GbE Controller"; dc->reset = e1000e_qdev_reset; dc->vmsd = &e1000e_vmstate; - device_class_set_props(dc, e1000e_properties); e1000e_prop_disable_vnet = qdev_prop_uint8; e1000e_prop_disable_vnet.description = "Do not use virtio headers, " @@ -683,6 +682,7 @@ static void e1000e_class_init(ObjectClass *class, void *data) e1000e_prop_subsys = qdev_prop_uint16; e1000e_prop_subsys.description = "PCI device Subsystem ID"; + device_class_set_props(dc, e1000e_properties); set_bit(DEVICE_CATEGORY_NETWORK, dc->categories); } or event better fix ordering issues first and then generate 3/8 on top of that. I wonder how many similar ordering 3/8 causes.