From df35c18723b8bada0bdc3fd6940ed841cb1278ee Mon Sep 17 00:00:00 2001 From: AlissonMachadoEmbitel Date: Mon, 31 Mar 2025 12:58:15 +0200 Subject: [PATCH] updating QEMU parameters and default path for the firmware Signed-off-by: AlissonMachadoEmbitel --- pkg/defaults/defaults.go | 2 +- pkg/eden/qemu.go | 8 ++++---- pkg/edensdn/qemu.go | 2 +- pkg/openevec/defaults.go | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkg/defaults/defaults.go b/pkg/defaults/defaults.go index 72f83ebbe..b49d9cd83 100644 --- a/pkg/defaults/defaults.go +++ b/pkg/defaults/defaults.go @@ -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 " diff --git a/pkg/eden/qemu.go b/pkg/eden/qemu.go index e015865df..45fce4bf5 100644 --- a/pkg/eden/qemu.go +++ b/pkg/eden/qemu.go @@ -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, @@ -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 @@ -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 { diff --git a/pkg/edensdn/qemu.go b/pkg/edensdn/qemu.go index 6471a2a32..656cb0553 100644 --- a/pkg/edensdn/qemu.go +++ b/pkg/edensdn/qemu.go @@ -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 diff --git a/pkg/openevec/defaults.go b/pkg/openevec/defaults.go index c1f8a7c84..ddda05067 100644 --- a/pkg/openevec/defaults.go +++ b/pkg/openevec/defaults.go @@ -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"),