[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 01/45] qerror/block: introduce QERR_BLOCK_JOB_NOT
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH v2 01/45] qerror/block: introduce QERR_BLOCK_JOB_NOT_ACTIVE |
Date: |
Wed, 26 Sep 2012 17:56:07 +0200 |
The DeviceNotActive text is not a particularly good match, add
a separate text while keeping the same class.
Signed-off-by: Paolo Bonzini <address@hidden>
---
v1->v2: rebased for Error changes
blockdev.c | 4 ++--
qerror.h | 3 +++
2 file modificati, 5 inserzioni(+), 2 rimozioni(-)
diff --git a/blockdev.c b/blockdev.c
index e5d450f..de5457d 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -1142,7 +1142,7 @@ void qmp_block_job_set_speed(const char *device, int64_t
speed, Error **errp)
BlockJob *job = find_block_job(device);
if (!job) {
- error_set(errp, QERR_DEVICE_NOT_ACTIVE, device);
+ error_set(errp, QERR_BLOCK_JOB_NOT_ACTIVE, device);
return;
}
@@ -1154,7 +1154,7 @@ void qmp_block_job_cancel(const char *device, Error
**errp)
BlockJob *job = find_block_job(device);
if (!job) {
- error_set(errp, QERR_DEVICE_NOT_ACTIVE, device);
+ error_set(errp, QERR_BLOCK_JOB_NOT_ACTIVE, device);
return;
}
diff --git a/qerror.h b/qerror.h
index d0a76a4..485c773 100644
--- a/qerror.h
+++ b/qerror.h
@@ -48,6 +48,9 @@ void assert_no_error(Error *err);
#define QERR_BASE_NOT_FOUND \
ERROR_CLASS_GENERIC_ERROR, "Base '%s' not found"
+#define QERR_BLOCK_JOB_NOT_ACTIVE \
+ ERROR_CLASS_DEVICE_NOT_ACTIVE, "No active block job on device '%s'"
+
#define QERR_BLOCK_FORMAT_FEATURE_NOT_SUPPORTED \
ERROR_CLASS_GENERIC_ERROR, "Block format '%s' used by device '%s' does not
support feature '%s'"
--
1.7.12
- [Qemu-devel] [PATCH v2 00/45] Block job improvements for 1.3, Paolo Bonzini, 2012/09/26
- [Qemu-devel] [PATCH v2 02/45] blockdev: rename block_stream_cb to a generic block_job_cb, Paolo Bonzini, 2012/09/26
- [Qemu-devel] [PATCH v2 04/45] block: move job APIs to separate files, Paolo Bonzini, 2012/09/26
- [Qemu-devel] [PATCH v2 05/45] block: add block_job_query, Paolo Bonzini, 2012/09/26
- [Qemu-devel] [PATCH v2 06/45] block: add support for job pause/resume, Paolo Bonzini, 2012/09/26