[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 35/37] block/ssh: Make ssh_grow_file() blocking
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 35/37] block/ssh: Make ssh_grow_file() blocking |
Date: |
Fri, 2 Mar 2018 19:54:46 +0100 |
From: Max Reitz <address@hidden>
At runtime (that is, during a future ssh_truncate()), the SSH session is
non-blocking. However, ssh_truncate() (or rather, bdrv_truncate() in
general) is not a coroutine, so this resize operation needs to block.
For ssh_create(), that is fine, too; the session is never set to
non-blocking anyway.
Signed-off-by: Max Reitz <address@hidden>
Message-id: address@hidden
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Richard W.M. Jones <address@hidden>
Signed-off-by: Max Reitz <address@hidden>
---
block/ssh.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/block/ssh.c b/block/ssh.c
index d6a68cb880..4bcf10334f 100644
--- a/block/ssh.c
+++ b/block/ssh.c
@@ -803,17 +803,24 @@ static int ssh_file_open(BlockDriverState *bs, QDict
*options, int bdrv_flags,
return ret;
}
+/* Note: This is a blocking operation */
static int ssh_grow_file(BDRVSSHState *s, int64_t offset, Error **errp)
{
ssize_t ret;
char c[1] = { '\0' };
+ int was_blocking = libssh2_session_get_blocking(s->session);
/* offset must be strictly greater than the current size so we do
* not overwrite anything */
assert(offset > 0 && offset > s->attrs.filesize);
+ libssh2_session_set_blocking(s->session, 1);
+
libssh2_sftp_seek64(s->sftp_handle, offset - 1);
ret = libssh2_sftp_write(s->sftp_handle, c, 1);
+
+ libssh2_session_set_blocking(s->session, was_blocking);
+
if (ret < 0) {
sftp_error_setg(errp, s, "Failed to grow file");
return -EIO;
--
2.13.6
- [Qemu-devel] [PULL 25/37] docs: document how to use the l2-cache-entry-size parameter, (continued)
- [Qemu-devel] [PULL 25/37] docs: document how to use the l2-cache-entry-size parameter, Kevin Wolf, 2018/03/02
- [Qemu-devel] [PULL 24/37] specs/qcow2: Fix documentation of the compressed cluster descriptor, Kevin Wolf, 2018/03/02
- [Qemu-devel] [PULL 28/37] block: add BlockBackend->in_flight counter, Kevin Wolf, 2018/03/02
- [Qemu-devel] [PULL 27/37] block: extract AIO_WAIT_WHILE() from BlockDriverState, Kevin Wolf, 2018/03/02
- [Qemu-devel] [PULL 30/37] Revert "IDE: Do not flush empty CDROM drives", Kevin Wolf, 2018/03/02
- [Qemu-devel] [PULL 29/37] block: test blk_aio_flush() with blk->root == NULL, Kevin Wolf, 2018/03/02
- [Qemu-devel] [PULL 32/37] qcow2: make qcow2_co_create2() a coroutine_fn, Kevin Wolf, 2018/03/02
- [Qemu-devel] [PULL 33/37] qemu-img: Make resize error message more general, Kevin Wolf, 2018/03/02
- [Qemu-devel] [PULL 31/37] block: rename .bdrv_create() to .bdrv_co_create_opts(), Kevin Wolf, 2018/03/02
- [Qemu-devel] [PULL 35/37] block/ssh: Make ssh_grow_file() blocking,
Kevin Wolf <=
- [Qemu-devel] [PULL 34/37] block/ssh: Pull ssh_grow_file() from ssh_create(), Kevin Wolf, 2018/03/02
- [Qemu-devel] [PULL 36/37] block/ssh: Add basic .bdrv_truncate(), Kevin Wolf, 2018/03/02
- [Qemu-devel] [PULL 37/37] qcow2: Replace align_offset() with ROUND_UP(), Kevin Wolf, 2018/03/02
- Re: [Qemu-devel] [PULL 00/37] Block layer patches, Peter Maydell, 2018/03/05