diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-11-30 10:19:54 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-11-30 10:19:54 -0600 |
| commit | 36520faa33abb91b3c8a80e935b82afec78f9bee (patch) | |
| tree | a0518c66d12bf27af2b5789fe599d0431f89ea40 | |
| parent | 46ee77b357dde619db30d835f73a9001b9c75a03 (diff) | |
| parent | 1d16252652688a775b244fffa1b9ac9b719ceffc (diff) | |
| download | qemu-36520faa33abb91b3c8a80e935b82afec78f9bee.tar.gz qemu-36520faa33abb91b3c8a80e935b82afec78f9bee.tar.bz2 qemu-36520faa33abb91b3c8a80e935b82afec78f9bee.zip | |
Merge remote-tracking branch 'qmp/queue/qmp' into staging
* qmp/queue/qmp:
qapi: fix qapi_dealloc_type_size parameter type
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| -rw-r--r-- | qapi/qapi-dealloc-visitor.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qapi/qapi-dealloc-visitor.c b/qapi/qapi-dealloc-visitor.c index a07b171b86..75214e7daa 100644 --- a/qapi/qapi-dealloc-visitor.c +++ b/qapi/qapi-dealloc-visitor.c @@ -132,7 +132,7 @@ static void qapi_dealloc_type_number(Visitor *v, double *obj, const char *name, { } -static void qapi_dealloc_type_size(Visitor *v, size_t *obj, const char *name, +static void qapi_dealloc_type_size(Visitor *v, uint64_t *obj, const char *name, Error **errp) { } |