diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-12-31 14:13:04 +0100 |
|---|---|---|
| committer | Christian Breunig <christian@breunig.cc> | 2024-12-31 14:13:04 +0100 |
| commit | 085df7615aaded2a24f3668f51505dfe7d446660 (patch) | |
| tree | 0d9b000294053c07f6cf2f98bce06a2fbfa4b5b1 /scripts/check-qemu-install | |
| parent | 3b95165b039a7058f8e9312815d7dad2dc05b694 (diff) | |
| download | vyos-build-085df7615aaded2a24f3668f51505dfe7d446660.tar.gz vyos-build-085df7615aaded2a24f3668f51505dfe7d446660.zip | |
Testsuite: T861: always use 2 VCPUs
Diffstat (limited to 'scripts/check-qemu-install')
| -rwxr-xr-x | scripts/check-qemu-install | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/scripts/check-qemu-install b/scripts/check-qemu-install index 7faea56f..00bdf080 100755 --- a/scripts/check-qemu-install +++ b/scripts/check-qemu-install @@ -121,13 +121,6 @@ class StreamToLogger(object): def flush(self): pass -def get_half_cpus(): - """ return 1/2 of the numbers of available CPUs """ - cpu = os.cpu_count() - if cpu > 1: - cpu /= 2 - return int(cpu) - OVMF_CODE = '/usr/share/OVMF/OVMF_CODE_4M.secboot.fd' OVMF_VARS_TMP = args.disk.replace('.img', '.efivars') if args.sbtest: @@ -162,13 +155,10 @@ def get_qemu_cmd(name, enable_uefi, disk_img, raid=None, iso_img=None, tpm=False f' -device ahci,id=achi0' \ f' -device ide-cd,bus=achi0.0,drive=drive-cd1,id=cd1,bootindex=10' - # test using half of the available CPUs on the system - cpucount = get_half_cpus() - - macbase = '52:54:00:00:00' + macbase = '02:00:00:00:00' cmd = f'qemu-system-x86_64 \ -name "{name}" \ - -smp {cpucount},sockets=1,cores={cpucount},threads=1 \ + -smp 2,sockets=1,cores=2,threads=1 \ -cpu host \ -machine {machine},accel=kvm \ {uefi} \ |