Skip to content

updating QEMU parameters and default path for the firmware #1058

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

updating QEMU parameters and default path for the firmware #1058

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion pkg/defaults/defaults.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ const (
DefaultAdamLogLevel = "info" // min level of logs sent from EVE to Adam

DefaultQemuAccelDarwin = "-machine q35,accel=hvf -cpu kvm64,kvmclock=off "
DefaultQemuAccelDarwinArm64 = "-machine virt,accel=hvf,usb=off,dump-guest-core=off -cpu host "
DefaultQemuAccelDarwinArm64 = "-machine virt,accel=hvf,usb=off,dump-guest-core=on -cpu host "
DefaultQemuAccelLinuxAmd64 = "-machine q35,accel=kvm,dump-guest-core=off,kernel-irqchip=split -cpu host,invtsc=on,kvmclock=off -device intel-iommu,intremap=on,caching-mode=on,aw-bits=48 "
DefaultQemuAmd64 = "-machine q35,smm=on --cpu SandyBridge "

Expand Down
8 changes: 4 additions & 4 deletions pkg/eden/qemu.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ func StopSWTPM(stateDir string) error {

func startQMPLogger(qmpSockFile string, qmpLogFile string) error {
shellcmd := fmt.Sprintf(
"echo '{\"execute\": \"qmp_capabilities\"}' | " +
"socat -t0 -,ignoreeof UNIX-CONNECT:%s > %s",
"echo '{\"execute\": \"qmp_capabilities\"}' | "+
"socat -t0 -,ignoreeof UNIX-CONNECT:%s > %s",
qmpSockFile, qmpLogFile)
opts := []string{
"-c", shellcmd,
Expand All @@ -64,7 +64,7 @@ func startQMPLogger(qmpSockFile string, qmpLogFile string) error {
break
}
if err != nil {
return fmt.Errorf("startQMPLogger: can't connect to the QMP socket, presumably QEMU did not start")
return fmt.Errorf("startQMPLogger: can't connect to the QMP socket, presumably QEMU did not start")
}

return nil
Expand Down Expand Up @@ -207,7 +207,7 @@ func StartEVEQemu(qemuARCH, qemuOS, eveImageFile, imageFormat string, isInstalle

consoleOps := "-display none "
consoleOps += fmt.Sprintf("-serial chardev:char0 -chardev socket,id=char0,port=%d,"+
"host=localhost,server,nodelay,nowait,telnet,logappend=on,logfile=%s ",
"host=localhost,server=on,nodelay=on,wait=off,telnet=on,logappend=on,logfile=%s",
eveTelnetPort, logFile)
qemuOptions = consoleOps + qemuOptions
if !isInstaller {
Expand Down
2 changes: 1 addition & 1 deletion pkg/edensdn/qemu.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ func (vm *SdnVMQemuRunner) Start() error {
var qemuCommand string
qemuOptions := "-display none -nodefaults -no-user-config "
qemuOptions += fmt.Sprintf("-serial chardev:char0 -chardev socket,id=char0,port=%d,"+
"host=localhost,server,nodelay,nowait,telnet,logfile=%s ",
"host=localhost,server=on,nodelay=on,wait=off,telnet=on,logfile=%s ",
vm.TelnetPort, vm.ConsoleLogFile)
// Please note that the SDN agent uses maxMTU=16110, which is the limit imposed
// by the e1000 device. Should a different network device be used, do not forget
Expand Down
2 changes: 1 addition & 1 deletion pkg/openevec/defaults.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ func GetDefaultConfig(projectRootPath string) (*EdenSetupArgs, error) {
imageDist := filepath.Join(projectRootPath, defaults.DefaultDist, fmt.Sprintf("%s-%s", defaults.DefaultContext, defaults.DefaultImageDist))
certsDist := filepath.Join(projectRootPath, defaults.DefaultDist, fmt.Sprintf("%s-%s", defaults.DefaultContext, defaults.DefaultCertsDist))

firmware := []string{filepath.Join(imageDist, "eve", "OVMF.fd")}
firmware := []string{filepath.Join(imageDist, "eve", "firmware", "OVMF.fd")}
if runtime.GOARCH == "amd64" {
firmware = []string{
filepath.Join(imageDist, "eve", "firmware", "OVMF_CODE.fd"),
Expand Down