From d8f12c525de1b28b9505d38842b5dece8cbcd61a Mon Sep 17 00:00:00 2001

Message-Id: <d8f12c525de1b28b9505d38842b5dece8cbcd61a.1387298827.git.minovotn@redhat.com>

In-Reply-To: <3ed0fb61a3dc912ef036d7ef450bed192090709e.1387298827.git.minovotn@redhat.com>

References: <3ed0fb61a3dc912ef036d7ef450bed192090709e.1387298827.git.minovotn@redhat.com>

From: "Michael S. Tsirkin" <mst@redhat.com>

Date: Tue, 17 Dec 2013 15:17:50 +0100

Subject: [PATCH 24/56] qom: cleanup struct Error references

RH-Author: Michael S. Tsirkin <mst@redhat.com>

Message-id: <1387293161-4085-25-git-send-email-mst@redhat.com>

Patchwork-id: 56330

O-Subject: [PATCH qemu-kvm RHEL7.0 v2 24/57] qom: cleanup struct Error references

Bugzilla: 1034876

RH-Acked-by: Igor Mammedov <imammedo@redhat.com>

RH-Acked-by: Marcel Apfelbaum <marcel.a@redhat.com>

RH-Acked-by: Laszlo Ersek <lersek@redhat.com>

now that a typedef for struct Error is available,

use it in qom/object.h to match coding style rules.

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>

Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>

Tested-by: Gerd Hoffmann <kraxel@redhat.com>

Reviewed-by: Igor Mammedov <imammedo@redhat.com>

Tested-by: Igor Mammedov <imammedo@redhat.com>

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

(cherry picked from commit e82df24873970742778e4a960f059ba9f8b1b2a7)

---

 include/qom/object.h | 50 +++++++++++++++++++++++++-------------------------

 1 file changed, 25 insertions(+), 25 deletions(-)

Signed-off-by: Michal Novotny <minovotn@redhat.com>

---

 include/qom/object.h | 50 +++++++++++++++++++++++++-------------------------

 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/include/qom/object.h b/include/qom/object.h

index c37f3ca..dbe1413 100644

--- a/include/qom/object.h

+++ b/include/qom/object.h

@@ -301,7 +301,7 @@ typedef void (ObjectPropertyAccessor)(Object *obj,

                                       struct Visitor *v,

                                       void *opaque,

                                       const char *name,

-                                      struct Error **errp);

+                                      Error **errp);

 /**

  * ObjectPropertyRelease:

@@ -785,9 +785,9 @@ void object_property_add(Object *obj, const char *name, const char *type,

                          ObjectPropertyAccessor *get,

                          ObjectPropertyAccessor *set,

                          ObjectPropertyRelease *release,

-                         void *opaque, struct Error **errp);

+                         void *opaque, Error **errp);

-void object_property_del(Object *obj, const char *name, struct Error **errp);

+void object_property_del(Object *obj, const char *name, Error **errp);

 /**

  * object_property_find:

@@ -798,7 +798,7 @@ void object_property_del(Object *obj, const char *name, struct Error **errp);

  * Look up a property for an object and return its #ObjectProperty if found.

  */

 ObjectProperty *object_property_find(Object *obj, const char *name,

-                                     struct Error **errp);

+                                     Error **errp);

 void object_unparent(Object *obj);

@@ -813,7 +813,7 @@ void object_unparent(Object *obj);

  * Reads a property from a object.

  */

 void object_property_get(Object *obj, struct Visitor *v, const char *name,

-                         struct Error **errp);

+                         Error **errp);

 /**

  * object_property_set_str:

@@ -824,7 +824,7 @@ void object_property_get(Object *obj, struct Visitor *v, const char *name,

  * Writes a string value to a property.

  */

 void object_property_set_str(Object *obj, const char *value,

-                             const char *name, struct Error **errp);

+                             const char *name, Error **errp);

 /**

  * object_property_get_str:

@@ -837,7 +837,7 @@ void object_property_set_str(Object *obj, const char *value,

  * The caller should free the string.

  */

 char *object_property_get_str(Object *obj, const char *name,

-                              struct Error **errp);

+                              Error **errp);

 /**

  * object_property_set_link:

@@ -848,7 +848,7 @@ char *object_property_get_str(Object *obj, const char *name,

  * Writes an object's canonical path to a property.

  */

 void object_property_set_link(Object *obj, Object *value,

-                              const char *name, struct Error **errp);

+                              const char *name, Error **errp);

 /**

  * object_property_get_link:

@@ -861,7 +861,7 @@ void object_property_set_link(Object *obj, Object *value,

  * string or not a valid object path).

  */

 Object *object_property_get_link(Object *obj, const char *name,

-                                 struct Error **errp);

+                                 Error **errp);

 /**

  * object_property_set_bool:

@@ -872,7 +872,7 @@ Object *object_property_get_link(Object *obj, const char *name,

  * Writes a bool value to a property.

  */

 void object_property_set_bool(Object *obj, bool value,

-                              const char *name, struct Error **errp);

+                              const char *name, Error **errp);

 /**

  * object_property_get_bool:

@@ -884,7 +884,7 @@ void object_property_set_bool(Object *obj, bool value,

  * an error occurs (including when the property value is not a bool).

  */

 bool object_property_get_bool(Object *obj, const char *name,

-                              struct Error **errp);

+                              Error **errp);

 /**

  * object_property_set_int:

@@ -895,7 +895,7 @@ bool object_property_get_bool(Object *obj, const char *name,

  * Writes an integer value to a property.

  */

 void object_property_set_int(Object *obj, int64_t value,

-                             const char *name, struct Error **errp);

+                             const char *name, Error **errp);

 /**

  * object_property_get_int:

@@ -907,7 +907,7 @@ void object_property_set_int(Object *obj, int64_t value,

  * an error occurs (including when the property value is not an integer).

  */

 int64_t object_property_get_int(Object *obj, const char *name,

-                                struct Error **errp);

+                                Error **errp);

 /**

  * object_property_set:

@@ -921,7 +921,7 @@ int64_t object_property_get_int(Object *obj, const char *name,

  * Writes a property to a object.

  */

 void object_property_set(Object *obj, struct Visitor *v, const char *name,

-                         struct Error **errp);

+                         Error **errp);

 /**

  * object_property_parse:

@@ -933,7 +933,7 @@ void object_property_set(Object *obj, struct Visitor *v, const char *name,

  * Parses a string and writes the result into a property of an object.

  */

 void object_property_parse(Object *obj, const char *string,

-                           const char *name, struct Error **errp);

+                           const char *name, Error **errp);

 /**

  * object_property_print:

@@ -945,7 +945,7 @@ void object_property_parse(Object *obj, const char *string,

  * caller shall free the string.

  */

 char *object_property_print(Object *obj, const char *name,

-                            struct Error **errp);

+                            Error **errp);

 /**

  * object_property_get_type:

@@ -956,7 +956,7 @@ char *object_property_print(Object *obj, const char *name,

  * Returns:  The type name of the property.

  */

 const char *object_property_get_type(Object *obj, const char *name,

-                                     struct Error **errp);

+                                     Error **errp);

 /**

  * object_get_root:

@@ -1049,7 +1049,7 @@ Object *object_resolve_path_component(Object *parent, const gchar *part);

  * The child object itself can be retrieved using object_property_get_link().

  */

 void object_property_add_child(Object *obj, const char *name,

-                               Object *child, struct Error **errp);

+                               Object *child, Error **errp);

 /**

  * object_property_add_link:

@@ -1072,7 +1072,7 @@ void object_property_add_child(Object *obj, const char *name,

  */

 void object_property_add_link(Object *obj, const char *name,

                               const char *type, Object **child,

-                              struct Error **errp);

+                              Error **errp);

 /**

  * object_property_add_str:

@@ -1087,9 +1087,9 @@ void object_property_add_link(Object *obj, const char *name,

  * property of type 'string'.

  */

 void object_property_add_str(Object *obj, const char *name,

-                             char *(*get)(Object *, struct Error **),

-                             void (*set)(Object *, const char *, struct Error **),

-                             struct Error **errp);

+                             char *(*get)(Object *, Error **),

+                             void (*set)(Object *, const char *, Error **),

+                             Error **errp);

 /**

  * object_property_add_bool:

@@ -1103,9 +1103,9 @@ void object_property_add_str(Object *obj, const char *name,

  * property of type 'bool'.

  */

 void object_property_add_bool(Object *obj, const char *name,

-                              bool (*get)(Object *, struct Error **),

-                              void (*set)(Object *, bool, struct Error **),

-                              struct Error **errp);

+                              bool (*get)(Object *, Error **),

+                              void (*set)(Object *, bool, Error **),

+                              Error **errp);

 /**

  * object_child_foreach:

-- 

1.7.11.7