refactor: vz disk conversion #1463
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
AkihiroSuda
reviewed
Apr 7, 2023
pkg/qemu/imgutil/imgutil.go
Outdated
| cmd.Args, stdout.String(), stderr.String(), err) | ||
| } | ||
| return nil | ||
| } |
There was a problem hiding this comment.
Why do we still need this function?
There was a problem hiding this comment.
Now that you mention it, we probably don't. It's only useful if we want to explicitly specify that the input is qcow2, but qemu-img should be able to detect that on its own. Updated in latest rev.
AkihiroSuda
reviewed
Apr 7, 2023
| if err = imgutil.QCOWToRaw(extraDiskPath, rawPath); err != nil { | ||
| return fmt.Errorf("failed to convert qcow2 disk %q to raw for vz driver: %w", diskName, err) | ||
| oldFormatPath := fmt.Sprintf("%s.%s", extraDiskPath, extraDiskFormat) | ||
| if err = imgutil.ConvertToRaw(extraDiskPath, rawPath); err != nil { |
There was a problem hiding this comment.
Make sure that extraDiskFormat does not contain os.PathSeparator
There was a problem hiding this comment.
Thanks, updated in latest rev
Signed-off-by: Justin Alvarez <[email protected]>
pendo324
force-pushed
the
refactor-vz-disk-conversion
branch
from
d4ee80f to
fd0ab46
Compare
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.
Closes: #1438
Refactored disk conversion functions to be more explicit and used new
imgutil.ConvertToRawfunction in VZ driver, like suggested in #1405 (comment).