qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Thomas Huth <thuth@redhat.com>
To: Peter Maydell <peter.maydell@linaro.org>, qemu-devel@nongnu.org
Cc: Nikita Ivanov <nivanov@cloudlinux.com>
Subject: [PULL 02/15] tests/vm: Update get_default_jobs() to work on non-x86_64 non-KVM hosts
Date: Fri,  6 Jan 2023 09:28:40 +0100	[thread overview]
Message-ID: <20230106082853.31787-3-thuth@redhat.com> (raw)
In-Reply-To: <20230106082853.31787-1-thuth@redhat.com>

From: Philippe Mathieu-Daudé <philmd@linaro.org>

On non-x86_64 host, if KVM is not available we get:

  Traceback (most recent call last):
    File "tests/vm/basevm.py", line 634, in main
      vm = vmcls(args, config=config)
    File "tests/vm/basevm.py", line 104, in __init__
      mem = max(4, args.jobs)
  TypeError: '>' not supported between instances of 'NoneType' and 'int'

Fix by always returning a -- not ideal but safe -- '1' value.

Fixes: b09539444a ("tests/vm: allow us to take advantage of MTTCG")
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20221209164743.70836-1-philmd@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 tests/vm/basevm.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py
index 2276364c42..23229e23d1 100644
--- a/tests/vm/basevm.py
+++ b/tests/vm/basevm.py
@@ -569,8 +569,7 @@ def get_default_jobs():
                 # more cores. but only up to a reasonable limit. User
                 # can always override these limits with --jobs.
                 return min(multiprocessing.cpu_count() // 2, 8)
-        else:
-            return 1
+        return 1
 
     parser = argparse.ArgumentParser(
         formatter_class=argparse.ArgumentDefaultsHelpFormatter,
-- 
2.31.1



  parent reply	other threads:[~2023-01-06  8:49 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-06  8:28 [PULL 00/15] First batch of s390x, qtests and misc fixes in 2023 Thomas Huth
2023-01-06  8:28 ` [PULL 01/15] qemu-iotests/stream-under-throttle: do not shutdown QEMU Thomas Huth
2023-01-06  8:28 ` Thomas Huth [this message]
2023-01-06  8:28 ` [PULL 03/15] MAINTAINERS: Add MIPS-related docs and configs to the MIPS architecture section Thomas Huth
2023-01-06  8:28 ` [PULL 04/15] exec/memory: Expose memory_region_access_valid() Thomas Huth
2023-01-06  8:28 ` [PULL 05/15] hw/s390x/pv: Restrict Protected Virtualization to sysemu Thomas Huth
2023-01-06  8:28 ` [PULL 06/15] target/s390x/tcg/misc_helper: Remove unused "memory.h" include Thomas Huth
2023-01-06  8:28 ` [PULL 07/15] target/s390x/tcg/excp_helper: Restrict system headers to sysemu Thomas Huth
2023-01-06  8:28 ` [PULL 08/15] target/s390x: Restrict sysemu/reset.h to system emulation Thomas Huth
2023-01-06  8:28 ` [PULL 09/15] tests/readconfig: spice doesn't support unix socket on windows yet Thomas Huth
2023-01-06  8:28 ` [PULL 10/15] i386: Deprecate the -no-hpet QEMU command line option Thomas Huth
2023-01-06  8:28 ` [PULL 11/15] docs/interop: Change the vnc-ledstate-Pseudo-encoding doc into .rst Thomas Huth
2023-01-06  8:28 ` [PULL 12/15] Update scripts/meson-buildoptions.sh Thomas Huth
2023-01-06  8:28 ` [PULL 13/15] Refactoring: refactor TFR() macro to RETRY_ON_EINTR() Thomas Huth
2023-01-06  8:28 ` [PULL 14/15] error handling: Use RETRY_ON_EINTR() macro where applicable Thomas Huth
2023-01-06  8:28 ` [PULL 15/15] .gitlab-ci.d/windows: Do not run the qtests in the msys2-32bit job Thomas Huth
2023-01-07 14:25 ` [PULL 00/15] First batch of s390x, qtests and misc fixes in 2023 Peter Maydell
2023-01-09  7:50   ` Thomas Huth
2023-01-09 10:06     ` Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230106082853.31787-3-thuth@redhat.com \
    --to=thuth@redhat.com \
    --cc=nivanov@cloudlinux.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).