[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 06/16] qapi-event: Drop qmp_output_get_qobject()
From: |
Eric Blake |
Subject: |
[Qemu-devel] [PATCH v6 06/16] qapi-event: Drop qmp_output_get_qobject() null check |
Date: |
Thu, 17 Mar 2016 16:48:31 -0600 |
qmp_output_get_qobject() was changed never to return null some time
ago (in commit 6c2f9a15), but the qapi_event_send_FOO() functions
still check. Clean that up:
|@@ -28,7 +28,6 @@ void qapi_event_send_acpi_device_ost(ACP
| QMPEventFuncEmit emit;
| QmpOutputVisitor *qov;
| Visitor *v;
|- QObject *obj;
|
| emit = qmp_event_get_func_emit();
| if (!emit) {
|@@ -54,10 +53,7 @@ out_obj:
| goto out;
| }
|
|- obj = qmp_output_get_qobject(qov);
|- g_assert(obj);
|-
|- qdict_put_obj(qmp, "data", obj);
|+ qdict_put_obj(qmp, "data", qmp_output_get_qobject(qov));
| emit(QAPI_EVENT_ACPI_DEVICE_OST, qmp, &err);
|
| out:
Signed-off-by: Eric Blake <address@hidden>
---
v6: retitle, reduce scope, improve commit message
v5: new patch
---
scripts/qapi-event.py | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/scripts/qapi-event.py b/scripts/qapi-event.py
index c03cb78..27af206 100644
--- a/scripts/qapi-event.py
+++ b/scripts/qapi-event.py
@@ -43,7 +43,6 @@ def gen_event_send(name, arg_type):
ret += mcgen('''
QmpOutputVisitor *qov;
Visitor *v;
- QObject *obj;
''')
@@ -77,10 +76,7 @@ out_obj:
goto out;
}
- obj = qmp_output_get_qobject(qov);
- g_assert(obj);
-
- qdict_put_obj(qmp, "data", obj);
+ qdict_put_obj(qmp, "data", qmp_output_get_qobject(qov));
''')
ret += mcgen('''
--
2.5.0
- [Qemu-devel] [PATCH v6 00/16] easier unboxed visits/qapi implicit types, Eric Blake, 2016/03/17
- [Qemu-devel] [PATCH v6 01/16] qapi: Assert in places where variants are not handled, Eric Blake, 2016/03/17
- [Qemu-devel] [PATCH v6 06/16] qapi-event: Drop qmp_output_get_qobject() null check,
Eric Blake <=
- [Qemu-devel] [PATCH v6 02/16] qapi: Fix command with named empty argument type, Eric Blake, 2016/03/17
- [Qemu-devel] [PATCH v6 07/16] qapi-event: Utilize implicit struct visits, Eric Blake, 2016/03/17
- [Qemu-devel] [PATCH v6 09/16] qapi-commands: Inline single-use helpers of gen_marshal(), Eric Blake, 2016/03/17
- [Qemu-devel] [PATCH v6 13/16] qapi: Make BlockdevOptions doc example closer to reality, Eric Blake, 2016/03/17
- [Qemu-devel] [PATCH v6 16/16] qapi: Consolidate object visitors, Eric Blake, 2016/03/17
- [Qemu-devel] [PATCH v6 11/16] qapi: Drop unused c_null(), Eric Blake, 2016/03/17
- [Qemu-devel] [PATCH v6 04/16] qapi: Adjust names of implicit types, Eric Blake, 2016/03/17
- [Qemu-devel] [PATCH v6 03/16] qapi: Make c_type() more OO-like, Eric Blake, 2016/03/17
- [Qemu-devel] [PATCH v6 10/16] qapi: Inline gen_visit_members() into lone caller, Eric Blake, 2016/03/17