diff --git a/pkg/api/qconfig.go b/pkg/api/qconfig.go index c955e0c..c9fc025 100644 --- a/pkg/api/qconfig.go +++ b/pkg/api/qconfig.go @@ -172,10 +172,10 @@ func NewDefaultAarch64Config(name string, numCpus uint32, numMemMB uint32, sockD Memory: mem, CharDevices: []qcli.CharDevice{ qcli.CharDevice{ - Driver: qcli.PCISerialDevice, + Driver: qcli.LegacySerial, Backend: qcli.Socket, ID: "serial0", - Path: "/tmp/console.sock", + Path: filepath.Join(sockDir, "console.sock"), }, qcli.CharDevice{ Driver: qcli.LegacySerial, @@ -184,12 +184,9 @@ func NewDefaultAarch64Config(name string, numCpus uint32, numMemMB uint32, sockD Path: filepath.Join(sockDir, "monitor.sock"), }, }, - SerialDevices: []qcli.SerialDevice{ - qcli.SerialDevice{ - Driver: qcli.PCISerialDevice, - ID: "pciser0", - ChardevIDs: []string{"serial0"}, - MaxPorts: 1, + LegacySerialDevices: []qcli.LegacySerialDevice{ + qcli.LegacySerialDevice{ + ChardevID: "serial0", }, }, MonitorDevices: []qcli.MonitorDevice{ @@ -420,6 +417,11 @@ func GenerateQConfig(runDir, sockDir string, v VMDef) (*qcli.Config, error) { Type: "cdrom", ReadOnly: true, } + rt := runtime.GOARCH + if (rt == "aarch64" || rt == "arm64") { + qd.Attach = "virtio" + log.Infof("WARK: arch %s overriding cdrom Attach to virtio", rt) + } if v.Boot == "cdrom" { qd.BootIndex = "0" log.Infof("Boot from cdrom requested: bootindex=%s", qd.BootIndex)