mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-22 07:03:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

v2v: xen: Replace qemu block ssh driver with nbdkit-ssh-plugin.

Browse Source 
Initially this is a like-for-like replacement, but in future commits
this will allow us to implement:

 - password authentication (instead of SSH agent)

 - bandwidth throttling

 - readahead

Note this requires nbdkit >= 1.12.
This commit is contained in:
Richard W.M. Jones
2019-04-04 16:43:21 +01:00
parent 8e5930b9a8
commit 0977f4b909
3 changed files with 17 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
docs/guestfs-building.pod
View File

@@ -268,10 +268,13 @@ Optional. Used only for testing.
=item qemu-nbd
=item nbdkit
=item nbdkit E<ge> 1.12
Optional. qemu-nbd is used for testing.
L<virt-v2v(1)> requires nbdkit E<ge> 1.12 for various input and output
modes.
=item uml_mkcow
Optional. For the L<UML backend|guestfs(3)/BACKEND>.

48
v2v/input_libvirt_xen_ssh.ml
View File

@@ -45,18 +45,15 @@ object (self)
let source, disks, _ = parse_libvirt_domain self#conn guest in
let port =
match parsed_uri.uri_port with
| 0 | 22 -> None
| i -> Some (string_of_int i) in
let user = parsed_uri.uri_user in
(* Map the <source/> filename (which is relative to the remote
* Xen server) to an ssh URI. This is a JSON URI looking something
* like this:
*
* json: {
* "file.driver": "ssh",
* "file.user": "username",
* "file.host": "xen-host",
* "file.port": 1022,
* "file.path": <remote-path>,
* "file.host_key_check": "no"
* }
* Xen server) to an ssh URI pointing to nbdkit.
*)
let disks = List.map (
function
@@ -64,32 +61,9 @@ object (self)
disk
| { p_source_disk = disk; p_source = P_source_dev path }
| { p_source_disk = disk; p_source = P_source_file path } ->
(* Construct the JSON parameters. *)
let json_params = [
"file.driver", JSON.String "ssh";
"file.path", JSON.String path;
"file.host", JSON.String server;
"file.host_key_check", JSON.String "no";
] in
let json_params =
match parsed_uri.uri_port with
| 0 | 22 -> json_params
(* qemu will actually assert-fail if you send the port
* number as a string ...
*)
| i -> ("file.port", JSON.Int (Int64.of_int i)) :: json_params in
let json_params =
match parsed_uri.uri_user with
| None -> json_params
| Some user -> ("file.user", JSON.String user) :: json_params in
debug "ssh: json parameters: %s" (JSON.string_of_doc json_params);
(* Turn the JSON parameters into a 'json:' protocol string. *)
let qemu_uri = "json: " ^ JSON.string_of_doc json_params in
let nbdkit = Nbdkit.create_ssh ~password:NoPassword
?port ~server ?user path in
let qemu_uri = Nbdkit.run nbdkit in
{ disk with s_qemu_uri = qemu_uri }
) disks in

4
v2v/nbdkit.ml
View File

@@ -26,8 +26,8 @@ open Unix_utils
open Utils
let nbdkit_min_version = (1, 2)
let nbdkit_min_version_string = "1.2"
let nbdkit_min_version = (1, 12)
let nbdkit_min_version_string = "1.12"
type password =
| NoPassword (* no password option at all *)