From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, stefanha@redhat.com
Subject: [Qemu-devel] [PATCH v2 02/19] blockdev: Don't use qerror_report() in do_drive_del()
Date: Fri, 16 May 2014 11:00:09 +0200 [thread overview]
Message-ID: <1400230826-18009-3-git-send-email-armbru@redhat.com> (raw)
In-Reply-To: <1400230826-18009-1-git-send-email-armbru@redhat.com>
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>
---
blockdev.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index 24b1c3b..7478d4d 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"
@@ -1772,7 +1771,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.8.1.4
next prev parent reply other threads:[~2014-05-16 9:01 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-16 9:00 [Qemu-devel] [PATCH v2 00/19] block: Purge qerror_report() Markus Armbruster
2014-05-16 9:00 ` [Qemu-devel] [PATCH v2 01/19] blockdev: Don't use qerror_report_err() in drive_init() Markus Armbruster
2014-05-16 9:00 ` Markus Armbruster [this message]
2014-05-16 9:00 ` [Qemu-devel] [PATCH v2 03/19] qemu-nbd: Don't use qerror_report() Markus Armbruster
2014-05-16 9:00 ` [Qemu-devel] [PATCH v2 04/19] block/rbd: Propagate errors to open and create methods Markus Armbruster
2014-05-16 12:06 ` Eric Blake
2014-05-16 9:00 ` [Qemu-devel] [PATCH v2 05/19] block/ssh: Drop superfluous libssh2_session_last_errno() calls Markus Armbruster
2014-05-16 9:00 ` [Qemu-devel] [PATCH v2 06/19] block/ssh: Propagate errors through check_host_key() Markus Armbruster
2014-05-16 9:00 ` [Qemu-devel] [PATCH v2 07/19] block/ssh: Propagate errors through authenticate() Markus Armbruster
2014-05-16 9:00 ` [Qemu-devel] [PATCH v2 08/19] block/ssh: Propagate errors through connect_to_ssh() Markus Armbruster
2014-05-16 9:00 ` [Qemu-devel] [PATCH v2 09/19] block/ssh: Propagate errors to open and create methods Markus Armbruster
2014-05-16 9:00 ` [Qemu-devel] [PATCH v2 10/19] block/vvfat: Propagate errors through enable_write_target() Markus Armbruster
2014-05-16 9:00 ` [Qemu-devel] [PATCH v2 11/19] block/vvfat: Propagate errors through init_directories() Markus Armbruster
2014-05-16 9:00 ` [Qemu-devel] [PATCH v2 12/19] block/sheepdog: Propagate errors through connect_to_sdog() Markus Armbruster
2014-05-16 9:00 ` [Qemu-devel] [PATCH v2 13/19] block/sheepdog: Propagate errors through get_sheep_fd() Markus Armbruster
2014-05-16 9:00 ` [Qemu-devel] [PATCH v2 14/19] block/sheepdog: Propagate errors through sd_prealloc() Markus Armbruster
2014-05-16 13:05 ` Eric Blake
2014-05-16 9:00 ` [Qemu-devel] [PATCH v2 15/19] block/sheepdog: Propagate errors through do_sd_create() Markus Armbruster
2014-05-16 9:00 ` [Qemu-devel] [PATCH v2 16/19] block/sheepdog: Propagate errors through find_vdi_name() Markus Armbruster
2014-05-16 9:00 ` [Qemu-devel] [PATCH v2 17/19] block/sheepdog: Propagate errors to open and create methods Markus Armbruster
2014-05-16 13:06 ` Eric Blake
2014-05-16 9:00 ` [Qemu-devel] [PATCH v2 18/19] block/sheepdog: Fix silent sd_open(), sd_create() failures Markus Armbruster
2014-05-16 13:06 ` Eric Blake
2014-05-16 9:00 ` [Qemu-devel] [PATCH v2 19/19] block/sheepdog: Don't use qerror_report() Markus Armbruster
2014-05-23 15:40 ` [Qemu-devel] [PATCH v2 00/19] block: Purge qerror_report() Stefan Hajnoczi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1400230826-18009-3-git-send-email-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=kwolf@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).