virtio-blk: Fix error cases which ignored rerror/werror
If an I/O request fails right away instead of getting an error only in the callback, we still need to consider rerror/werror. Signed-off-by: Kevin Wolf <kwolf@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
		
							parent
							
								
									f1b5286803
								
							
						
					
					
						commit
						6c510fbf60
					
				| 
						 | 
				
			
			@ -269,7 +269,7 @@ static void do_multiwrite(BlockDriverState *bs, BlockRequest *blkreq,
 | 
			
		|||
    if (ret != 0) {
 | 
			
		||||
        for (i = 0; i < num_writes; i++) {
 | 
			
		||||
            if (blkreq[i].error) {
 | 
			
		||||
                virtio_blk_req_complete(blkreq[i].opaque, VIRTIO_BLK_S_IOERR);
 | 
			
		||||
                virtio_blk_rw_complete(blkreq[i].opaque, -EIO);
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
| 
						 | 
				
			
			@ -313,7 +313,7 @@ static void virtio_blk_handle_read(VirtIOBlockReq *req)
 | 
			
		|||
    acb = bdrv_aio_readv(req->dev->bs, req->out->sector, &req->qiov,
 | 
			
		||||
                         req->qiov.size / 512, virtio_blk_rw_complete, req);
 | 
			
		||||
    if (!acb) {
 | 
			
		||||
        virtio_blk_req_complete(req, VIRTIO_BLK_S_IOERR);
 | 
			
		||||
        virtio_blk_rw_complete(req, -EIO);
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue