Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Adding breaktrace & disabling timer migration"
[kvmfornfv.git]
/
qemu
/
qobject
/
qlist.c
diff --git
a/qemu/qobject/qlist.c
b/qemu/qobject/qlist.c
index
1ced0de
..
1ec74de
100644
(file)
--- a/
qemu/qobject/qlist.c
+++ b/
qemu/qobject/qlist.c
@@
-10,18
+10,12
@@
* See the COPYING.LIB file in the top-level directory.
*/
* See the COPYING.LIB file in the top-level directory.
*/
+#include "qemu/osdep.h"
#include "qapi/qmp/qlist.h"
#include "qapi/qmp/qobject.h"
#include "qemu/queue.h"
#include "qemu-common.h"
#include "qapi/qmp/qlist.h"
#include "qapi/qmp/qobject.h"
#include "qemu/queue.h"
#include "qemu-common.h"
-static void qlist_destroy_obj(QObject *obj);
-
-static const QType qlist_type = {
- .code = QTYPE_QLIST,
- .destroy = qlist_destroy_obj,
-};
-
/**
* qlist_new(): Create a new QList
*
/**
* qlist_new(): Create a new QList
*
@@
-32,8
+26,8
@@
QList *qlist_new(void)
QList *qlist;
qlist = g_malloc(sizeof(*qlist));
QList *qlist;
qlist = g_malloc(sizeof(*qlist));
+ qobject_init(QOBJECT(qlist), QTYPE_QLIST);
QTAILQ_INIT(&qlist->head);
QTAILQ_INIT(&qlist->head);
- QOBJECT_INIT(qlist, &qlist_type);
return qlist;
}
return qlist;
}
@@
-142,17
+136,16
@@
size_t qlist_size(const QList *qlist)
*/
QList *qobject_to_qlist(const QObject *obj)
{
*/
QList *qobject_to_qlist(const QObject *obj)
{
- if (qobject_type(obj) != QTYPE_QLIST) {
+ if (
!obj ||
qobject_type(obj) != QTYPE_QLIST) {
return NULL;
}
return NULL;
}
-
return container_of(obj, QList, base);
}
/**
* qlist_destroy_obj(): Free all the memory allocated by a QList
*/
return container_of(obj, QList, base);
}
/**
* qlist_destroy_obj(): Free all the memory allocated by a QList
*/
-
static
void qlist_destroy_obj(QObject *obj)
+void qlist_destroy_obj(QObject *obj)
{
QList *qlist;
QListEntry *entry, *next_entry;
{
QList *qlist;
QListEntry *entry, *next_entry;