[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 15/33] blockdev: Don't use qerror_report_err() in
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL v2 15/33] blockdev: Don't use qerror_report_err() in drive_init() |
Date: |
Wed, 28 May 2014 14:32:25 +0200 |
From: Markus Armbruster <address@hidden>
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 <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
blockdev.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index 9a9bdec..264b07c 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -730,7 +730,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;
}
@@ -942,7 +942,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;
--
1.9.3
- [Qemu-devel] [PULL v2 06/33] block: Add BlockOpType enum, (continued)
- [Qemu-devel] [PULL v2 06/33] block: Add BlockOpType enum, Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 05/33] iotests: Use _img_info in test 089, Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 07/33] block: Introduce op_blockers to BlockDriverState, Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 09/33] block: Move op_blocker check from block_job_create to its caller, Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 08/33] block: Replace in_use with operation blocker, Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 10/33] block: Add bdrv_set_backing_hd(), Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 11/33] block: Use bdrv_set_backing_hd everywhere, Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 12/33] block: Add backing_blocker in BlockDriverState, Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 13/33] block: Drop redundant bdrv_refresh_limits, Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 14/33] docs: Define refcount_bits value, Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 15/33] blockdev: Don't use qerror_report_err() in drive_init(),
Stefan Hajnoczi <=
- [Qemu-devel] [PULL v2 16/33] blockdev: Don't use qerror_report() in do_drive_del(), Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 17/33] qemu-nbd: Don't use qerror_report(), Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 19/33] block/ssh: Drop superfluous libssh2_session_last_errno() calls, Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 20/33] block/ssh: Propagate errors through check_host_key(), Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 21/33] block/ssh: Propagate errors through authenticate(), Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 22/33] block/ssh: Propagate errors through connect_to_ssh(), Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 23/33] block/ssh: Propagate errors to open and create methods, Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 24/33] block/vvfat: Propagate errors through enable_write_target(), Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 25/33] block/vvfat: Propagate errors through init_directories(), Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 18/33] block/rbd: Propagate errors to open and create methods, Stefan Hajnoczi, 2014/05/28