diff options
| author | Eric Blake <eblake@redhat.com> | 2016-03-17 16:48:31 -0600 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2016-03-18 10:29:25 +0100 |
| commit | 8df59565d2c27dec8c96a2090f0eb73303efce14 (patch) | |
| tree | baaaee7e4606f58b7ba17f5655823d79a47519c4 | |
| parent | 7ce106a96feee4d46bfcdb47127b0935804c9357 (diff) | |
| download | focaccia-qemu-8df59565d2c27dec8c96a2090f0eb73303efce14.tar.gz focaccia-qemu-8df59565d2c27dec8c96a2090f0eb73303efce14.zip | |
qapi-event: Drop qmp_output_get_qobject() null check
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 <eblake@redhat.com>
Message-Id: <1458254921-17042-7-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
| -rw-r--r-- | scripts/qapi-event.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/scripts/qapi-event.py b/scripts/qapi-event.py index c03cb78a8e..27af206a9d 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(''' |