Message ID | 1399996972-23429-2-git-send-email-armbru@redhat.com |
---|---|
State | New |
Headers | show |
On 05/13/2014 10:02 AM, Markus Armbruster wrote: > qerror_report_err() is a transitional interface to help with > converting existing HMP commands to QMP. It should not be used > elsewhere. > > drive_init() is not meant to be used by QMP commands. It uses both > qerror_report_err() and error_report(). Convert the former to the > latter. > > Signed-off-by: Markus Armbruster <armbru@redhat.com> > --- > blockdev.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Reviewed-by: Eric Blake <eblake@redhat.com>
diff --git a/blockdev.c b/blockdev.c index 1a12e24..24b1c3b 100644 --- a/blockdev.c +++ b/blockdev.c @@ -691,7 +691,7 @@ DriveInfo *drive_init(QemuOpts *all_opts, BlockInterfaceType block_default_type) &error_abort); qemu_opts_absorb_qdict(legacy_opts, bs_opts, &local_err); if (local_err) { - qerror_report_err(local_err); + error_report("%s", error_get_pretty(local_err)); error_free(local_err); goto fail; } @@ -903,7 +903,7 @@ DriveInfo *drive_init(QemuOpts *all_opts, BlockInterfaceType block_default_type) dinfo = blockdev_init(filename, bs_opts, &local_err); if (dinfo == NULL) { if (local_err) { - qerror_report_err(local_err); + error_report("%s", error_get_pretty(local_err)); error_free(local_err); } goto fail;
qerror_report_err() is a transitional interface to help with converting existing HMP commands to QMP. It should not be used elsewhere. drive_init() is not meant to be used by QMP commands. It uses both qerror_report_err() and error_report(). Convert the former to the latter. Signed-off-by: Markus Armbruster <armbru@redhat.com> --- blockdev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)