Commit 1fb4c13e authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2016-06-30' into staging 



QAPI patches 2016-06-30

# gpg: Signature made Thu 30 Jun 2016 14:29:43 BST
# gpg:                using RSA key 0x3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>"
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* remotes/armbru/tags/pull-qapi-2016-06-30:
  qapi: Fix memleak in string visitors on int lists
  qapi: Simplify use of range.h
  range: Create range.c for code that should not be inline
  qapi: Fix crash on missing alternate member of QAPI struct
  checkpatch: There is no qemu_strtod()
  qobject: Correct JSON lexer grammar comments
  json-streamer: Don't leak tokens on incomplete parse

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents ddf31aa8 db486cc3

include/qemu/range.h

+21 −70
Original line number Diff line number Diff line 
/*

 * QEMU 64-bit address ranges

 *

 * Copyright (c) 2015-2016 Red Hat, Inc.

 *

 * This library is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public

 * License as published by the Free Software Foundation; either

 * version 2 of the License, or (at your option) any later version.

 *

 * This library is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

 * Lesser General Public License for more details.

 *

 * You should have received a copy of the GNU General Public

 * License along with this library; if not, see <http://www.gnu.org/licenses/>.

 *

 */



#ifndef QEMU_RANGE_H

#define QEMU_RANGE_H
@@ -59,75 +79,6 @@ static inline int ranges_overlap(uint64_t first1, uint64_t len1, 
    return !(last2 < first1 || last1 < first2);

}



/* 0,1 can merge with 1,2 but don't overlap */

static inline bool ranges_can_merge(Range *range1, Range *range2)

{

    return !(range1->end < range2->begin || range2->end < range1->begin);

}



static inline int range_merge(Range *range1, Range *range2)

{

    if (ranges_can_merge(range1, range2)) {

        if (range1->end < range2->end) {

            range1->end = range2->end;

        }

        if (range1->begin > range2->begin) {

            range1->begin = range2->begin;

        }

        return 0;

    }



    return -1;

}



static inline GList *g_list_insert_sorted_merged(GList *list,

                                                 gpointer data,

                                                 GCompareFunc func)

{

    GList *l, *next = NULL;

    Range *r, *nextr;



    if (!list) {

        list = g_list_insert_sorted(list, data, func);

        return list;

    }



    nextr = data;

    l = list;

    while (l && l != next && nextr) {

        r = l->data;

        if (ranges_can_merge(r, nextr)) {

            range_merge(r, nextr);

            l = g_list_remove_link(l, next);

            next = g_list_next(l);

            if (next) {

                nextr = next->data;

            } else {

                nextr = NULL;

            }

        } else {

            l = g_list_next(l);

        }

    }



    if (!l) {

        list = g_list_insert_sorted(list, data, func);

    }



    return list;

}



static inline gint range_compare(gconstpointer a, gconstpointer b)

{

    Range *ra = (Range *)a, *rb = (Range *)b;

    if (ra->begin == rb->begin && ra->end == rb->end) {

        return 0;

    } else if (range_get_last(ra->begin, ra->end) <

               range_get_last(rb->begin, rb->end)) {

        return -1;

    } else {

        return 1;

    }

}

GList *range_list_insert(GList *list, Range *data);



#endif

qapi/string-input-visitor.c

+4 −13
Original line number Diff line number Diff line
@@ -61,8 +61,7 @@ static int parse_str(StringInputVisitor *siv, const char *name, Error **errp) 
                cur = g_malloc0(sizeof(*cur));

                cur->begin = start;

                cur->end = start + 1;

                siv->ranges = g_list_insert_sorted_merged(siv->ranges, cur,

                                                          range_compare);

                siv->ranges = range_list_insert(siv->ranges, cur);

                cur = NULL;

                str = NULL;

            } else if (*endptr == '-') {
@@ -76,10 +75,7 @@ static int parse_str(StringInputVisitor *siv, const char *name, Error **errp) 
                        cur = g_malloc0(sizeof(*cur));

                        cur->begin = start;

                        cur->end = end + 1;

                        siv->ranges =

                            g_list_insert_sorted_merged(siv->ranges,

                                                        cur,

                                                        range_compare);

                        siv->ranges = range_list_insert(siv->ranges, cur);

                        cur = NULL;

                        str = NULL;

                    } else if (*endptr == ',') {
@@ -87,10 +83,7 @@ static int parse_str(StringInputVisitor *siv, const char *name, Error **errp) 
                        cur = g_malloc0(sizeof(*cur));

                        cur->begin = start;

                        cur->end = end + 1;

                        siv->ranges =

                            g_list_insert_sorted_merged(siv->ranges,

                                                        cur,

                                                        range_compare);

                        siv->ranges = range_list_insert(siv->ranges, cur);

                        cur = NULL;

                    } else {

                        goto error;
@@ -103,9 +96,7 @@ static int parse_str(StringInputVisitor *siv, const char *name, Error **errp) 
                cur = g_malloc0(sizeof(*cur));

                cur->begin = start;

                cur->end = start + 1;

                siv->ranges = g_list_insert_sorted_merged(siv->ranges,

                                                          cur,

                                                          range_compare);

                siv->ranges = range_list_insert(siv->ranges, cur);

                cur = NULL;

            } else {

                goto error;

qapi/string-output-visitor.c

+2 −2
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ static void string_output_append(StringOutputVisitor *sov, int64_t a) 
    Range *r = g_malloc0(sizeof(*r));

    r->begin = a;

    r->end = a + 1;

    sov->ranges = g_list_insert_sorted_merged(sov->ranges, r, range_compare);

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

}



static void string_output_append_range(StringOutputVisitor *sov,
@@ -94,7 +94,7 @@ static void string_output_append_range(StringOutputVisitor *sov, 
    Range *r = g_malloc0(sizeof(*r));

    r->begin = s;

    r->end = e + 1;

    sov->ranges = g_list_insert_sorted_merged(sov->ranges, r, range_compare);

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

}



static void format_string(StringOutputVisitor *sov, Range *r, bool next,

qobject/json-lexer.c

+14 −5
Original line number Diff line number Diff line
@@ -18,11 +18,20 @@ 
#define MAX_TOKEN_SIZE (64ULL << 20)



/*

 * \"([^\\\"]|(\\\"\\'\\\\\\/\\b\\f\\n\\r\\t\\u[0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F]))*\"

 * '([^\\']|(\\\"\\'\\\\\\/\\b\\f\\n\\r\\t\\u[0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F]))*'

 * 0|([1-9][0-9]*(.[0-9]+)?([eE]([-+])?[0-9]+))

 * Required by JSON (RFC 7159):

 *

 * \"([^\\\"]|\\[\"'\\/bfnrt]|\\u[0-9a-fA-F]{4})*\"

 * -?(0|[1-9][0-9]*)(.[0-9]+)?([eE][-+]?[0-9]+)?

 * [{}\[\],:]

 * [a-z]+

 * [a-z]+   # covers null, true, false

 *

 * Extension of '' strings:

 *

 * '([^\\']|\\[\"'\\/bfnrt]|\\u[0-9a-fA-F]{4})*'

 *

 * Extension for vararg handling in JSON construction:

 *

 * %((l|ll|I64)?d|[ipsf])

 *

 */

qobject/json-streamer.c

+6 −0
Original line number Diff line number Diff line
@@ -20,9 +20,15 @@ 
#define MAX_TOKEN_COUNT (2ULL << 20)

#define MAX_NESTING (1ULL << 10)



static void json_message_free_token(void *token, void *opaque)

{

    g_free(token);

}



static void json_message_free_tokens(JSONMessageParser *parser)

{

    if (parser->tokens) {

        g_queue_foreach(parser->tokens, json_message_free_token, NULL);

        g_queue_free(parser->tokens);

        parser->tokens = NULL;

    }