These changes are the raw update to qemu-2.6.

[kvmfornfv.git] / qemu / qobject / qnull.c

diff --git a/qemu/qobject/qnull.c b/qemu/qobject/qnull.c
index 9873e26..c124d05 100644 (file)
--- a/qemu/qobject/qnull.c
+++ b/qemu/qobject/qnull.c
@@ -10,20 +10,11 @@
  * or later.  See the COPYING.LIB file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qapi/qmp/qobject.h"
 
-static void qnull_destroy_obj(QObject *obj)
-{
-    assert(0);
-}
-
-static const QType qnull_type = {
-    .code = QTYPE_QNULL,
-    .destroy = qnull_destroy_obj,
-};
-
 QObject qnull_ = {
-    .type = &qnull_type,
+    .type = QTYPE_QNULL,
     .refcnt = 1,
 };