2012-02-09 16:36:37 +08:00
|
|
|
/*
|
|
|
|
* String parsing visitor
|
|
|
|
*
|
2016-01-29 21:48:59 +08:00
|
|
|
* Copyright Red Hat, Inc. 2012-2016
|
2012-02-09 16:36:37 +08:00
|
|
|
*
|
|
|
|
* Author: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
|
*
|
|
|
|
* This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
|
|
|
|
* See the COPYING.LIB file in the top-level directory.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
2016-01-30 01:49:57 +08:00
|
|
|
#include "qemu/osdep.h"
|
include/qemu/osdep.h: Don't include qapi/error.h
Commit 57cb38b included qapi/error.h into qemu/osdep.h to get the
Error typedef. Since then, we've moved to include qemu/osdep.h
everywhere. Its file comment explains: "To avoid getting into
possible circular include dependencies, this file should not include
any other QEMU headers, with the exceptions of config-host.h,
compiler.h, os-posix.h and os-win32.h, all of which are doing a
similar job to this file and are under similar constraints."
qapi/error.h doesn't do a similar job, and it doesn't adhere to
similar constraints: it includes qapi-types.h. That's in excess of
100KiB of crap most .c files don't actually need.
Add the typedef to qemu/typedefs.h, and include that instead of
qapi/error.h. Include qapi/error.h in .c files that need it and don't
get it now. Include qapi-types.h in qom/object.h for uint16List.
Update scripts/clean-includes accordingly. Update it further to match
reality: replace config.h by config-target.h, add sysemu/os-posix.h,
sysemu/os-win32.h. Update the list of includes in the qemu/osdep.h
comment quoted above similarly.
This reduces the number of objects depending on qapi/error.h from "all
of them" to less than a third. Unfortunately, the number depending on
qapi-types.h shrinks only a little. More work is needed for that one.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
[Fix compilation without the spice devel packages. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2016-03-14 16:01:28 +08:00
|
|
|
#include "qapi/error.h"
|
2012-02-09 16:36:37 +08:00
|
|
|
#include "qemu-common.h"
|
2012-12-18 01:19:43 +08:00
|
|
|
#include "qapi/string-input-visitor.h"
|
|
|
|
#include "qapi/visitor-impl.h"
|
|
|
|
#include "qapi/qmp/qerror.h"
|
2014-02-08 18:01:44 +08:00
|
|
|
#include "qemu/option.h"
|
2014-06-10 19:15:27 +08:00
|
|
|
#include "qemu/queue.h"
|
|
|
|
#include "qemu/range.h"
|
|
|
|
|
2012-02-09 16:36:37 +08:00
|
|
|
|
|
|
|
struct StringInputVisitor
|
|
|
|
{
|
|
|
|
Visitor visitor;
|
2014-06-10 19:15:27 +08:00
|
|
|
|
|
|
|
bool head;
|
|
|
|
|
|
|
|
GList *ranges;
|
|
|
|
GList *cur_range;
|
|
|
|
int64_t cur;
|
|
|
|
|
2012-02-09 16:36:37 +08:00
|
|
|
const char *string;
|
|
|
|
};
|
|
|
|
|
2016-01-29 21:48:38 +08:00
|
|
|
static StringInputVisitor *to_siv(Visitor *v)
|
|
|
|
{
|
|
|
|
return container_of(v, StringInputVisitor, visitor);
|
|
|
|
}
|
|
|
|
|
2014-06-16 23:07:03 +08:00
|
|
|
static void free_range(void *range, void *dummy)
|
|
|
|
{
|
|
|
|
g_free(range);
|
|
|
|
}
|
|
|
|
|
2014-06-10 19:15:27 +08:00
|
|
|
static void parse_str(StringInputVisitor *siv, Error **errp)
|
|
|
|
{
|
|
|
|
char *str = (char *) siv->string;
|
|
|
|
long long start, end;
|
|
|
|
Range *cur;
|
|
|
|
char *endptr;
|
|
|
|
|
|
|
|
if (siv->ranges) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
do {
|
2014-06-18 22:50:07 +08:00
|
|
|
errno = 0;
|
2014-06-10 19:15:27 +08:00
|
|
|
start = strtoll(str, &endptr, 0);
|
2014-06-18 22:50:07 +08:00
|
|
|
if (errno == 0 && endptr > str) {
|
2014-06-10 19:15:27 +08:00
|
|
|
if (*endptr == '\0') {
|
|
|
|
cur = g_malloc0(sizeof(*cur));
|
|
|
|
cur->begin = start;
|
|
|
|
cur->end = start + 1;
|
|
|
|
siv->ranges = g_list_insert_sorted_merged(siv->ranges, cur,
|
|
|
|
range_compare);
|
|
|
|
cur = NULL;
|
|
|
|
str = NULL;
|
|
|
|
} else if (*endptr == '-') {
|
|
|
|
str = endptr + 1;
|
2014-06-18 22:50:07 +08:00
|
|
|
errno = 0;
|
2014-06-10 19:15:27 +08:00
|
|
|
end = strtoll(str, &endptr, 0);
|
2014-06-18 22:50:07 +08:00
|
|
|
if (errno == 0 && endptr > str && start <= end &&
|
2014-06-10 19:15:27 +08:00
|
|
|
(start > INT64_MAX - 65536 ||
|
|
|
|
end < start + 65536)) {
|
|
|
|
if (*endptr == '\0') {
|
|
|
|
cur = g_malloc0(sizeof(*cur));
|
|
|
|
cur->begin = start;
|
|
|
|
cur->end = end + 1;
|
|
|
|
siv->ranges =
|
|
|
|
g_list_insert_sorted_merged(siv->ranges,
|
|
|
|
cur,
|
|
|
|
range_compare);
|
|
|
|
cur = NULL;
|
|
|
|
str = NULL;
|
|
|
|
} else if (*endptr == ',') {
|
|
|
|
str = endptr + 1;
|
|
|
|
cur = g_malloc0(sizeof(*cur));
|
|
|
|
cur->begin = start;
|
|
|
|
cur->end = end + 1;
|
|
|
|
siv->ranges =
|
|
|
|
g_list_insert_sorted_merged(siv->ranges,
|
|
|
|
cur,
|
|
|
|
range_compare);
|
|
|
|
cur = NULL;
|
|
|
|
} else {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
} else if (*endptr == ',') {
|
|
|
|
str = endptr + 1;
|
|
|
|
cur = g_malloc0(sizeof(*cur));
|
|
|
|
cur->begin = start;
|
|
|
|
cur->end = start + 1;
|
|
|
|
siv->ranges = g_list_insert_sorted_merged(siv->ranges,
|
|
|
|
cur,
|
|
|
|
range_compare);
|
|
|
|
cur = NULL;
|
|
|
|
} else {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
} while (str);
|
|
|
|
|
|
|
|
return;
|
|
|
|
error:
|
2014-06-16 23:07:03 +08:00
|
|
|
g_list_foreach(siv->ranges, free_range, NULL);
|
|
|
|
g_list_free(siv->ranges);
|
|
|
|
siv->ranges = NULL;
|
2014-06-10 19:15:27 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
start_list(Visitor *v, const char *name, Error **errp)
|
|
|
|
{
|
2016-01-29 21:48:38 +08:00
|
|
|
StringInputVisitor *siv = to_siv(v);
|
2014-06-10 19:15:27 +08:00
|
|
|
|
|
|
|
parse_str(siv, errp);
|
|
|
|
|
|
|
|
siv->cur_range = g_list_first(siv->ranges);
|
|
|
|
if (siv->cur_range) {
|
|
|
|
Range *r = siv->cur_range->data;
|
|
|
|
if (r) {
|
|
|
|
siv->cur = r->begin;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
qapi: Adjust layout of FooList types
By sticking the next pointer first, we don't need a union with
64-bit padding for smaller types. On 32-bit platforms, this
can reduce the size of uint8List from 16 bytes (or 12, depending
on whether 64-bit ints can tolerate 4-byte alignment) down to 8.
It has no effect on 64-bit platforms (where alignment still
dictates a 16-byte struct); but fewer anonymous unions is still
a win in my book.
It requires visit_next_list() to gain a size parameter, to know
what size element to allocate; comparable to the size parameter
of visit_start_struct().
I debated about going one step further, to allow for fewer casts,
by doing:
typedef GenericList GenericList;
struct GenericList {
GenericList *next;
};
struct FooList {
GenericList base;
Foo *value;
};
so that you convert to 'GenericList *' by '&foolist->base', and
back by 'container_of(generic, GenericList, base)' (as opposed to
the existing '(GenericList *)foolist' and '(FooList *)generic').
But doing that would require hoisting the declaration of
GenericList prior to inclusion of qapi-types.h, rather than its
current spot in visitor.h; it also makes iteration a bit more
verbose through 'foolist->base.next' instead of 'foolist->next'.
Note that for lists of objects, the 'value' payload is still
hidden behind a boxed pointer. Someday, it would be nice to do:
struct FooList {
FooList *next;
Foo value;
};
for one less level of malloc for each list element. This patch
is a step in that direction (now that 'next' is no longer at a
fixed non-zero offset within the struct, we can store more than
just a pointer's-worth of data as the value payload), but the
actual conversion would be a task for another series, as it will
touch a lot of code.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1455778109-6278-10-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-02-18 14:48:23 +08:00
|
|
|
static GenericList *next_list(Visitor *v, GenericList **list, size_t size)
|
2014-06-10 19:15:27 +08:00
|
|
|
{
|
2016-01-29 21:48:38 +08:00
|
|
|
StringInputVisitor *siv = to_siv(v);
|
2014-06-10 19:15:27 +08:00
|
|
|
GenericList **link;
|
|
|
|
Range *r;
|
|
|
|
|
|
|
|
if (!siv->ranges || !siv->cur_range) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
r = siv->cur_range->data;
|
|
|
|
if (!r) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (siv->cur < r->begin || siv->cur >= r->end) {
|
|
|
|
siv->cur_range = g_list_next(siv->cur_range);
|
|
|
|
if (!siv->cur_range) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
r = siv->cur_range->data;
|
|
|
|
if (!r) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
siv->cur = r->begin;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (siv->head) {
|
|
|
|
link = list;
|
|
|
|
siv->head = false;
|
|
|
|
} else {
|
|
|
|
link = &(*list)->next;
|
|
|
|
}
|
|
|
|
|
qapi: Adjust layout of FooList types
By sticking the next pointer first, we don't need a union with
64-bit padding for smaller types. On 32-bit platforms, this
can reduce the size of uint8List from 16 bytes (or 12, depending
on whether 64-bit ints can tolerate 4-byte alignment) down to 8.
It has no effect on 64-bit platforms (where alignment still
dictates a 16-byte struct); but fewer anonymous unions is still
a win in my book.
It requires visit_next_list() to gain a size parameter, to know
what size element to allocate; comparable to the size parameter
of visit_start_struct().
I debated about going one step further, to allow for fewer casts,
by doing:
typedef GenericList GenericList;
struct GenericList {
GenericList *next;
};
struct FooList {
GenericList base;
Foo *value;
};
so that you convert to 'GenericList *' by '&foolist->base', and
back by 'container_of(generic, GenericList, base)' (as opposed to
the existing '(GenericList *)foolist' and '(FooList *)generic').
But doing that would require hoisting the declaration of
GenericList prior to inclusion of qapi-types.h, rather than its
current spot in visitor.h; it also makes iteration a bit more
verbose through 'foolist->base.next' instead of 'foolist->next'.
Note that for lists of objects, the 'value' payload is still
hidden behind a boxed pointer. Someday, it would be nice to do:
struct FooList {
FooList *next;
Foo value;
};
for one less level of malloc for each list element. This patch
is a step in that direction (now that 'next' is no longer at a
fixed non-zero offset within the struct, we can store more than
just a pointer's-worth of data as the value payload), but the
actual conversion would be a task for another series, as it will
touch a lot of code.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1455778109-6278-10-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-02-18 14:48:23 +08:00
|
|
|
*link = g_malloc0(size);
|
2014-06-10 19:15:27 +08:00
|
|
|
return *link;
|
|
|
|
}
|
|
|
|
|
2016-01-29 21:48:59 +08:00
|
|
|
static void end_list(Visitor *v)
|
2014-06-10 19:15:27 +08:00
|
|
|
{
|
2016-01-29 21:48:38 +08:00
|
|
|
StringInputVisitor *siv = to_siv(v);
|
2014-06-10 19:15:27 +08:00
|
|
|
siv->head = true;
|
|
|
|
}
|
|
|
|
|
2016-01-29 21:48:56 +08:00
|
|
|
static void parse_type_int64(Visitor *v, const char *name, int64_t *obj,
|
qapi: Prefer type_int64 over type_int in visitors
The qapi builtin type 'int' is basically shorthand for the type
'int64'. In fact, since no visitor was providing the optional
type_int64() callback, visit_type_int64() was just always falling
back to type_int(), cementing the equivalence between the types.
However, some visitors are providing a type_uint64() callback.
For purposes of code consistency, it is nicer if all visitors
use the paired type_int64/type_uint64 names rather than the
mismatched type_int/type_uint64. So this patch just renames
the signed int callbacks in place, dropping the type_int()
callback as redundant, and a later patch will focus on the
unsigned int callbacks.
Add some FIXMEs to questionable reuse of errp in code touched
by the rename, while at it (the reuse works as long as the
callbacks don't modify value when setting an error, but it's not
a good example to set) - a later patch will then fix those.
No change in functionality here, although further cleanups are
in the pipeline.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1454075341-13658-14-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-01-29 21:48:49 +08:00
|
|
|
Error **errp)
|
2012-02-09 16:36:37 +08:00
|
|
|
{
|
2016-01-29 21:48:38 +08:00
|
|
|
StringInputVisitor *siv = to_siv(v);
|
2012-02-09 16:36:37 +08:00
|
|
|
|
2014-06-10 19:15:27 +08:00
|
|
|
if (!siv->string) {
|
2015-03-17 18:54:50 +08:00
|
|
|
error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",
|
|
|
|
"integer");
|
2012-02-09 16:36:37 +08:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2014-06-10 19:15:27 +08:00
|
|
|
parse_str(siv, errp);
|
|
|
|
|
|
|
|
if (!siv->ranges) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!siv->cur_range) {
|
|
|
|
Range *r;
|
|
|
|
|
|
|
|
siv->cur_range = g_list_first(siv->ranges);
|
|
|
|
if (!siv->cur_range) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
r = siv->cur_range->data;
|
|
|
|
if (!r) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
siv->cur = r->begin;
|
|
|
|
}
|
|
|
|
|
|
|
|
*obj = siv->cur;
|
|
|
|
siv->cur++;
|
|
|
|
return;
|
|
|
|
|
|
|
|
error:
|
2016-04-29 05:45:28 +08:00
|
|
|
error_setg(errp, QERR_INVALID_PARAMETER_VALUE, name ? name : "null",
|
2015-03-17 18:54:50 +08:00
|
|
|
"an int64 value or range");
|
2012-02-09 16:36:37 +08:00
|
|
|
}
|
|
|
|
|
2016-01-29 21:48:56 +08:00
|
|
|
static void parse_type_uint64(Visitor *v, const char *name, uint64_t *obj,
|
qapi: Make all visitors supply uint64 callbacks
Our qapi visitor contract supports multiple integer visitors,
but left the type_uint64 visitor as optional (falling back on
type_int64); which in turn can lead to awkward behavior with
numbers larger than INT64_MAX (the user has to be aware of
twos complement, and deal with negatives).
This patch does not address the disparity in handling large
values as negatives. It merely moves the fallback from uint64
to int64 from the visitor core to the visitors, where the issue
can actually be fixed, by implementing the missing type_uint64()
callbacks on top of the respective type_int64() callbacks, and
with a FIXME comment explaining why that's wrong.
With that done, we now have a type_uint64() callback in every
driver, so we can make it mandatory from the core. And although
the type_int64() callback can cover the entire valid range of
type_uint{8,16,32} on valid user input, using type_uint64() to
avoid mixed signedness makes more sense.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1454075341-13658-15-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-01-29 21:48:50 +08:00
|
|
|
Error **errp)
|
|
|
|
{
|
|
|
|
/* FIXME: parse_type_int64 mishandles values over INT64_MAX */
|
|
|
|
int64_t i;
|
|
|
|
Error *err = NULL;
|
2016-01-29 21:48:56 +08:00
|
|
|
parse_type_int64(v, name, &i, &err);
|
qapi: Make all visitors supply uint64 callbacks
Our qapi visitor contract supports multiple integer visitors,
but left the type_uint64 visitor as optional (falling back on
type_int64); which in turn can lead to awkward behavior with
numbers larger than INT64_MAX (the user has to be aware of
twos complement, and deal with negatives).
This patch does not address the disparity in handling large
values as negatives. It merely moves the fallback from uint64
to int64 from the visitor core to the visitors, where the issue
can actually be fixed, by implementing the missing type_uint64()
callbacks on top of the respective type_int64() callbacks, and
with a FIXME comment explaining why that's wrong.
With that done, we now have a type_uint64() callback in every
driver, so we can make it mandatory from the core. And although
the type_int64() callback can cover the entire valid range of
type_uint{8,16,32} on valid user input, using type_uint64() to
avoid mixed signedness makes more sense.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1454075341-13658-15-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-01-29 21:48:50 +08:00
|
|
|
if (err) {
|
|
|
|
error_propagate(errp, err);
|
|
|
|
} else {
|
|
|
|
*obj = i;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-01-29 21:48:56 +08:00
|
|
|
static void parse_type_size(Visitor *v, const char *name, uint64_t *obj,
|
2014-02-08 18:01:44 +08:00
|
|
|
Error **errp)
|
|
|
|
{
|
2016-01-29 21:48:38 +08:00
|
|
|
StringInputVisitor *siv = to_siv(v);
|
2014-02-08 18:01:44 +08:00
|
|
|
Error *err = NULL;
|
|
|
|
uint64_t val;
|
|
|
|
|
|
|
|
if (siv->string) {
|
|
|
|
parse_option_size(name, siv->string, &val, &err);
|
|
|
|
} else {
|
2015-03-17 18:54:50 +08:00
|
|
|
error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",
|
|
|
|
"size");
|
2014-02-08 18:01:44 +08:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (err) {
|
|
|
|
error_propagate(errp, err);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
*obj = val;
|
|
|
|
}
|
|
|
|
|
2016-01-29 21:48:56 +08:00
|
|
|
static void parse_type_bool(Visitor *v, const char *name, bool *obj,
|
2012-02-09 16:36:37 +08:00
|
|
|
Error **errp)
|
|
|
|
{
|
2016-01-29 21:48:38 +08:00
|
|
|
StringInputVisitor *siv = to_siv(v);
|
2012-02-09 16:36:37 +08:00
|
|
|
|
|
|
|
if (siv->string) {
|
|
|
|
if (!strcasecmp(siv->string, "on") ||
|
|
|
|
!strcasecmp(siv->string, "yes") ||
|
|
|
|
!strcasecmp(siv->string, "true")) {
|
|
|
|
*obj = true;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (!strcasecmp(siv->string, "off") ||
|
|
|
|
!strcasecmp(siv->string, "no") ||
|
|
|
|
!strcasecmp(siv->string, "false")) {
|
|
|
|
*obj = false;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-03-17 18:54:50 +08:00
|
|
|
error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",
|
|
|
|
"boolean");
|
2012-02-09 16:36:37 +08:00
|
|
|
}
|
|
|
|
|
2016-01-29 21:48:56 +08:00
|
|
|
static void parse_type_str(Visitor *v, const char *name, char **obj,
|
2012-02-09 16:36:37 +08:00
|
|
|
Error **errp)
|
|
|
|
{
|
2016-01-29 21:48:38 +08:00
|
|
|
StringInputVisitor *siv = to_siv(v);
|
2012-02-09 16:36:37 +08:00
|
|
|
if (siv->string) {
|
|
|
|
*obj = g_strdup(siv->string);
|
|
|
|
} else {
|
2015-03-17 18:54:50 +08:00
|
|
|
error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",
|
|
|
|
"string");
|
2012-02-09 16:36:37 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-01-29 21:48:56 +08:00
|
|
|
static void parse_type_number(Visitor *v, const char *name, double *obj,
|
2012-02-09 16:36:37 +08:00
|
|
|
Error **errp)
|
|
|
|
{
|
2016-01-29 21:48:38 +08:00
|
|
|
StringInputVisitor *siv = to_siv(v);
|
2012-02-09 16:36:37 +08:00
|
|
|
char *endp = (char *) siv->string;
|
|
|
|
double val;
|
|
|
|
|
|
|
|
errno = 0;
|
|
|
|
if (siv->string) {
|
|
|
|
val = strtod(siv->string, &endp);
|
|
|
|
}
|
|
|
|
if (!siv->string || errno || endp == siv->string || *endp) {
|
2015-03-17 18:54:50 +08:00
|
|
|
error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",
|
|
|
|
"number");
|
2012-02-09 16:36:37 +08:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
*obj = val;
|
|
|
|
}
|
|
|
|
|
2016-01-29 21:48:56 +08:00
|
|
|
static void parse_optional(Visitor *v, const char *name, bool *present)
|
2012-02-09 16:36:37 +08:00
|
|
|
{
|
2016-01-29 21:48:38 +08:00
|
|
|
StringInputVisitor *siv = to_siv(v);
|
2012-02-09 16:36:37 +08:00
|
|
|
|
|
|
|
if (!siv->string) {
|
|
|
|
*present = false;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
*present = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
Visitor *string_input_get_visitor(StringInputVisitor *v)
|
|
|
|
{
|
|
|
|
return &v->visitor;
|
|
|
|
}
|
|
|
|
|
|
|
|
void string_input_visitor_cleanup(StringInputVisitor *v)
|
|
|
|
{
|
2014-06-16 23:07:03 +08:00
|
|
|
g_list_foreach(v->ranges, free_range, NULL);
|
|
|
|
g_list_free(v->ranges);
|
2012-02-09 16:36:37 +08:00
|
|
|
g_free(v);
|
|
|
|
}
|
|
|
|
|
|
|
|
StringInputVisitor *string_input_visitor_new(const char *str)
|
|
|
|
{
|
|
|
|
StringInputVisitor *v;
|
|
|
|
|
|
|
|
v = g_malloc0(sizeof(*v));
|
|
|
|
|
2016-04-29 05:45:09 +08:00
|
|
|
v->visitor.type = VISITOR_INPUT;
|
qapi: Prefer type_int64 over type_int in visitors
The qapi builtin type 'int' is basically shorthand for the type
'int64'. In fact, since no visitor was providing the optional
type_int64() callback, visit_type_int64() was just always falling
back to type_int(), cementing the equivalence between the types.
However, some visitors are providing a type_uint64() callback.
For purposes of code consistency, it is nicer if all visitors
use the paired type_int64/type_uint64 names rather than the
mismatched type_int/type_uint64. So this patch just renames
the signed int callbacks in place, dropping the type_int()
callback as redundant, and a later patch will focus on the
unsigned int callbacks.
Add some FIXMEs to questionable reuse of errp in code touched
by the rename, while at it (the reuse works as long as the
callbacks don't modify value when setting an error, but it's not
a good example to set) - a later patch will then fix those.
No change in functionality here, although further cleanups are
in the pipeline.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1454075341-13658-14-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-01-29 21:48:49 +08:00
|
|
|
v->visitor.type_int64 = parse_type_int64;
|
qapi: Make all visitors supply uint64 callbacks
Our qapi visitor contract supports multiple integer visitors,
but left the type_uint64 visitor as optional (falling back on
type_int64); which in turn can lead to awkward behavior with
numbers larger than INT64_MAX (the user has to be aware of
twos complement, and deal with negatives).
This patch does not address the disparity in handling large
values as negatives. It merely moves the fallback from uint64
to int64 from the visitor core to the visitors, where the issue
can actually be fixed, by implementing the missing type_uint64()
callbacks on top of the respective type_int64() callbacks, and
with a FIXME comment explaining why that's wrong.
With that done, we now have a type_uint64() callback in every
driver, so we can make it mandatory from the core. And although
the type_int64() callback can cover the entire valid range of
type_uint{8,16,32} on valid user input, using type_uint64() to
avoid mixed signedness makes more sense.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1454075341-13658-15-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-01-29 21:48:50 +08:00
|
|
|
v->visitor.type_uint64 = parse_type_uint64;
|
2014-02-08 18:01:44 +08:00
|
|
|
v->visitor.type_size = parse_type_size;
|
2012-02-09 16:36:37 +08:00
|
|
|
v->visitor.type_bool = parse_type_bool;
|
|
|
|
v->visitor.type_str = parse_type_str;
|
|
|
|
v->visitor.type_number = parse_type_number;
|
2014-06-10 19:15:27 +08:00
|
|
|
v->visitor.start_list = start_list;
|
|
|
|
v->visitor.next_list = next_list;
|
|
|
|
v->visitor.end_list = end_list;
|
2014-05-07 15:53:46 +08:00
|
|
|
v->visitor.optional = parse_optional;
|
2012-02-09 16:36:37 +08:00
|
|
|
|
|
|
|
v->string = str;
|
2014-06-10 19:15:27 +08:00
|
|
|
v->head = true;
|
2012-02-09 16:36:37 +08:00
|
|
|
return v;
|
|
|
|
}
|