vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qom: Add helper function for getting user objects root 

Add object_get_objects_root() function which is a convenience for
obtaining the Object * located at /objects in the object
composition tree. Convert existing code over to use the new
API where appropriate.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
master
Daniel P. Berrange 2015-05-13 17:14:05 +01:00 committed by Andreas Färber
parent f08f9271bf
commit bc2256c4ae
5 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/qom/object.h
View File

@ -1026,6 +1026,18 @@ const char *object_property_get_type(Object *obj, const char *name,
*/ */
Object *object_get_root(void); Object *object_get_root(void);
/**
* object_get_objects_root:
*
* Get the container object that holds user created
* object instances. This is the object at path
* "/objects"
*
* Returns: the user object container
*/
Object *object_get_objects_root(void);
/** /**
* object_get_canonical_path_component: * object_get_canonical_path_component:
* *

4
iothread.c
View File

@ -19,8 +19,6 @@
#include "qmp-commands.h" #include "qmp-commands.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"
#define IOTHREADS_PATH "/objects"
typedef ObjectClass IOThreadClass; typedef ObjectClass IOThreadClass;
#define IOTHREAD_GET_CLASS(obj) \ #define IOTHREAD_GET_CLASS(obj) \
@ -160,7 +158,7 @@ IOThreadInfoList *qmp_query_iothreads(Error **errp)
{ {
IOThreadInfoList *head = NULL; IOThreadInfoList *head = NULL;
IOThreadInfoList **prev = &head; IOThreadInfoList **prev = &head;
Object *container = container_get(object_get_root(), IOTHREADS_PATH); Object *container = object_get_objects_root();
object_child_foreach(container, query_one_iothread, &prev); object_child_foreach(container, query_one_iothread, &prev);
return head; return head;

2
numa.c
View File

@ -485,7 +485,7 @@ MemdevList *qmp_query_memdev(Error **errp)
Object *obj; Object *obj;
MemdevList *list = NULL; MemdevList *list = NULL;
obj = object_resolve_path("/objects", NULL); obj = object_get_objects_root();
if (obj == NULL) { if (obj == NULL) {
return NULL; return NULL;
} }

6
qmp.c
View File

@ -651,7 +651,7 @@ void object_add(const char *type, const char *id, const QDict *qdict,
} }
} }
object_property_add_child(container_get(object_get_root(), "/objects"), object_property_add_child(object_get_objects_root(),
id, obj, &local_err); id, obj, &local_err);
if (local_err) { if (local_err) {
goto out; goto out;
@ -659,7 +659,7 @@ void object_add(const char *type, const char *id, const QDict *qdict,
user_creatable_complete(obj, &local_err); user_creatable_complete(obj, &local_err);
if (local_err) { if (local_err) {
object_property_del(container_get(object_get_root(), "/objects"), object_property_del(object_get_objects_root(),
id, &error_abort); id, &error_abort);
goto out; goto out;
} }
@ -706,7 +706,7 @@ void qmp_object_del(const char *id, Error **errp)
Object *container; Object *container;
Object *obj; Object *obj;
container = container_get(object_get_root(), "/objects"); container = object_get_objects_root();
obj = object_resolve_path_component(container, id); obj = object_resolve_path_component(container, id);
if (!obj) { if (!obj) {
error_setg(errp, "object id not found"); error_setg(errp, "object id not found");

5
qom/object.c
View File

@ -1054,6 +1054,11 @@ Object *object_get_root(void)
return root; return root;
} }
Object *object_get_objects_root(void)
{
return container_get(object_get_root(), "/objects");
}
static void object_get_child_property(Object *obj, Visitor *v, void *opaque, static void object_get_child_property(Object *obj, Visitor *v, void *opaque,
const char *name, Error **errp) const char *name, Error **errp)
{ {