Rename the uart log to console.log, as we still need to log stdout/er…

…r and this probably makes more sense to name generically log. Allow specification of raw or device HDDs, by not prepending the file:// which qcow requires
bensallen · Mar 5, 2020 · 1a06ac6 · 1a06ac6
1 parent af58b82
commit 1a06ac6
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/internal/config/vm.go b/internal/config/vm.go
@@ -190,7 +190,7 @@ func (v *VMConfig) Cli() []string {
 	args = append(args, "-A", "-s", "0:0,hostbridge", "-s", "31,lpc", "-s", "1,virtio-rnd")
 
 	if v.RunDir != "" {
-		args = append(args, "-l", fmt.Sprintf("com1,autopty=%s/tty,log=%s/log", v.RunDir, v.RunDir))
+		args = append(args, "-l", fmt.Sprintf("com1,autopty=%s/tty,log=%s/console.log", v.RunDir, v.RunDir))
 	}
 
 	for i, net := range v.Network {
@@ -202,7 +202,12 @@ func (v *VMConfig) Cli() []string {
 	}
 
 	for i, hdd := range v.HDD {
-		args = append(args, "-s", fmt.Sprintf("3:%d,%s,file://%s,format=%s", i, hdd.Driver, hdd.Path, hdd.Format))
+		switch hdd.Format {
+		case "qcow":
+			args = append(args, "-s", fmt.Sprintf("3:%d,%s,file://%s,format=qcow", i, hdd.Driver, hdd.Path))
+		case "raw", "dev", "":
+			args = append(args, "-s", fmt.Sprintf("3:%d,%s,%s", i, hdd.Driver, hdd.Path))
+		}
 	}
 
 	for i, cd := range v.CDROM {