Philippe Mathieu-Daudé <phi...@redhat.com> writes:
> On 7/20/21 2:53 PM, Markus Armbruster wrote:
>> We did this with scripts/coccinelle/use-error_fatal.cocci before, in
>> commit 50beeb68094 and 007b06578ab. This commit cleans up rarer
>> variations that don't seem worth matching with Coccinelle.
>>
>> Cc: Thomas Huth <th...@redhat.com>
>> Cc: Cornelia Huck <cornelia.h...@de.ibm.com>
>> Cc: Peter Xu <pet...@redhat.com>
>> Cc: Juan Quintela <quint...@redhat.com>
>> Cc: Stefan Hajnoczi <stefa...@redhat.com>
>> Cc: Paolo Bonzini <pbonz...@redhat.com>
>> Cc: Marc-André Lureau <marcandre.lur...@redhat.com>
>> Cc: Gerd Hoffmann <kra...@redhat.com>
>> Cc: Daniel P. Berrangé <berra...@redhat.com>
>> Signed-off-by: Markus Armbruster <arm...@redhat.com>
>> ---
>> hw/s390x/ipl.c | 6 +-----
>> migration/migration.c | 7 +------
>> qemu-img.c | 6 +-----
>> qemu-io.c | 6 +-----
>> qemu-nbd.c | 5 +----
>> scsi/qemu-pr-helper.c | 11 +++--------
>> softmmu/vl.c | 7 +------
>> target/i386/sev.c | 8 +-------
>> ui/console.c | 6 ++----
>> ui/spice-core.c | 7 +------
>> 10 files changed, 13 insertions(+), 56 deletions(-)
>
>> diff --git a/softmmu/vl.c b/softmmu/vl.c
>> index 4df1496101..0d2db1abc3 100644
>> --- a/softmmu/vl.c
>> +++ b/softmmu/vl.c
>> @@ -2673,12 +2673,7 @@ void qmp_x_exit_preconfig(Error **errp)
>> qemu_machine_creation_done();
>>
>> if (loadvm) {
>> - Error *local_err = NULL;
>> - if (!load_snapshot(loadvm, NULL, false, NULL, &local_err)) {
>> - error_report_err(local_err);
>> - autostart = 0;
>
> Uh, odd assignment...
Yup.
Commit 05f2401eb2 "make load_vmstate() return errors" added the
assignment:
@@ -6030,8 +6030,11 @@ int main(int argc, char **argv, char **envp)
exit(1);
}
- if (loadvm)
- load_vmstate(cur_mon, loadvm);
+ if (loadvm) {
+ if (load_vmstate(cur_mon, loadvm) < 0) {
+ autostart = 0;
+ }
+ }
if (incoming) {
qemu_start_incoming_migration(incoming);
827beacb47 "Add a hint message to loadvm and exits on failure" added the
exit(1) without deleting the now useless assignment:
@@ -4530,6 +4530,7 @@ int main(int argc, char **argv, char **envp)
if (load_snapshot(loadvm, &local_err) < 0) {
error_report_err(local_err);
autostart = 0;
+ exit(1);
}
}
>> - exit(1);
>> - }
>> + load_snapshot(loadvm, NULL, false, NULL, &error_fatal);
>> }
>> if (replay_mode != REPLAY_MODE_NONE) {
>> replay_vmstate_init();
>
> Reviewed-by: Philippe Mathieu-Daudé <phi...@redhat.com>
Thanks!
