]> git.proxmox.com Git - mirror_qemu.git/commitdiff
blockdev: Don't use qerror_report() in do_drive_del()
authorMarkus Armbruster <armbru@redhat.com>
Fri, 16 May 2014 09:00:09 +0000 (11:00 +0200)
committerStefan Hajnoczi <stefanha@redhat.com>
Wed, 28 May 2014 12:28:46 +0000 (14:28 +0200)
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 <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
blockdev.c

index 264b07ca4eacec68849bd27a6d07ea89ae99825a..8cc42fb1d0f8262e68550298f5afe7657c3138d3 100644 (file)
@@ -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)) {