diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-01-27 08:58:52 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-01-27 08:58:52 -0600 |
| commit | 21fe5bc678b16d748db385fb1be95caa96b00eee (patch) | |
| tree | 33342168c916f107f2c1e89c8fff8490b9e46f88 /qerror.c | |
| parent | 96bab41df61b532bb6954a38527ad8403859a6c9 (diff) | |
| parent | e2f0c49ffae8d3a00272c3cbc68850cc5aafbffa (diff) | |
| download | focaccia-qemu-21fe5bc678b16d748db385fb1be95caa96b00eee.tar.gz focaccia-qemu-21fe5bc678b16d748db385fb1be95caa96b00eee.zip | |
Merge remote-tracking branch 'kwolf/for-anthony' into staging
* kwolf/for-anthony: (22 commits) scsi: Guard against buflen exceeding req->cmd.xfer in scsi_disk_emulate_command qcow: Use bdrv functions to replace file operation qcow: Return real error code in qcow_open block/vdi: Zero unused parts when allocating a new block (fix #919242) virtio-blk: add virtio_blk_handle_read trace event docs: describe live block operations block: add support for partial streaming add QERR_BASE_NOT_FOUND block: add bdrv_find_backing_image blockdev: make image streaming safe across hotplug qmp: add query-block-jobs qmp: add block_job_cancel command qmp: add block_job_set_speed command qmp: add block_stream command block: rate-limit streaming operations block: add image streaming block job block: add BlockJob interface for long-running operations block: make copy-on-read a per-request flag block: check bdrv_in_use() before blockdev operations coroutine: add co_sleep_ns() coroutine sleep function ...
Diffstat (limited to 'qerror.c')
| -rw-r--r-- | qerror.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/qerror.c b/qerror.c index 3d95383940..637eca793c 100644 --- a/qerror.c +++ b/qerror.c @@ -52,6 +52,10 @@ static const QErrorStringTable qerror_table[] = { .desc = "Device '%(device)' can't go on a %(bad_bus_type) bus", }, { + .error_fmt = QERR_BASE_NOT_FOUND, + .desc = "Base '%(base)' not found", + }, + { .error_fmt = QERR_BLOCK_FORMAT_FEATURE_NOT_SUPPORTED, .desc = "Block format '%(format)' used by device '%(name)' does not support feature '%(feature)'", }, @@ -197,6 +201,10 @@ static const QErrorStringTable qerror_table[] = { .desc = "No '%(bus)' bus found for device '%(device)'", }, { + .error_fmt = QERR_NOT_SUPPORTED, + .desc = "Not supported", + }, + { .error_fmt = QERR_OPEN_FILE_FAILED, .desc = "Could not open '%(filename)'", }, |