Merge pull request #17217 from raghavendra-talur/rtalur-qemu-improvements

qemu: better cpu type and IP detection
pull/17253/head
Medya Ghazizadeh 2023-09-15 17:25:40 -07:00 committed by GitHub
commit 319886a38d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions

View File

@ -510,7 +510,7 @@ func (d *Driver) Start() error {
return nil return nil
} }
// Implement a retry loop because IP address isn't added to dhcp leases file immediately // Implement a retry loop because IP address isn't added to dhcp leases file immediately
for i := 0; i < 30; i++ { for i := 0; i < 60; i++ {
log.Debugf("Attempt %d", i) log.Debugf("Attempt %d", i)
err = getIP() err = getIP()
if err == nil { if err == nil {

View File

@ -125,7 +125,9 @@ func configure(cc config.ClusterConfig, n config.Node) (interface{}, error) {
switch runtime.GOARCH { switch runtime.GOARCH {
case "amd64": case "amd64":
qemuMachine = "" // default qemuMachine = "" // default
qemuCPU = "" // default // set cpu type to max to enable higher microarchitecture levels
// see https://lists.gnu.org/archive/html/qemu-devel/2022-08/msg04066.html for details
qemuCPU = "max"
case "arm64": case "arm64":
qemuMachine = "virt" qemuMachine = "virt"
qemuCPU = "cortex-a72" qemuCPU = "cortex-a72"