mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-05 16:53:55 -06:00
qapi: Drop qapi_event_send_FOO()'s Error ** argument
The generated qapi_event_send_FOO() take an Error ** argument. They can't actually fail, because all they do with the argument is passing it to functions that can't fail: the QObject output visitor, and the @qmp_emit callback, which is either monitor_qapi_event_queue() or event_test_emit(). Drop the argument, and pass &error_abort to the QObject output visitor and @qmp_emit instead. Suggested-by: Eric Blake <eblake@redhat.com> Suggested-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Peter Xu <peterx@redhat.com> Message-Id: <20180815133747.25032-4-peterx@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> [Commit message rewritten, update to qapi-code-gen.txt corrected] Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
parent
bdd2d42b89
commit
3ab72385b2
29 changed files with 70 additions and 104 deletions
8
cpus.c
8
cpus.c
|
@ -1053,7 +1053,7 @@ static int do_vm_stop(RunState state, bool send_stop)
|
|||
runstate_set(state);
|
||||
vm_state_notify(0, state);
|
||||
if (send_stop) {
|
||||
qapi_event_send_stop(&error_abort);
|
||||
qapi_event_send_stop();
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -2107,13 +2107,13 @@ int vm_prepare_start(void)
|
|||
* the STOP event.
|
||||
*/
|
||||
if (runstate_is_running()) {
|
||||
qapi_event_send_stop(&error_abort);
|
||||
qapi_event_send_resume(&error_abort);
|
||||
qapi_event_send_stop();
|
||||
qapi_event_send_resume();
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* We are sending this now, but the CPUs will be resumed shortly later */
|
||||
qapi_event_send_resume(&error_abort);
|
||||
qapi_event_send_resume();
|
||||
|
||||
replay_enable_events();
|
||||
cpu_enable_ticks();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue