hppa-softmmu.mak: express dependencies with Kconfig

[qemu.git] / qapi / string-output-visitor.c

diff --git a/qapi/string-output-visitor.c b/qapi/string-output-visitor.c
index 5ea395ab982575ec67ca2655e2bda57ba98e1d84..7ab64468d9a58a6a4529dba6a08435a17d07af36 100644 (file)
--- a/qapi/string-output-visitor.c
+++ b/qapi/string-output-visitor.c
@@ -58,12 +58,14 @@ struct StringOutputVisitor
     Visitor visitor;
     bool human;
     GString *string;
     Visitor visitor;
     bool human;
     GString *string;

+    char **result;

     ListMode list_mode;
     union {
         int64_t s;
         uint64_t u;
     } range_start, range_end;
     GList *ranges;
     ListMode list_mode;
     union {
         int64_t s;
         uint64_t u;
     } range_start, range_end;
     GList *ranges;

+    void *list; /* Only needed for sanity checking the caller */

 };
 
 static StringOutputVisitor *to_sov(Visitor *v)
 };
 
 static StringOutputVisitor *to_sov(Visitor *v)


@@ -83,8 +85,8 @@ static void string_output_set(StringOutputVisitor *sov, char *string)
 static void string_output_append(StringOutputVisitor *sov, int64_t a)
 {
     Range *r = g_malloc0(sizeof(*r));
 static void string_output_append(StringOutputVisitor *sov, int64_t a)
 {
     Range *r = g_malloc0(sizeof(*r));

-    r->begin = a;
-    r->end = a + 1;
+
+    range_set_bounds(r, a, a);

     sov->ranges = range_list_insert(sov->ranges, r);
 }
 
     sov->ranges = range_list_insert(sov->ranges, r);
 }
 


@@ -92,28 +94,28 @@ static void string_output_append_range(StringOutputVisitor *sov,
                                        int64_t s, int64_t e)
 {
     Range *r = g_malloc0(sizeof(*r));
                                        int64_t s, int64_t e)
 {
     Range *r = g_malloc0(sizeof(*r));

-    r->begin = s;
-    r->end = e + 1;
+
+    range_set_bounds(r, s, e);

     sov->ranges = range_list_insert(sov->ranges, r);
 }
 
 static void format_string(StringOutputVisitor *sov, Range *r, bool next,
                           bool human)
 {
     sov->ranges = range_list_insert(sov->ranges, r);
 }
 
 static void format_string(StringOutputVisitor *sov, Range *r, bool next,
                           bool human)
 {

-    if (r->end - r->begin > 1) {
+    if (range_lob(r) != range_upb(r)) {

         if (human) {
             g_string_append_printf(sov->string, "0x%" PRIx64 "-0x%" PRIx64,
         if (human) {
             g_string_append_printf(sov->string, "0x%" PRIx64 "-0x%" PRIx64,

-                                   r->begin, r->end - 1);
+                                   range_lob(r), range_upb(r));

 
         } else {
             g_string_append_printf(sov->string, "%" PRId64 "-%" PRId64,
 
         } else {
             g_string_append_printf(sov->string, "%" PRId64 "-%" PRId64,

-                                   r->begin, r->end - 1);
+                                   range_lob(r), range_upb(r));

         }
     } else {
         if (human) {
         }
     } else {
         if (human) {

-            g_string_append_printf(sov->string, "0x%" PRIx64, r->begin);
+            g_string_append_printf(sov->string, "0x%" PRIx64, range_lob(r));

         } else {
         } else {

-            g_string_append_printf(sov->string, "%" PRId64, r->begin);
+            g_string_append_printf(sov->string, "%" PRId64, range_lob(r));

         }
     }
     if (next) {
         }
     }
     if (next) {


@@ -209,10 +211,8 @@ static void print_type_size(Visitor *v, const char *name, uint64_t *obj,
                             Error **errp)
 {
     StringOutputVisitor *sov = to_sov(v);
                             Error **errp)
 {
     StringOutputVisitor *sov = to_sov(v);

-    static const char suffixes[] = { 'B', 'K', 'M', 'G', 'T', 'P', 'E' };
-    uint64_t div, val;
-    char *out;
-    int i;
+    uint64_t val;
+    char *out, *psize;

 
     if (!sov->human) {
         out = g_strdup_printf("%"PRIu64, *obj);
 
     if (!sov->human) {
         out = g_strdup_printf("%"PRIu64, *obj);


@@ -221,19 +221,11 @@ static void print_type_size(Visitor *v, const char *name, uint64_t *obj,
     }
 
     val = *obj;
     }
 
     val = *obj;

-
-    /* The exponent (returned in i) minus one gives us
-     * floor(log2(val * 1024 / 1000).  The correction makes us
-     * switch to the higher power when the integer part is >= 1000.
-     */
-    frexp(val / (1000.0 / 1024.0), &i);
-    i = (i - 1) / 10;
-    assert(i < ARRAY_SIZE(suffixes));
-    div = 1ULL << (i * 10);
-
-    out = g_strdup_printf("%"PRIu64" (%0.3g %c%s)", val,
-                          (double)val/div, suffixes[i], i ? "iB" : "");
+    psize = size_to_str(val);
+    out = g_strdup_printf("%"PRIu64" (%s)", val, psize);

     string_output_set(sov, out);
     string_output_set(sov, out);

+
+    g_free(psize);

 }
 
 static void print_type_bool(Visitor *v, const char *name, bool *obj,
 }
 
 static void print_type_bool(Visitor *v, const char *name, bool *obj,


@@ -264,6 +256,20 @@ static void print_type_number(Visitor *v, const char *name, double *obj,
     string_output_set(sov, g_strdup_printf("%f", *obj));
 }
 
     string_output_set(sov, g_strdup_printf("%f", *obj));
 }
 

+static void print_type_null(Visitor *v, const char *name, QNull **obj,
+                            Error **errp)
+{
+    StringOutputVisitor *sov = to_sov(v);
+    char *out;
+
+    if (sov->human) {
+        out = g_strdup("<null>");
+    } else {
+        out = g_strdup("");
+    }
+    string_output_set(sov, out);
+}
+

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


@@ -274,6 +280,7 @@ start_list(Visitor *v, const char *name, GenericList **list, size_t size,
     assert(sov->list_mode == LM_NONE);
     /* We don't support visits without a list */
     assert(list);
     assert(sov->list_mode == LM_NONE);
     /* We don't support visits without a list */
     assert(list);

+    sov->list = list;

     /* List handling is only needed if there are at least two elements */
     if (*list && (*list)->next) {
         sov->list_mode = LM_STARTED;
     /* List handling is only needed if there are at least two elements */
     if (*list && (*list)->next) {
         sov->list_mode = LM_STARTED;


@@ -291,10 +298,11 @@ static GenericList *next_list(Visitor *v, GenericList *tail, size_t size)
     return ret;
 }
 
     return ret;
 }
 

-static void end_list(Visitor *v)
+static void end_list(Visitor *v, void **obj)

 {
     StringOutputVisitor *sov = to_sov(v);
 
 {
     StringOutputVisitor *sov = to_sov(v);
 

+    assert(sov->list == obj);

     assert(sov->list_mode == LM_STARTED ||
            sov->list_mode == LM_END ||
            sov->list_mode == LM_NONE ||
     assert(sov->list_mode == LM_STARTED ||
            sov->list_mode == LM_END ||
            sov->list_mode == LM_NONE ||


@@ -302,16 +310,13 @@ static void end_list(Visitor *v)
     sov->list_mode = LM_NONE;
 }
 
     sov->list_mode = LM_NONE;
 }
 

-char *string_output_get_string(StringOutputVisitor *sov)
+static void string_output_complete(Visitor *v, void *opaque)

 {
 {

-    char *string = g_string_free(sov->string, false);
-    sov->string = NULL;
-    return string;
-}
+    StringOutputVisitor *sov = to_sov(v);

 
 

-Visitor *string_output_get_visitor(StringOutputVisitor *sov)
-{
-    return &sov->visitor;
+    assert(opaque == sov->result);
+    *sov->result = g_string_free(sov->string, false);
+    sov->string = NULL;

 }
 
 static void free_range(void *range, void *dummy)
 }
 
 static void free_range(void *range, void *dummy)


@@ -319,8 +324,10 @@ static void free_range(void *range, void *dummy)
     g_free(range);
 }
 
     g_free(range);
 }
 

-void string_output_visitor_cleanup(StringOutputVisitor *sov)
+static void string_output_free(Visitor *v)

 {
 {

+    StringOutputVisitor *sov = to_sov(v);
+

     if (sov->string) {
         g_string_free(sov->string, true);
     }
     if (sov->string) {
         g_string_free(sov->string, true);
     }


@@ -330,7 +337,7 @@ void string_output_visitor_cleanup(StringOutputVisitor *sov)
     g_free(sov);
 }
 
     g_free(sov);
 }
 

-StringOutputVisitor *string_output_visitor_new(bool human)
+Visitor *string_output_visitor_new(bool human, char **result)

 {
     StringOutputVisitor *v;
 
 {
     StringOutputVisitor *v;
 


@@ -338,6 +345,9 @@ StringOutputVisitor *string_output_visitor_new(bool human)
 
     v->string = g_string_new(NULL);
     v->human = human;
 
     v->string = g_string_new(NULL);
     v->human = human;

+    v->result = result;
+    *result = NULL;
+

     v->visitor.type = VISITOR_OUTPUT;
     v->visitor.type_int64 = print_type_int64;
     v->visitor.type_uint64 = print_type_uint64;
     v->visitor.type = VISITOR_OUTPUT;
     v->visitor.type_int64 = print_type_int64;
     v->visitor.type_uint64 = print_type_uint64;


@@ -345,9 +355,12 @@ StringOutputVisitor *string_output_visitor_new(bool human)
     v->visitor.type_bool = print_type_bool;
     v->visitor.type_str = print_type_str;
     v->visitor.type_number = print_type_number;
     v->visitor.type_bool = print_type_bool;
     v->visitor.type_str = print_type_str;
     v->visitor.type_number = print_type_number;

+    v->visitor.type_null = print_type_null;

     v->visitor.start_list = start_list;
     v->visitor.next_list = next_list;
     v->visitor.end_list = end_list;
     v->visitor.start_list = start_list;
     v->visitor.next_list = next_list;
     v->visitor.end_list = end_list;

+    v->visitor.complete = string_output_complete;
+    v->visitor.free = string_output_free;

 
 

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

 }
 }