On Thu, Jul 20, 2023 at 17:19:57 -0500, Jonathon Jongsma wrote:
> For ssh disks that are served by nbdkit, use the configured value for
> knownHosts and pass it to the nbdkit process.
>
> Signed-off-by: Jonathon Jongsma <jjongsma@xxxxxxxxxx>
> ---
> src/conf/domain_conf.c | 8 ++++++
> src/conf/storage_source_conf.c | 1 +
> src/conf/storage_source_conf.h | 2 ++
> src/qemu/qemu_extdevice.c | 4 +--
> src/qemu/qemu_hotplug.c | 4 +--
> src/qemu/qemu_nbdkit.c | 25 +++++++++++++++----
> src/qemu/qemu_nbdkit.h | 6 +++--
> .../disk-network-ssh-password.args.disk0 | 3 ++-
> .../disk-network-ssh.args.disk0 | 3 ++-
> .../disk-network-ssh-password.xml | 1 +
> tests/qemuxml2argvdata/disk-network-ssh.xml | 1 +
> 11 files changed, 45 insertions(+), 13 deletions(-)
>
> diff --git a/src/conf/storage_source_conf.h b/src/conf/storage_source_conf.h
> index f13e7c756a..8a9c7d07e2 100644
> --- a/src/conf/storage_source_conf.h
> +++ b/src/conf/storage_source_conf.h
> @@ -410,6 +410,8 @@ struct _virStorageSource {
> /* these must not be used apart from formatting the output JSON in the qemu driver */
> char *ssh_user;
> bool ssh_host_key_check_disabled;
> + /* additional ssh variables */
> + char *ssh_known_hosts_file;
The new field *must* be copied in virStorageSourceCopy. See the comment
at the top of this struct declaration.
Reviewed-by: Peter Krempa <pkrempa@xxxxxxxxxx>
