0a122b
From d8f12c525de1b28b9505d38842b5dece8cbcd61a Mon Sep 17 00:00:00 2001
0a122b
Message-Id: <d8f12c525de1b28b9505d38842b5dece8cbcd61a.1387298827.git.minovotn@redhat.com>
0a122b
In-Reply-To: <3ed0fb61a3dc912ef036d7ef450bed192090709e.1387298827.git.minovotn@redhat.com>
0a122b
References: <3ed0fb61a3dc912ef036d7ef450bed192090709e.1387298827.git.minovotn@redhat.com>
0a122b
From: "Michael S. Tsirkin" <mst@redhat.com>
0a122b
Date: Tue, 17 Dec 2013 15:17:50 +0100
0a122b
Subject: [PATCH 24/56] qom: cleanup struct Error references
0a122b
0a122b
RH-Author: Michael S. Tsirkin <mst@redhat.com>
0a122b
Message-id: <1387293161-4085-25-git-send-email-mst@redhat.com>
0a122b
Patchwork-id: 56330
0a122b
O-Subject: [PATCH qemu-kvm RHEL7.0 v2 24/57] qom: cleanup struct Error references
0a122b
Bugzilla: 1034876
0a122b
RH-Acked-by: Igor Mammedov <imammedo@redhat.com>
0a122b
RH-Acked-by: Marcel Apfelbaum <marcel.a@redhat.com>
0a122b
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
0a122b
0a122b
now that a typedef for struct Error is available,
0a122b
use it in qom/object.h to match coding style rules.
0a122b
0a122b
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
0a122b
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
0a122b
Tested-by: Gerd Hoffmann <kraxel@redhat.com>
0a122b
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
0a122b
Tested-by: Igor Mammedov <imammedo@redhat.com>
0a122b
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
0a122b
(cherry picked from commit e82df24873970742778e4a960f059ba9f8b1b2a7)
0a122b
---
0a122b
 include/qom/object.h | 50 +++++++++++++++++++++++++-------------------------
0a122b
 1 file changed, 25 insertions(+), 25 deletions(-)
0a122b
0a122b
Signed-off-by: Michal Novotny <minovotn@redhat.com>
0a122b
---
0a122b
 include/qom/object.h | 50 +++++++++++++++++++++++++-------------------------
0a122b
 1 file changed, 25 insertions(+), 25 deletions(-)
0a122b
0a122b
diff --git a/include/qom/object.h b/include/qom/object.h
0a122b
index c37f3ca..dbe1413 100644
0a122b
--- a/include/qom/object.h
0a122b
+++ b/include/qom/object.h
0a122b
@@ -301,7 +301,7 @@ typedef void (ObjectPropertyAccessor)(Object *obj,
0a122b
                                       struct Visitor *v,
0a122b
                                       void *opaque,
0a122b
                                       const char *name,
0a122b
-                                      struct Error **errp);
0a122b
+                                      Error **errp);
0a122b
 
0a122b
 /**
0a122b
  * ObjectPropertyRelease:
0a122b
@@ -785,9 +785,9 @@ void object_property_add(Object *obj, const char *name, const char *type,
0a122b
                          ObjectPropertyAccessor *get,
0a122b
                          ObjectPropertyAccessor *set,
0a122b
                          ObjectPropertyRelease *release,
0a122b
-                         void *opaque, struct Error **errp);
0a122b
+                         void *opaque, Error **errp);
0a122b
 
0a122b
-void object_property_del(Object *obj, const char *name, struct Error **errp);
0a122b
+void object_property_del(Object *obj, const char *name, Error **errp);
0a122b
 
0a122b
 /**
0a122b
  * object_property_find:
0a122b
@@ -798,7 +798,7 @@ void object_property_del(Object *obj, const char *name, struct Error **errp);
0a122b
  * Look up a property for an object and return its #ObjectProperty if found.
0a122b
  */
0a122b
 ObjectProperty *object_property_find(Object *obj, const char *name,
0a122b
-                                     struct Error **errp);
0a122b
+                                     Error **errp);
0a122b
 
0a122b
 void object_unparent(Object *obj);
0a122b
 
0a122b
@@ -813,7 +813,7 @@ void object_unparent(Object *obj);
0a122b
  * Reads a property from a object.
0a122b
  */
0a122b
 void object_property_get(Object *obj, struct Visitor *v, const char *name,
0a122b
-                         struct Error **errp);
0a122b
+                         Error **errp);
0a122b
 
0a122b
 /**
0a122b
  * object_property_set_str:
0a122b
@@ -824,7 +824,7 @@ void object_property_get(Object *obj, struct Visitor *v, const char *name,
0a122b
  * Writes a string value to a property.
0a122b
  */
0a122b
 void object_property_set_str(Object *obj, const char *value,
0a122b
-                             const char *name, struct Error **errp);
0a122b
+                             const char *name, Error **errp);
0a122b
 
0a122b
 /**
0a122b
  * object_property_get_str:
0a122b
@@ -837,7 +837,7 @@ void object_property_set_str(Object *obj, const char *value,
0a122b
  * The caller should free the string.
0a122b
  */
0a122b
 char *object_property_get_str(Object *obj, const char *name,
0a122b
-                              struct Error **errp);
0a122b
+                              Error **errp);
0a122b
 
0a122b
 /**
0a122b
  * object_property_set_link:
0a122b
@@ -848,7 +848,7 @@ char *object_property_get_str(Object *obj, const char *name,
0a122b
  * Writes an object's canonical path to a property.
0a122b
  */
0a122b
 void object_property_set_link(Object *obj, Object *value,
0a122b
-                              const char *name, struct Error **errp);
0a122b
+                              const char *name, Error **errp);
0a122b
 
0a122b
 /**
0a122b
  * object_property_get_link:
0a122b
@@ -861,7 +861,7 @@ void object_property_set_link(Object *obj, Object *value,
0a122b
  * string or not a valid object path).
0a122b
  */
0a122b
 Object *object_property_get_link(Object *obj, const char *name,
0a122b
-                                 struct Error **errp);
0a122b
+                                 Error **errp);
0a122b
 
0a122b
 /**
0a122b
  * object_property_set_bool:
0a122b
@@ -872,7 +872,7 @@ Object *object_property_get_link(Object *obj, const char *name,
0a122b
  * Writes a bool value to a property.
0a122b
  */
0a122b
 void object_property_set_bool(Object *obj, bool value,
0a122b
-                              const char *name, struct Error **errp);
0a122b
+                              const char *name, Error **errp);
0a122b
 
0a122b
 /**
0a122b
  * object_property_get_bool:
0a122b
@@ -884,7 +884,7 @@ void object_property_set_bool(Object *obj, bool value,
0a122b
  * an error occurs (including when the property value is not a bool).
0a122b
  */
0a122b
 bool object_property_get_bool(Object *obj, const char *name,
0a122b
-                              struct Error **errp);
0a122b
+                              Error **errp);
0a122b
 
0a122b
 /**
0a122b
  * object_property_set_int:
0a122b
@@ -895,7 +895,7 @@ bool object_property_get_bool(Object *obj, const char *name,
0a122b
  * Writes an integer value to a property.
0a122b
  */
0a122b
 void object_property_set_int(Object *obj, int64_t value,
0a122b
-                             const char *name, struct Error **errp);
0a122b
+                             const char *name, Error **errp);
0a122b
 
0a122b
 /**
0a122b
  * object_property_get_int:
0a122b
@@ -907,7 +907,7 @@ void object_property_set_int(Object *obj, int64_t value,
0a122b
  * an error occurs (including when the property value is not an integer).
0a122b
  */
0a122b
 int64_t object_property_get_int(Object *obj, const char *name,
0a122b
-                                struct Error **errp);
0a122b
+                                Error **errp);
0a122b
 
0a122b
 /**
0a122b
  * object_property_set:
0a122b
@@ -921,7 +921,7 @@ int64_t object_property_get_int(Object *obj, const char *name,
0a122b
  * Writes a property to a object.
0a122b
  */
0a122b
 void object_property_set(Object *obj, struct Visitor *v, const char *name,
0a122b
-                         struct Error **errp);
0a122b
+                         Error **errp);
0a122b
 
0a122b
 /**
0a122b
  * object_property_parse:
0a122b
@@ -933,7 +933,7 @@ void object_property_set(Object *obj, struct Visitor *v, const char *name,
0a122b
  * Parses a string and writes the result into a property of an object.
0a122b
  */
0a122b
 void object_property_parse(Object *obj, const char *string,
0a122b
-                           const char *name, struct Error **errp);
0a122b
+                           const char *name, Error **errp);
0a122b
 
0a122b
 /**
0a122b
  * object_property_print:
0a122b
@@ -945,7 +945,7 @@ void object_property_parse(Object *obj, const char *string,
0a122b
  * caller shall free the string.
0a122b
  */
0a122b
 char *object_property_print(Object *obj, const char *name,
0a122b
-                            struct Error **errp);
0a122b
+                            Error **errp);
0a122b
 
0a122b
 /**
0a122b
  * object_property_get_type:
0a122b
@@ -956,7 +956,7 @@ char *object_property_print(Object *obj, const char *name,
0a122b
  * Returns:  The type name of the property.
0a122b
  */
0a122b
 const char *object_property_get_type(Object *obj, const char *name,
0a122b
-                                     struct Error **errp);
0a122b
+                                     Error **errp);
0a122b
 
0a122b
 /**
0a122b
  * object_get_root:
0a122b
@@ -1049,7 +1049,7 @@ Object *object_resolve_path_component(Object *parent, const gchar *part);
0a122b
  * The child object itself can be retrieved using object_property_get_link().
0a122b
  */
0a122b
 void object_property_add_child(Object *obj, const char *name,
0a122b
-                               Object *child, struct Error **errp);
0a122b
+                               Object *child, Error **errp);
0a122b
 
0a122b
 /**
0a122b
  * object_property_add_link:
0a122b
@@ -1072,7 +1072,7 @@ void object_property_add_child(Object *obj, const char *name,
0a122b
  */
0a122b
 void object_property_add_link(Object *obj, const char *name,
0a122b
                               const char *type, Object **child,
0a122b
-                              struct Error **errp);
0a122b
+                              Error **errp);
0a122b
 
0a122b
 /**
0a122b
  * object_property_add_str:
0a122b
@@ -1087,9 +1087,9 @@ void object_property_add_link(Object *obj, const char *name,
0a122b
  * property of type 'string'.
0a122b
  */
0a122b
 void object_property_add_str(Object *obj, const char *name,
0a122b
-                             char *(*get)(Object *, struct Error **),
0a122b
-                             void (*set)(Object *, const char *, struct Error **),
0a122b
-                             struct Error **errp);
0a122b
+                             char *(*get)(Object *, Error **),
0a122b
+                             void (*set)(Object *, const char *, Error **),
0a122b
+                             Error **errp);
0a122b
 
0a122b
 /**
0a122b
  * object_property_add_bool:
0a122b
@@ -1103,9 +1103,9 @@ void object_property_add_str(Object *obj, const char *name,
0a122b
  * property of type 'bool'.
0a122b
  */
0a122b
 void object_property_add_bool(Object *obj, const char *name,
0a122b
-                              bool (*get)(Object *, struct Error **),
0a122b
-                              void (*set)(Object *, bool, struct Error **),
0a122b
-                              struct Error **errp);
0a122b
+                              bool (*get)(Object *, Error **),
0a122b
+                              void (*set)(Object *, bool, Error **),
0a122b
+                              Error **errp);
0a122b
 
0a122b
 /**
0a122b
  * object_child_foreach:
0a122b
-- 
0a122b
1.7.11.7
0a122b