diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-04-29 11:26:10 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-04-29 11:26:10 +0100 |
| commit | 849880978eb2d9043323e34afb46eae8772a5fc6 (patch) | |
| tree | 78ab1469c3c343f9038548afbeae9cd5e5b1b790 | |
| parent | 0d48dfedc5c2beb418ad4c08b78de14e794bb199 (diff) | |
| parent | 0a40bdab0d48d9ce0c34bc2d319e44e92e0cc942 (diff) | |
| download | qemu-849880978eb2d9043323e34afb46eae8772a5fc6.zip qemu-849880978eb2d9043323e34afb46eae8772a5fc6.tar.gz qemu-849880978eb2d9043323e34afb46eae8772a5fc6.tar.bz2 | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2016-04-29' into staging
QAPI patches for 2016-04-29
# gpg: Signature made Fri 29 Apr 2016 10:13:08 BST using RSA key ID EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>"
* remotes/armbru/tags/pull-qapi-2016-04-29:
qapi: Don't pass NULL to printf in string input visitor
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | qapi/string-input-visitor.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qapi/string-input-visitor.c b/qapi/string-input-visitor.c index ab12953..5ea2d77 100644 --- a/qapi/string-input-visitor.c +++ b/qapi/string-input-visitor.c @@ -222,7 +222,7 @@ static void parse_type_int64(Visitor *v, const char *name, int64_t *obj, return; error: - error_setg(errp, QERR_INVALID_PARAMETER_VALUE, name, + error_setg(errp, QERR_INVALID_PARAMETER_VALUE, name ? name : "null", "an int64 value or range"); } |