[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 05/41] qapi: Clean up qobject_input_type_number()
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL v2 05/41] qapi: Clean up qobject_input_type_number() control flow |
Date: |
Tue, 20 Jun 2017 14:40:32 +0200 |
From: Marc-André Lureau <address@hidden>
Use the more common pattern to error out.
Signed-off-by: Marc-André Lureau <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
[Commit message tweaked]
Signed-off-by: Markus Armbruster <address@hidden>
---
qapi/qobject-input-visitor.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/qapi/qobject-input-visitor.c b/qapi/qobject-input-visitor.c
index eac40f6..26ef49a 100644
--- a/qapi/qobject-input-visitor.c
+++ b/qapi/qobject-input-visitor.c
@@ -547,13 +547,13 @@ static void qobject_input_type_number(Visitor *v, const
char *name, double *obj,
}
qfloat = qobject_to_qfloat(qobj);
- if (qfloat) {
- *obj = qfloat_get_double(qobject_to_qfloat(qobj));
+ if (!qfloat) {
+ error_setg(errp, QERR_INVALID_PARAMETER_TYPE,
+ full_name(qiv, name), "number");
return;
}
- error_setg(errp, QERR_INVALID_PARAMETER_TYPE,
- full_name(qiv, name), "number");
+ *obj = qfloat_get_double(qobject_to_qfloat(qobj));
}
static void qobject_input_type_number_keyval(Visitor *v, const char *name,
--
2.7.5
- [Qemu-devel] [PULL v2 00/41] QAPI patches for 2017-06-09, Markus Armbruster, 2017/06/20
- [Qemu-devel] [PULL v2 02/41] object: fix potential leak in getters, Markus Armbruster, 2017/06/20
- [Qemu-devel] [PULL v2 04/41] tests: add more int/number ranges checks, Markus Armbruster, 2017/06/20
- [Qemu-devel] [PULL v2 03/41] tests: Remove test cases for alternates of 'number' and 'int', Markus Armbruster, 2017/06/20
- [Qemu-devel] [PULL v2 05/41] qapi: Clean up qobject_input_type_number() control flow,
Markus Armbruster <=
- [Qemu-devel] [PULL v2 01/41] qdev: remove PropertyInfo.qtype field, Markus Armbruster, 2017/06/20
- [Qemu-devel] [PULL v2 08/41] tests: remove /{qnum, qlist, dict}/destroy test, Markus Armbruster, 2017/06/20
- [Qemu-devel] [PULL v2 13/41] q35: fix get_mmcfg_size to use uint64 visitor, Markus Armbruster, 2017/06/20
- [Qemu-devel] [PULL v2 09/41] qnum: add uint type, Markus Armbruster, 2017/06/20
- [Qemu-devel] [PULL v2 10/41] json: learn to parse uint64 numbers, Markus Armbruster, 2017/06/20
- [Qemu-devel] [PULL v2 11/41] qapi: update the qobject visitor to use QNUM_U64, Markus Armbruster, 2017/06/20
- [Qemu-devel] [PULL v2 14/41] object: use more specific property type names, Markus Armbruster, 2017/06/20
- [Qemu-devel] [PULL v2 24/41] aspeed: use {set, get}_uint() for "ram-size" property, Markus Armbruster, 2017/06/20
- [Qemu-devel] [PULL v2 28/41] acpi: use get_uint() for various acpi properties, Markus Armbruster, 2017/06/20
- [Qemu-devel] [PULL v2 25/41] bcm2835_fb: use {get, set}_uint() for "vcram-size" and "vcram-base", Markus Armbruster, 2017/06/20