diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-07-18 14:44:37 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-07-18 14:44:37 -0500 |
| commit | 513e6bde4fa551c293e7d346e27b618b57a4087a (patch) | |
| tree | 5425e8ea2ced8436d764b2e789e764cdd502570c /qapi/qapi-visit-core.c | |
| parent | 052bb77a47ce2508538d0e4c9a2fb4b9787a2267 (diff) | |
| parent | 208c9d1b7c23e112d2fb83660fa23f2918c4c15b (diff) | |
| download | focaccia-qemu-513e6bde4fa551c293e7d346e27b618b57a4087a.tar.gz focaccia-qemu-513e6bde4fa551c293e7d346e27b618b57a4087a.zip | |
Merge remote-tracking branch 'qmp/queue/qmp' into staging
* qmp/queue/qmp: qapi: Convert getfd and closefd qapi: input_type_enum(): fix error message qmp: dump-guest-memory: improve schema doc
Diffstat (limited to 'qapi/qapi-visit-core.c')
| -rw-r--r-- | qapi/qapi-visit-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qapi/qapi-visit-core.c b/qapi/qapi-visit-core.c index ffffbf79aa..705eca90aa 100644 --- a/qapi/qapi-visit-core.c +++ b/qapi/qapi-visit-core.c @@ -298,7 +298,7 @@ void input_type_enum(Visitor *v, int *obj, const char *strings[], } if (strings[value] == NULL) { - error_set(errp, QERR_INVALID_PARAMETER, name ? name : "null"); + error_set(errp, QERR_INVALID_PARAMETER, enum_str); g_free(enum_str); return; } |