[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 08/11] block/ssh: Implement .bdrv_dirname()
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PULL 08/11] block/ssh: Implement .bdrv_dirname() |
Date: |
Tue, 7 May 2019 17:18:16 +0200 |
ssh_bdrv_dirname() is basically the generic bdrv_dirname(), except it
takes care not to silently chop off any query string (i.e.,
host_key_check).
Signed-off-by: Max Reitz <address@hidden>
Tested-by: Richard W.M. Jones <address@hidden>
Message-id: address@hidden
Signed-off-by: Max Reitz <address@hidden>
---
block/ssh.c | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/block/ssh.c b/block/ssh.c
index 2eaeab84d5..12fd4f39e8 100644
--- a/block/ssh.c
+++ b/block/ssh.c
@@ -1283,6 +1283,26 @@ static void ssh_refresh_filename(BlockDriverState *bs)
}
}
+static char *ssh_bdrv_dirname(BlockDriverState *bs, Error **errp)
+{
+ if (qdict_haskey(bs->full_open_options, "host_key_check")) {
+ /*
+ * We cannot generate a simple prefix if we would have to
+ * append a query string.
+ */
+ error_setg(errp,
+ "Cannot generate a base directory with host_key_check set");
+ return NULL;
+ }
+
+ if (bs->exact_filename[0] == '\0') {
+ error_setg(errp, "Cannot generate a base directory for this ssh node");
+ return NULL;
+ }
+
+ return path_combine(bs->exact_filename, "");
+}
+
static const char *const ssh_strong_runtime_opts[] = {
"host",
"port",
@@ -1310,6 +1330,7 @@ static BlockDriver bdrv_ssh = {
.bdrv_co_truncate = ssh_co_truncate,
.bdrv_co_flush_to_disk = ssh_co_flush,
.bdrv_refresh_filename = ssh_refresh_filename,
+ .bdrv_dirname = ssh_bdrv_dirname,
.create_opts = &ssh_create_opts,
.strong_runtime_opts = ssh_strong_runtime_opts,
};
--
2.20.1
- [Qemu-devel] [PULL 00/11] Block patches, Max Reitz, 2019/05/07
- [Qemu-devel] [PULL 01/11] qcow2-refcount: fix check_oflag_copied, Max Reitz, 2019/05/07
- [Qemu-devel] [PULL 02/11] qcow2-refcount: avoid eating RAM, Max Reitz, 2019/05/07
- [Qemu-devel] [PULL 04/11] qcow2-refcount: check_refcounts_l2: don't count fixed cluster as allocated, Max Reitz, 2019/05/07
- [Qemu-devel] [PULL 03/11] qcow2-refcount: check_refcounts_l2: reduce ignored overlaps, Max Reitz, 2019/05/07
- [Qemu-devel] [PULL 05/11] qcow2-refcount: don't mask corruptions under internal errors, Max Reitz, 2019/05/07
- [Qemu-devel] [PULL 06/11] qcow2: discard bitmap when removed, Max Reitz, 2019/05/07
- [Qemu-devel] [PULL 08/11] block/ssh: Implement .bdrv_dirname(),
Max Reitz <=
- [Qemu-devel] [PULL 07/11] block/ssh: Implement .bdrv_refresh_filename(), Max Reitz, 2019/05/07
- [Qemu-devel] [PULL 09/11] block: Assert that drv->bdrv_child_perm is set in bdrv_child_perm(), Max Reitz, 2019/05/07
- [Qemu-devel] [PULL 10/11] commit: Use bdrv_append() in commit_start(), Max Reitz, 2019/05/07
- [Qemu-devel] [PULL 11/11] iotests: Fix iotests 110 and 126, Max Reitz, 2019/05/07
- Re: [Qemu-devel] [PULL 00/11] Block patches, Peter Maydell, 2019/05/09