yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-02-25 17:26:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

qapi-event: Drop qmp_output_get_qobject() null check

Browse source 
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:

Backports commit 8df59565d2c27dec8c96a2090f0eb73303efce14 from qemu
This commit is contained in:
Eric Blake 2018-02-21 22:42:56 -05:00 committed by Lioncash
parent 9aa8356bce
commit eb4b02705a
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
qemu/scripts/qapi-event.py
View file

@ -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('''