Add prototype vhd-format VDI.{import,export} #1832
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
xe vdi-export uuid=<VDI> filename=<filename> Signed-off-by: David Scott <dave.scott@eu.citrix.com> (cherry picked from commit c1f8bf5)
Note we now send 'PrintStderr' commands to the CLI while it is busy downloading or uploading disk images. A multithreaded CLI is necessary for this to work. Signed-off-by: David Scott <dave.scott@eu.citrix.com> (cherry picked from commit 752287c)
This allows both functions to use O_DIRECT. Signed-off-by: David Scott <dave.scott@eu.citrix.com> (cherry picked from commit 7de0ede) Conflicts: ocaml/xapi/OMakefile ocaml/xapi/import_raw_vdi.ml
Signed-off-by: David Scott <dave.scott@eu.citrix.com> (cherry picked from commit b89c237)
…' or 'vhd' The HTTP handler accepts an additional argument: GET /export_raw_vdi?vdi=<vdi>&format=<raw|vhd>... The content-disposition HTTP header is used to suggest a useful filename, and the content-type HTTP header is set to either application/octet-stream or application/vhd. The CLI accepts an optional argument: xe vdi-export uuid=<uuid> filename=<filename> [format=(raw|vhd)] .vhd format export will require a newer vhd-tool (>= 0.6.5) Signed-off-by: David Scott <dave.scott@eu.citrix.com> (cherry picked from commit 59fa5ee)
$ camlp4o -printer o -no_comments ocaml/xapi/import_raw_vdi.ml | md5sum e74faa7367f4c06d818a04fd87dfeeb5 $ git checkout HEAD^ $ camlp4o -printer o -no_comments ocaml/xapi/import_raw_vdi.ml | md5sum e74faa7367f4c06d818a04fd87dfeeb5 Signed-off-by: David Scott <dave.scott@eu.citrix.com> (cherry picked from commit 6c16a13) Conflicts: ocaml/xapi/import_raw_vdi.ml
This requires vhd-tool >= 0.6.6 Signed-off-by: David Scott <dave.scott@eu.citrix.com> (cherry picked from commit 99abc50) Conflicts: ocaml/xapi/import_raw_vdi.ml
Signed-off-by: David Scott <dave.scott@eu.citrix.com> (cherry picked from commit be7acec)
Signed-off-by: David Scott <dave.scott@eu.citrix.com> (cherry picked from commit 7f60bff)
Signed-off-by: David Scott <dave.scott@eu.citrix.com> (cherry picked from commit 62590b8)
Signed-off-by: John Else <john.else@citrix.com>
Signed-off-by: John Else <john.else@citrix.com>
Signed-off-by: John Else <john.else@citrix.com>
johnelse
added a commit
that referenced
this pull request
Jul 23, 2014
Add prototype vhd-format VDI.{import,export}
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We add 'xe vdi-export' to the existing 'xe vdi-import' (still using HTTP GET and PUT underneath). We support format=raw as well as format=vhd. We support import and export of delta disks. For good measure we include a nice progress bar for the CLI.
The actual .vhd processing is offloaded to the vhd-tool utility.
Backported from #1782