haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

block/monitor: Consolidate hmp_handle_error calls to reduce redundant code

Browse source 
Signed-off-by: Mao Zhongyi <maozhongyi@cmss.chinamobile.com>
Message-Id: <20210802062507.347555-1-maozhongyi@cmss.chinamobile.com>
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
This commit is contained in:
Mao Zhongyi 2021-08-02 14:25:07 +08:00 committed by Hanna Reitz
parent 8ffcda2a70
commit 8cca0bd289
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
block/monitor/block-hmp-cmds.c
View file

@ -251,10 +251,10 @@ void hmp_drive_mirror(Monitor *mon, const QDict *qdict)
if (!filename) { if (!filename) {
error_setg(&err, QERR_MISSING_PARAMETER, "target"); error_setg(&err, QERR_MISSING_PARAMETER, "target");
hmp_handle_error(mon, err); goto end;
return;
} }
qmp_drive_mirror(&mirror, &err); qmp_drive_mirror(&mirror, &err);
end:
hmp_handle_error(mon, err); hmp_handle_error(mon, err);
} }
@ -281,11 +281,11 @@ void hmp_drive_backup(Monitor *mon, const QDict *qdict)
if (!filename) { if (!filename) {
error_setg(&err, QERR_MISSING_PARAMETER, "target"); error_setg(&err, QERR_MISSING_PARAMETER, "target");
hmp_handle_error(mon, err); goto end;
return;
} }
qmp_drive_backup(&backup, &err); qmp_drive_backup(&backup, &err);
end:
hmp_handle_error(mon, err); hmp_handle_error(mon, err);
} }
@ -356,8 +356,7 @@ void hmp_snapshot_blkdev(Monitor *mon, const QDict *qdict)
* will be taken internally. Today it's actually required. * will be taken internally. Today it's actually required.
*/ */
error_setg(&err, QERR_MISSING_PARAMETER, "snapshot-file"); error_setg(&err, QERR_MISSING_PARAMETER, "snapshot-file");
hmp_handle_error(mon, err); goto end;
return;
} }
mode = reuse ? NEW_IMAGE_MODE_EXISTING : NEW_IMAGE_MODE_ABSOLUTE_PATHS; mode = reuse ? NEW_IMAGE_MODE_EXISTING : NEW_IMAGE_MODE_ABSOLUTE_PATHS;
@ -365,6 +364,7 @@ void hmp_snapshot_blkdev(Monitor *mon, const QDict *qdict)
filename, false, NULL, filename, false, NULL,
!!format, format, !!format, format,
true, mode, &err); true, mode, &err);
end:
hmp_handle_error(mon, err); hmp_handle_error(mon, err);
} }