From: Kevin Wolf Date: Fri, 28 Sep 2018 09:11:50 +0000 (+0200) Subject: block-backend: Set werror/rerror defaults in blk_new() X-Git-Tag: qemu-xen-4.12.1^2~55 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=399814e1a17572da006bad487825748fc87552cb;p=qemu-xen.git block-backend: Set werror/rerror defaults in blk_new() Currently, the default values for werror and rerror have to be set explicitly with blk_set_on_error() by the callers of blk_new(). The only caller actually doing this is blockdev_init(), which is called for BlockBackends created using -drive. In particular, anonymous BlockBackends created with -device ...,drive= didn't get the correct default set and instead defaulted to the integer value 0 (= BLOCKDEV_ON_ERROR_REPORT). This is the intended default for rerror anyway, but the default for werror should be BLOCKDEV_ON_ERROR_ENOSPC. Set the defaults in blk_new() instead so that they apply no matter what way the BlockBackend was created. Cc: qemu-stable@nongnu.org Signed-off-by: Kevin Wolf Reviewed-by: Eric Blake Reviewed-by: Fam Zheng (cherry picked from commit cb53460b708db3617ab73248374d071d5552c263) Signed-off-by: Michael Roth --- diff --git a/block/block-backend.c b/block/block-backend.c index f2f75a977d..1b27a68ae7 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -324,6 +324,9 @@ BlockBackend *blk_new(uint64_t perm, uint64_t shared_perm) blk->shared_perm = shared_perm; blk_set_enable_write_cache(blk, true); + blk->on_read_error = BLOCKDEV_ON_ERROR_REPORT; + blk->on_write_error = BLOCKDEV_ON_ERROR_ENOSPC; + block_acct_init(&blk->stats); notifier_list_init(&blk->remove_bs_notifiers); diff --git a/tests/qemu-iotests/067.out b/tests/qemu-iotests/067.out index 2e71cff3ce..b10c71db03 100644 --- a/tests/qemu-iotests/067.out +++ b/tests/qemu-iotests/067.out @@ -385,6 +385,7 @@ Testing: -device virtio-scsi -device scsi-cd,id=cd0 { "return": [ { + "io-status": "ok", "device": "", "locked": false, "removable": true,