|
@@ -1622,7 +1622,7 @@ int coroutine_fn bdrv_co_preadv_part(BdrvChild *child,
|
|
|
|
|
|
trace_bdrv_co_preadv_part(bs, offset, bytes, flags);
|
|
trace_bdrv_co_preadv_part(bs, offset, bytes, flags);
|
|
|
|
|
|
- if (!bdrv_is_inserted(bs)) {
|
|
|
|
|
|
+ if (!bdrv_co_is_inserted(bs)) {
|
|
return -ENOMEDIUM;
|
|
return -ENOMEDIUM;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -2067,7 +2067,7 @@ int coroutine_fn bdrv_co_pwritev_part(BdrvChild *child,
|
|
|
|
|
|
trace_bdrv_co_pwritev_part(child->bs, offset, bytes, flags);
|
|
trace_bdrv_co_pwritev_part(child->bs, offset, bytes, flags);
|
|
|
|
|
|
- if (!bdrv_is_inserted(bs)) {
|
|
|
|
|
|
+ if (!bdrv_co_is_inserted(bs)) {
|
|
return -ENOMEDIUM;
|
|
return -ENOMEDIUM;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -2835,7 +2835,7 @@ int coroutine_fn bdrv_co_flush(BlockDriverState *bs)
|
|
|
|
|
|
bdrv_inc_in_flight(bs);
|
|
bdrv_inc_in_flight(bs);
|
|
|
|
|
|
- if (!bdrv_is_inserted(bs) || bdrv_is_read_only(bs) ||
|
|
|
|
|
|
+ if (!bdrv_co_is_inserted(bs) || bdrv_is_read_only(bs) ||
|
|
bdrv_is_sg(bs)) {
|
|
bdrv_is_sg(bs)) {
|
|
goto early_exit;
|
|
goto early_exit;
|
|
}
|
|
}
|
|
@@ -2959,7 +2959,7 @@ int coroutine_fn bdrv_co_pdiscard(BdrvChild *child, int64_t offset,
|
|
BlockDriverState *bs = child->bs;
|
|
BlockDriverState *bs = child->bs;
|
|
IO_CODE();
|
|
IO_CODE();
|
|
|
|
|
|
- if (!bs || !bs->drv || !bdrv_is_inserted(bs)) {
|
|
|
|
|
|
+ if (!bs || !bs->drv || !bdrv_co_is_inserted(bs)) {
|
|
return -ENOMEDIUM;
|
|
return -ENOMEDIUM;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -3241,7 +3241,7 @@ static int coroutine_fn bdrv_co_copy_range_internal(
|
|
assert(!(read_flags & BDRV_REQ_NO_WAIT));
|
|
assert(!(read_flags & BDRV_REQ_NO_WAIT));
|
|
assert(!(write_flags & BDRV_REQ_NO_WAIT));
|
|
assert(!(write_flags & BDRV_REQ_NO_WAIT));
|
|
|
|
|
|
- if (!dst || !dst->bs || !bdrv_is_inserted(dst->bs)) {
|
|
|
|
|
|
+ if (!dst || !dst->bs || !bdrv_co_is_inserted(dst->bs)) {
|
|
return -ENOMEDIUM;
|
|
return -ENOMEDIUM;
|
|
}
|
|
}
|
|
ret = bdrv_check_request32(dst_offset, bytes, NULL, 0);
|
|
ret = bdrv_check_request32(dst_offset, bytes, NULL, 0);
|
|
@@ -3252,7 +3252,7 @@ static int coroutine_fn bdrv_co_copy_range_internal(
|
|
return bdrv_co_pwrite_zeroes(dst, dst_offset, bytes, write_flags);
|
|
return bdrv_co_pwrite_zeroes(dst, dst_offset, bytes, write_flags);
|
|
}
|
|
}
|
|
|
|
|
|
- if (!src || !src->bs || !bdrv_is_inserted(src->bs)) {
|
|
|
|
|
|
+ if (!src || !src->bs || !bdrv_co_is_inserted(src->bs)) {
|
|
return -ENOMEDIUM;
|
|
return -ENOMEDIUM;
|
|
}
|
|
}
|
|
ret = bdrv_check_request32(src_offset, bytes, NULL, 0);
|
|
ret = bdrv_check_request32(src_offset, bytes, NULL, 0);
|