From 583af7c1a63315c6d2c6bcfe278bc5c40e775ba2 Mon Sep 17 00:00:00 2001 From: David Crawshaw Date: Mon, 30 Aug 2021 14:05:39 +0000 Subject: [PATCH] tstest/integration/vms: give guest multiple cores and use generic machine Speeds up tests. Allows the use of more version of qemu. Signed-off-by: David Crawshaw --- tstest/integration/vms/vm_setup_test.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tstest/integration/vms/vm_setup_test.go b/tstest/integration/vms/vm_setup_test.go index a24d7f87a..0e94f7cfe 100644 --- a/tstest/integration/vms/vm_setup_test.go +++ b/tstest/integration/vms/vm_setup_test.go @@ -72,10 +72,12 @@ func (h *Harness) mkVM(t *testing.T, n int, d Distro, sshKey, hostURL, tdir stri driveArg := fmt.Sprintf("file=%s,if=virtio", filepath.Join(tdir, d.Name+".qcow2")) args := []string{ - "-machine", "pc-q35-5.1,accel=kvm,usb=off,vmport=off,dump-guest-core=off", + "-machine", "q35,accel=kvm,usb=off,vmport=off,dump-guest-core=off", "-netdev", fmt.Sprintf("user,hostfwd=::%d-:22,id=net0", port), "-device", "virtio-net-pci,netdev=net0,id=net0,mac=8a:28:5c:30:1f:25", "-m", fmt.Sprint(d.MemoryMegs), + "-cpu", "host", + "-smp", "4", "-boot", "c", "-drive", driveArg, "-cdrom", filepath.Join(tdir, d.Name, "seed", "seed.iso"),