Skip to content

Add Go wrapper support for different disk formats and drivers. #147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rn merged 1 commit into from
Jul 12, 2017
Merged

Add Go wrapper support for different disk formats and drivers. #147

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions go/hyperkit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,10 @@ type Socket9P struct {

// DiskConfig contains the path to a disk image and an optional size if the image needs to be created.
type DiskConfig struct {
Path string `json:"path"`
Size int `json:"size"`
Path string `json:"path"`
Size int `json:"size"`
Format string `json:"format"`
Driver string `json:"driver"`
}

// HyperKit contains the configuration of the hyperkit VM
Expand Down Expand Up @@ -428,7 +430,18 @@ func (h *HyperKit) buildArgs(cmdline string) {
}

for _, p := range h.Disks {
a = append(a, "-s", fmt.Sprintf("%d:0,virtio-blk,%s", nextSlot, p.Path))
// Default the driver to virtio-blk
driver := "virtio-blk"
if p.Driver != "" {
driver = p.Driver
}
arg := fmt.Sprintf("%d:0,%s,%s", nextSlot, driver, p.Path)

// Add on a format instruction if specified.
if p.Format != "" {
arg += ",format=" + p.Format
}
a = append(a, "-s", arg)
nextSlot++
}

Expand Down