fixup! qom: Simplify and merge pointer property getters/setters

Commit Message

Eduardo Habkost Oct. 9, 2020, 8:09 p.m. UTC

On Fri, Oct 09, 2020 at 03:02:58PM -0500, Eric Blake wrote:
> On 10/9/20 2:15 PM, Eduardo Habkost wrote:
> > Both the property getter and setter for pointer properties can
> > simply call the visitor functions directly, instead of making
> > extra copies and requiring additional logic.
> > 
> > Remove the extra copying logic, and merge the getter and setter
> > functions in object_visit_uint*_ptr() accessors.
> > 
> > Signed-off-by: Eduardo Habkost <[e-mail]>
> > ---
> >  qom/object.c | 114 ++++++++++-----------------------------------------
> >  1 file changed, 22 insertions(+), 92 deletions(-)
> > 
> > diff --git a/qom/object.c b/qom/object.c
> > index 6b4dfc279a..3b343fd118 100644
> > --- a/qom/object.c
> > +++ b/qom/object.c
> > @@ -2496,119 +2496,57 @@ static void *pointer_property_get_ptr(Object *obj, PointerProperty *prop)
> >      }
> >  }
> >  
> > -static void property_get_uint8_ptr(Object *obj, Visitor *v, const char *name,
> > +static void property_visit_uint8_ptr(Object *obj, Visitor *v, const char *name,
> >                                     void *opaque, Error **errp)
> 
> Indentation is now off.  Several instances.

Oops.  Fixup applied locally.  Thanks!

Signed-off-by: Eduardo Habkost <[e-mail]>
---

Patch

diff --git a/qom/object.c b/qom/object.c
index 3b343fd118..9d3710dec5 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -2497,7 +2497,7 @@  static void *pointer_property_get_ptr(Object *obj, PointerProperty *prop)
 }
 
 static void property_visit_uint8_ptr(Object *obj, Visitor *v, const char *name,
-                                   void *opaque, Error **errp)
+                                     void *opaque, Error **errp)
 {
     PointerProperty *prop = opaque;
     uint8_t *field = pointer_property_get_ptr(obj, prop);
@@ -2505,7 +2505,7 @@  static void property_visit_uint8_ptr(Object *obj, Visitor *v, const char *name,
 }
 
 static void property_visit_uint16_ptr(Object *obj, Visitor *v, const char *name,
-                                    void *opaque, Error **errp)
+                                      void *opaque, Error **errp)
 {
     PointerProperty *prop = opaque;
     uint16_t *field = pointer_property_get_ptr(obj, prop);
@@ -2513,7 +2513,7 @@  static void property_visit_uint16_ptr(Object *obj, Visitor *v, const char *name,
 }
 
 static void property_visit_uint32_ptr(Object *obj, Visitor *v, const char *name,
-                                    void *opaque, Error **errp)
+                                      void *opaque, Error **errp)
 {
     PointerProperty *prop = opaque;
     uint32_t *field = pointer_property_get_ptr(obj, prop);
@@ -2521,7 +2521,7 @@  static void property_visit_uint32_ptr(Object *obj, Visitor *v, const char *name,
 }
 
 static void property_visit_uint64_ptr(Object *obj, Visitor *v, const char *name,
-                                    void *opaque, Error **errp)
+                                      void *opaque, Error **errp)
 {
     PointerProperty *prop = opaque;
     uint64_t *field = pointer_property_get_ptr(obj, prop);