aboutsummaryrefslogtreecommitdiff
path: root/qerror.h
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2012-10-29 10:34:05 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2012-10-29 10:34:05 -0500
commit90c45b30319dee7d4137f18817395454728ea2f9 (patch)
tree7d54515aa0b4a83f930a47f7b583852645e2e717 /qerror.h
parentd262cb02861dd33375c08fc798930653b14769e9 (diff)
parent3b6eda2f57a5b7ed047077b6272c2b5a9e3531ca (diff)
downloadqemu-90c45b30319dee7d4137f18817395454728ea2f9.zip
qemu-90c45b30319dee7d4137f18817395454728ea2f9.tar.gz
qemu-90c45b30319dee7d4137f18817395454728ea2f9.tar.bz2
Merge remote-tracking branch 'kwolf/for-anthony' into staging
* kwolf/for-anthony: (32 commits) osdep: Less restrictive F_SEFL in qemu_dup_flags() qemu-iotests: add testcases for mirroring on-source-error/on-target-error qmp: add pull_event function mirror: add support for on-source-error/on-target-error iostatus: forward block_job_iostatus_reset to block job qemu-iotests: add mirroring test case mirror: implement completion qmp: add drive-mirror command mirror: introduce mirror job block: introduce BLOCK_JOB_READY event block: add block-job-complete block: rename block_job_complete to block_job_completed block: export dirty bitmap information in query-block block: introduce new dirty bitmap functionality block: add bdrv_open_backing_file block: add bdrv_query_stats block: add bdrv_query_info qemu-config: Add new -add-fd command line option monitor: Prevent removing fd from set during init monitor: Enable adding an inherited fd to an fd set ... Conflicts: vl.c Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'qerror.h')
-rw-r--r--qerror.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/qerror.h b/qerror.h
index e0b77ec..8db4309 100644
--- a/qerror.h
+++ b/qerror.h
@@ -54,6 +54,9 @@ void assert_no_error(Error *err);
#define QERR_BLOCK_JOB_PAUSED \
ERROR_CLASS_GENERIC_ERROR, "The block job for device '%s' is currently paused"
+#define QERR_BLOCK_JOB_NOT_READY \
+ ERROR_CLASS_GENERIC_ERROR, "The active block job for device '%s' cannot be completed"
+
#define QERR_BLOCK_FORMAT_FEATURE_NOT_SUPPORTED \
ERROR_CLASS_GENERIC_ERROR, "Block format '%s' used by device '%s' does not support feature '%s'"