migration: Rename save_live_setup() to save_setup()

[qemu.git] / qapi / qapi-dealloc-visitor.c

diff --git a/qapi/qapi-dealloc-visitor.c b/qapi/qapi-dealloc-visitor.c
index dc53545fa5a80ffd91f0c7aa73453682ef7975cd..fd6f9fb61cf621f2c6bea2b37d2075bbc13c0a25 100644 (file)
--- a/qapi/qapi-dealloc-visitor.c
+++ b/qapi/qapi-dealloc-visitor.c
@@ -1,6 +1,7 @@
 /*
  * Dealloc Visitor
  *
 /*
  * Dealloc Visitor
  *

+ * Copyright (C) 2012-2016 Red Hat, Inc.

  * Copyright IBM, Corp. 2011
  *
  * Authors:
  * Copyright IBM, Corp. 2011
  *
  * Authors:


@@ -11,124 +12,62 @@
  *
  */
 
  *
  */
 

+#include "qemu/osdep.h"

 #include "qapi/dealloc-visitor.h"
 #include "qemu/queue.h"
 #include "qemu-common.h"
 #include "qapi/qmp/types.h"
 #include "qapi/visitor-impl.h"
 
 #include "qapi/dealloc-visitor.h"
 #include "qemu/queue.h"
 #include "qemu-common.h"
 #include "qapi/qmp/types.h"
 #include "qapi/visitor-impl.h"
 

-typedef struct StackEntry
-{
-    void *value;
-    bool is_list_head;
-    QTAILQ_ENTRY(StackEntry) node;
-} StackEntry;
-

 struct QapiDeallocVisitor
 {
     Visitor visitor;
 struct QapiDeallocVisitor
 {
     Visitor visitor;

-    QTAILQ_HEAD(, StackEntry) stack;
-    bool is_list_head;

 };
 
 };
 

-static QapiDeallocVisitor *to_qov(Visitor *v)
-{
-    return container_of(v, QapiDeallocVisitor, visitor);
-}
-
-static void qapi_dealloc_push(QapiDeallocVisitor *qov, void *value)
-{
-    StackEntry *e = g_malloc0(sizeof(*e));
-
-    e->value = value;
-
-    /* see if we're just pushing a list head tracker */
-    if (value == NULL) {
-        e->is_list_head = true;
-    }
-    QTAILQ_INSERT_HEAD(&qov->stack, e, node);
-}
-
-static void *qapi_dealloc_pop(QapiDeallocVisitor *qov)
-{
-    StackEntry *e = QTAILQ_FIRST(&qov->stack);
-    QObject *value;
-    QTAILQ_REMOVE(&qov->stack, e, node);
-    value = e->value;
-    g_free(e);
-    return value;
-}
-
-static void qapi_dealloc_start_struct(Visitor *v, void **obj, const char *kind,
-                                      const char *name, size_t unused,
-                                      Error **errp)
+static void qapi_dealloc_start_struct(Visitor *v, const char *name, void **obj,
+                                      size_t unused, Error **errp)

 {
 {

-    QapiDeallocVisitor *qov = to_qov(v);
-    qapi_dealloc_push(qov, obj);

 }
 
 }
 

-static void qapi_dealloc_end_struct(Visitor *v, Error **errp)
+static void qapi_dealloc_end_struct(Visitor *v, void **obj)

 {
 {

-    QapiDeallocVisitor *qov = to_qov(v);
-    void **obj = qapi_dealloc_pop(qov);

     if (obj) {
         g_free(*obj);
     }
 }
 
     if (obj) {
         g_free(*obj);
     }
 }
 

-static void qapi_dealloc_start_implicit_struct(Visitor *v,
-                                               void **obj,
-                                               size_t size,
-                                               Error **errp)
+static void qapi_dealloc_start_alternate(Visitor *v, const char *name,
+                                         GenericAlternate **obj, size_t size,
+                                         Error **errp)

 {
 {

-    QapiDeallocVisitor *qov = to_qov(v);
-    qapi_dealloc_push(qov, obj);

 }
 
 }
 

-static void qapi_dealloc_end_implicit_struct(Visitor *v, Error **errp)
+static void qapi_dealloc_end_alternate(Visitor *v, void **obj)

 {
 {

-    QapiDeallocVisitor *qov = to_qov(v);
-    void **obj = qapi_dealloc_pop(qov);

     if (obj) {
         g_free(*obj);
     }
 }
 
     if (obj) {
         g_free(*obj);
     }
 }
 

-static void qapi_dealloc_start_list(Visitor *v, const char *name, Error **errp)
+static void qapi_dealloc_start_list(Visitor *v, const char *name,
+                                    GenericList **list, size_t size,
+                                    Error **errp)

 {
 {

-    QapiDeallocVisitor *qov = to_qov(v);
-    qapi_dealloc_push(qov, NULL);

 }
 
 }
 

-static GenericList *qapi_dealloc_next_list(Visitor *v, GenericList **listp,
-                                           Error **errp)
+static GenericList *qapi_dealloc_next_list(Visitor *v, GenericList *tail,
+                                           size_t size)

 {
 {

-    GenericList *list = *listp;
-    QapiDeallocVisitor *qov = to_qov(v);
-    StackEntry *e = QTAILQ_FIRST(&qov->stack);
-
-    if (e && e->is_list_head) {
-        e->is_list_head = false;
-        return list;
-    }
-
-    if (list) {
-        list = list->next;
-        g_free(*listp);
-        return list;
-    }
-
-    return NULL;
+    GenericList *next = tail->next;
+    g_free(tail);
+    return next;

 }
 
 }
 

-static void qapi_dealloc_end_list(Visitor *v, Error **errp)
+static void qapi_dealloc_end_list(Visitor *v, void **obj)

 {
 {

-    QapiDeallocVisitor *qov = to_qov(v);
-    void *obj = qapi_dealloc_pop(qov);
-    assert(obj == NULL); /* should've been list head tracker with no payload */

 }
 
 }
 

-static void qapi_dealloc_type_str(Visitor *v, char **obj, const char *name,
+static void qapi_dealloc_type_str(Visitor *v, const char *name, char **obj,

                                   Error **errp)
 {
     if (obj) {
                                   Error **errp)
 {
     if (obj) {


@@ -136,63 +75,65 @@ static void qapi_dealloc_type_str(Visitor *v, char **obj, const char *name,
     }
 }
 
     }
 }
 

-static void qapi_dealloc_type_int(Visitor *v, int64_t *obj, const char *name,
-                                  Error **errp)
+static void qapi_dealloc_type_int64(Visitor *v, const char *name, int64_t *obj,
+                                    Error **errp)

 {
 }
 
 {
 }
 

-static void qapi_dealloc_type_bool(Visitor *v, bool *obj, const char *name,
-                                   Error **errp)
+static void qapi_dealloc_type_uint64(Visitor *v, const char *name,
+                                     uint64_t *obj, Error **errp)

 {
 }
 
 {
 }
 

-static void qapi_dealloc_type_number(Visitor *v, double *obj, const char *name,
-                                     Error **errp)
+static void qapi_dealloc_type_bool(Visitor *v, const char *name, bool *obj,
+                                   Error **errp)

 {
 }
 
 {
 }
 

-static void qapi_dealloc_type_size(Visitor *v, uint64_t *obj, const char *name,
-                                   Error **errp)
+static void qapi_dealloc_type_number(Visitor *v, const char *name, double *obj,
+                                     Error **errp)

 {
 }
 
 {
 }
 

-static void qapi_dealloc_type_enum(Visitor *v, int *obj, const char *strings[],
-                                   const char *kind, const char *name,
-                                   Error **errp)
+static void qapi_dealloc_type_anything(Visitor *v, const char *name,
+                                       QObject **obj, Error **errp)

 {
 {

+    if (obj) {
+        qobject_decref(*obj);
+    }

 }
 
 }
 

-Visitor *qapi_dealloc_get_visitor(QapiDeallocVisitor *v)
+static void qapi_dealloc_type_null(Visitor *v, const char *name, Error **errp)

 {
 {

-    return &v->visitor;

 }
 
 }
 

-void qapi_dealloc_visitor_cleanup(QapiDeallocVisitor *v)
+static void qapi_dealloc_free(Visitor *v)

 {
 {

-    g_free(v);
+    g_free(container_of(v, QapiDeallocVisitor, visitor));

 }
 
 }
 

-QapiDeallocVisitor *qapi_dealloc_visitor_new(void)
+Visitor *qapi_dealloc_visitor_new(void)

 {
     QapiDeallocVisitor *v;
 
     v = g_malloc0(sizeof(*v));
 
 {
     QapiDeallocVisitor *v;
 
     v = g_malloc0(sizeof(*v));
 

+    v->visitor.type = VISITOR_DEALLOC;

     v->visitor.start_struct = qapi_dealloc_start_struct;
     v->visitor.end_struct = qapi_dealloc_end_struct;
     v->visitor.start_struct = qapi_dealloc_start_struct;
     v->visitor.end_struct = qapi_dealloc_end_struct;

-    v->visitor.start_implicit_struct = qapi_dealloc_start_implicit_struct;
-    v->visitor.end_implicit_struct = qapi_dealloc_end_implicit_struct;
+    v->visitor.start_alternate = qapi_dealloc_start_alternate;
+    v->visitor.end_alternate = qapi_dealloc_end_alternate;

     v->visitor.start_list = qapi_dealloc_start_list;
     v->visitor.next_list = qapi_dealloc_next_list;
     v->visitor.end_list = qapi_dealloc_end_list;
     v->visitor.start_list = qapi_dealloc_start_list;
     v->visitor.next_list = qapi_dealloc_next_list;
     v->visitor.end_list = qapi_dealloc_end_list;

-    v->visitor.type_enum = qapi_dealloc_type_enum;
-    v->visitor.type_int = qapi_dealloc_type_int;
+    v->visitor.type_int64 = qapi_dealloc_type_int64;
+    v->visitor.type_uint64 = qapi_dealloc_type_uint64;

     v->visitor.type_bool = qapi_dealloc_type_bool;
     v->visitor.type_str = qapi_dealloc_type_str;
     v->visitor.type_number = qapi_dealloc_type_number;
     v->visitor.type_bool = qapi_dealloc_type_bool;
     v->visitor.type_str = qapi_dealloc_type_str;
     v->visitor.type_number = qapi_dealloc_type_number;

-    v->visitor.type_size = qapi_dealloc_type_size;
-
-    QTAILQ_INIT(&v->stack);
+    v->visitor.type_any = qapi_dealloc_type_anything;
+    v->visitor.type_null = qapi_dealloc_type_null;
+    v->visitor.free = qapi_dealloc_free;

 
 

-    return v;
+    return &v->visitor;

 }
 }