From patchwork Wed Jul 1 13:56:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 192136 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp518940ilg; Wed, 1 Jul 2020 06:59:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyWpV+X3oixkq1DoLBP4sVNH1pMXeVJSPbD9hWSxVJVrej2+B4k65Jv5lW+9s0k885ckfbp X-Received: by 2002:a25:2d24:: with SMTP id t36mr42941122ybt.426.1593611971765; Wed, 01 Jul 2020 06:59:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593611971; cv=none; d=google.com; s=arc-20160816; b=GxUiSY6RC3vauN6FTqHAYX2ZbmU9RhpJKlo9Dq9fe+RtLSKWKmjZTqlKkRvi+9vFDR tCYaB+puptqxKuPElNnNJ1rNucNtkl12ZalRJYTA83GhqlMldIAl2Mv8pGVpI0WQfJVw MdRVK1Fdo1PsJ3TbPv+xdbAxcmJb4qWgP7pKJExqpoZsyKxJ7DXFLpbFYbG+RBy2pN9v NSEvk0zS2KPYrzQsOlSVilL6J3jXw/jZ31TBx/Gqx0E6GUP5psVpKGPOWD24UqDgQkI4 vMQuna6FYlzLVmGpBmJwGD1JdCKh6hBr1j7IFF60QwLMi4/aKMIhweeQRlkDyXzXS3Sa cn8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=m1Iumf3YfxuO4NhxteboEtLnibs/CAVIrPHuCmkmoi4=; b=jM/+sFObNvNAYgxQKYy8jc3fVMMXGEHpayg//9YwZ0fMTP6u8seax87k80zaHZN09S xQ4zSbNF4ZY0A7Ch5Qs+7eoKeN9jrSMBEiOJm+nXUk0CZmrPONCmJQAK6Bm7xQJQq/v8 6kFKuneAxp0Krmccz5n9/6fjBHr7RYdpae8VmRnvnKoNWQAWvpsMppb84CfDRuzPcXJe T+eYWIJu3hBFNoXCWxK+ssSNHbUWyHquJTxfiH0+XM+awXhH3WmqS2sV734vpuaG5fqS jwjcoXSivSmGaK/7Sn1YWoktltnjoPuwJh4B9ajv+3WaMLgfX0z8R/cR8RI7/jZyJNvY UbJA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=SnlSS0zQ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id b14si5218942ybr.60.2020.07.01.06.59.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Jul 2020 06:59:31 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=SnlSS0zQ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:35626 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqdGt-00068t-6H for patch@linaro.org; Wed, 01 Jul 2020 09:59:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58906) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqdEZ-0002OW-Bl for qemu-devel@nongnu.org; Wed, 01 Jul 2020 09:57:07 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:47060) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqdEW-0005rB-2u for qemu-devel@nongnu.org; Wed, 01 Jul 2020 09:57:07 -0400 Received: by mail-wr1-x432.google.com with SMTP id r12so23891641wrj.13 for ; Wed, 01 Jul 2020 06:57:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=m1Iumf3YfxuO4NhxteboEtLnibs/CAVIrPHuCmkmoi4=; b=SnlSS0zQX/Muk/NpdPlmirftbBZaI2iqZ7F8X01Q4MwhLWbv0XGRNNcT9/z4GjyVvY P99F3fUTrkK6ml5XHzFcxfCOwTzNswE1JKNc+2iiu8l24KZJIImlOmLCMIiYcc0D682j juKhCS9RWfILHaYvlM6O+XzlOHOAZaF1dtmiK+ZOLQg2+5/cRAVGaIF+ZyKfrOvNYsGw 5shIZGmXnDFscDaUWiFXEkgKttzgUj+Ucn6Njgcu2ABlGsisvbuTe58/kbcozDu7lB6H Y0TRdMoOcXwjT88OCehjlrSKDo3v5hLqOSb/wrJ1UNH4EogGz4OCzl23Mi/F1jxoJPV4 JrKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=m1Iumf3YfxuO4NhxteboEtLnibs/CAVIrPHuCmkmoi4=; b=XEM2PXeGUlbbQozPuq3jesgSugRSVArWaTUTWBYzDLoOSuirRKfx3qd1oUfHPk9bZ8 RhDvwIv16TNPLWZM7OOv4voh7zIOx1eeUXA27iPdIN5SdwQgdge5+lGSNN6axO1jV6f8 XK/twOXH/c7RWEao6vHVeAk7c2yY+JR8WVufGD7TfqCJyUe/yGJWwgtE3tyeB0g1ymmS WpeHN4XQupFrWjwHBus51ZcP1mrnBcm4xxTz/P+e2LAWbOzqZynJgrdzQK0FMEAMWTFB uKJWbS3rep4sof9ZdlzeQsp61hwGTY3TP2vMoZHThRt2BwQS7ZlKl4hrv9yYbU7FWfFQ q3lA== X-Gm-Message-State: AOAM532G4jHTybbm8JmuWtoilhKwYMchm9U0DmUAFft37csL5s5dANtc WimK1Mx+x7cokibkQE6bH8LKuR1vGmw= X-Received: by 2002:a5d:4e48:: with SMTP id r8mr26381040wrt.309.1593611822633; Wed, 01 Jul 2020 06:57:02 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id 65sm7973132wma.48.2020.07.01.06.56.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2020 06:57:00 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 4DFE71FF91; Wed, 1 Jul 2020 14:56:53 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v4 05/40] tests/vm: pass args through to BaseVM's __init__ Date: Wed, 1 Jul 2020 14:56:17 +0100 Message-Id: <20200701135652.1366-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200701135652.1366-1-alex.bennee@linaro.org> References: <20200701135652.1366-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x432.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, Robert Foley , =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Robert Foley Adding the args parameter to BaseVM's __init__. We will shortly need to pass more parameters to the class so let's just pass args rather than growing the parameter list. Signed-off-by: Robert Foley Reviewed-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Message-Id: <20200601211421.1277-2-robert.foley@linaro.org> --- tests/vm/basevm.py | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) -- 2.20.1 diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index a80b616a08d..5a58e6c3930 100644 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -61,11 +61,10 @@ class BaseVM(object): # 4 is arbitrary, but greater than 2, # since we found we need to wait more than twice as long. tcg_ssh_timeout_multiplier = 4 - def __init__(self, debug=False, vcpus=None, genisoimage=None, - build_path=None): + def __init__(self, args): self._guest = None - self._genisoimage = genisoimage - self._build_path = build_path + self._genisoimage = args.genisoimage + self._build_path = args.build_path self._tmpdir = os.path.realpath(tempfile.mkdtemp(prefix="vm-test-", suffix=".tmp", dir=".")) @@ -78,7 +77,7 @@ class BaseVM(object): self._ssh_pub_key_file = os.path.join(self._tmpdir, "id_rsa.pub") open(self._ssh_pub_key_file, "w").write(SSH_PUB_KEY) - self.debug = debug + self.debug = args.debug self._stderr = sys.stderr self._devnull = open(os.devnull, "w") if self.debug: @@ -92,8 +91,8 @@ class BaseVM(object): (",ipv6=no" if not self.ipv6 else ""), "-device", "virtio-net-pci,netdev=vnet", "-vnc", "127.0.0.1:0,to=20"] - if vcpus and vcpus > 1: - self._args += ["-smp", "%d" % vcpus] + if args.jobs and args.jobs > 1: + self._args += ["-smp", "%d" % args.jobs] if kvm_available(self.arch): self._args += ["-enable-kvm"] else: @@ -456,8 +455,7 @@ def main(vmcls): return 1 logging.basicConfig(level=(logging.DEBUG if args.debug else logging.WARN)) - vm = vmcls(debug=args.debug, vcpus=args.jobs, - genisoimage=args.genisoimage, build_path=args.build_path) + vm = vmcls(args) if args.build_image: if os.path.exists(args.image) and not args.force: sys.stderr.writelines(["Image file exists: %s\n" % args.image,