diff mbox

[v3,5/8] qdev: Register static properties as class properties

Message ID 20161027173030.3d0e341d@nial.brq.redhat.com
State New
Headers show

Commit Message

Igor Mammedov Oct. 27, 2016, 3:30 p.m. UTC 
On Thu, 27 Oct 2016 12:57:42 -0200
Eduardo Habkost <ehabkost@redhat.com> 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 <ehabkost@redhat.com> 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 <ehabkost@redhat.com>
> > > ---
> > > Changes series v1 -> v2:
> > > * (none)
> > > 
> > > Changes v2 -> v3:
> > > * Fix code alignemnt
> > >   * Reported-by: Igor Mammedov <imammedo@redhat.com>
> > > ---
> > >  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:


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.

Comments

Eduardo Habkost Oct. 27, 2016, 4:37 p.m. UTC | #1 
On Thu, Oct 27, 2016 at 05:30:30PM +0200, Igor Mammedov wrote:
[...]
> > > "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:

I'm considering simply squashing the fix below in 3/8, what do
you think?

> 
> 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.

I've grepped for PropertyInfo usage, and this seems to be the
only case where PropertyInfo structs are modified at runtime.
Igor Mammedov Oct. 29, 2016, 2 p.m. UTC | #2 
On Thu, 27 Oct 2016 14:37:28 -0200
Eduardo Habkost <ehabkost@redhat.com> wrote:

> On Thu, Oct 27, 2016 at 05:30:30PM +0200, Igor Mammedov wrote:
> [...]
> > > > "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:  
> 
> I'm considering simply squashing the fix below in 3/8, what do
> you think?
fine by me

> 
> > 
> > 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.  
> 
> I've grepped for PropertyInfo usage, and this seems to be the
> only case where PropertyInfo structs are modified at runtime.
>
diff mbox

Patch

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);
 }