Patchwork [for-1.4,v2] qom: Make object_resolve_path_component() path argument const

login
register
mail settings
Submitter Andreas Färber
Date Jan. 15, 2013, 1:55 a.m.
Message ID <1358214910-12581-1-git-send-email-afaerber@suse.de>
Download mbox | patch
Permalink /patch/211967/
State New
Headers show

Comments

Andreas Färber - Jan. 15, 2013, 1:55 a.m.
A usage with a hardcoded partial path such as

  object_resolve_path_component(obj, "foo")

is totally valid but currently leads to a compilation error. Fix this.

Signed-off-by: Andreas Färber <afaerber@suse.de>
---
 include/qom/object.h |    2 +-
 qom/object.c         |    2 +-
 2 Dateien geändert, 2 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-)
Stefan Hajnoczi - Jan. 15, 2013, 9:54 a.m.
On Tue, Jan 15, 2013 at 02:55:10AM +0100, Andreas Färber wrote:
> A usage with a hardcoded partial path such as
> 
>   object_resolve_path_component(obj, "foo")
> 
> is totally valid but currently leads to a compilation error. Fix this.
> 
> Signed-off-by: Andreas Färber <afaerber@suse.de>
> ---
>  include/qom/object.h |    2 +-
>  qom/object.c         |    2 +-
>  2 Dateien geändert, 2 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-)

Thanks, applied to the trivial patches tree:
https://github.com/stefanha/qemu/commits/trivial-patches

Stefan

Patch

diff --git a/include/qom/object.h b/include/qom/object.h
index d43b289..1ef2f0e 100644
--- a/include/qom/object.h
+++ b/include/qom/object.h
@@ -900,7 +900,7 @@  Object *object_resolve_path_type(const char *path, const char *typename,
  *
  * Returns: The resolved object or NULL on path lookup failure.
  */
-Object *object_resolve_path_component(Object *parent, gchar *part);
+Object *object_resolve_path_component(Object *parent, const gchar *part);
 
 /**
  * object_property_add_child:
diff --git a/qom/object.c b/qom/object.c
index 351b88c..03e6f24 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -1017,7 +1017,7 @@  gchar *object_get_canonical_path(Object *obj)
     return newpath;
 }
 
-Object *object_resolve_path_component(Object *parent, gchar *part)
+Object *object_resolve_path_component(Object *parent, const gchar *part)
 {
     ObjectProperty *prop = object_property_find(parent, part, NULL);
     if (prop == NULL) {