[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 16/33] blockdev: Don't use qerror_report() in do_d
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL v2 16/33] blockdev: Don't use qerror_report() in do_drive_del() |
Date: |
Wed, 28 May 2014 14:32:26 +0200 |
From: Markus Armbruster <address@hidden>
qerror_report() is a transitional interface to help with converting
existing HMP commands to QMP. It should not be used elsewhere.
do_drive_del() is an HMP command that won't be converted to QMP (we'll
create a new QMP command instead). It uses both qerror_report() 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 | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index 264b07c..8cc42fb 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -34,7 +34,6 @@
#include "hw/block/block.h"
#include "block/blockjob.h"
#include "monitor/monitor.h"
-#include "qapi/qmp/qerror.h"
#include "qemu/option.h"
#include "qemu/config-file.h"
#include "qapi/qmp/types.h"
@@ -1763,7 +1762,7 @@ int do_drive_del(Monitor *mon, const QDict *qdict,
QObject **ret_data)
bs = bdrv_find(id);
if (!bs) {
- qerror_report(QERR_DEVICE_NOT_FOUND, id);
+ error_report("Device '%s' not found", id);
return -1;
}
if (bdrv_op_is_blocked(bs, BLOCK_OP_TYPE_DRIVE_DEL, &local_err)) {
--
1.9.3
- [Qemu-devel] [PULL v2 05/33] iotests: Use _img_info in test 089, (continued)
- [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, 2014/05/28
- [Qemu-devel] [PULL v2 16/33] blockdev: Don't use qerror_report() in do_drive_del(),
Stefan Hajnoczi <=
- [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
- [Qemu-devel] [PULL v2 26/33] block/sheepdog: Propagate errors through connect_to_sdog(), Stefan Hajnoczi, 2014/05/28