From nobody Sat May 18 14:10:00 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1674203133; cv=none; d=zohomail.com; s=zohoarc; b=YntDI1frex3ux/p0Q9aM4+llbef3Dj1Vv5rOZ7Hsz7sKBPwQbkIizp9Be6HofmeWmvXTIcNH8xs99Cji+UpMEtlYo/S96scR01IK7kGIfnjR5BsQ09k+xPN4iJh2WlOn6hg/u3qPt2GhNEsKgIJwAXliR+Dp3Q+L09qzWwWU3HE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1674203133; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Wur4svIjiQz2AhES/kPc/sLE88sCvtXVfBZRncbaNl8=; b=a5lRLg0sCXxE/kQqBtru1Zr+03OQnqyZ1sXwLHPRhuChpvfj6RQXxVc/SDg6DSymTzR8UueiDIM7AmY3U2P8KWBj/qWZQAdtzXrLX3WmJ3SxvnT+pFCz3lYnK9Cts8Ui7YTy4J6NUoAMeKJtJbQDgJ5ji/LJ2fMfQeJGrKAuGP4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1674203133518926.2615631716433; Fri, 20 Jan 2023 00:25:33 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pImgl-0004cV-Ng; Fri, 20 Jan 2023 03:23:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pImgj-0004bM-4S for qemu-devel@nongnu.org; Fri, 20 Jan 2023 03:23:53 -0500 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pImgh-0004Ym-L5 for qemu-devel@nongnu.org; Fri, 20 Jan 2023 03:23:52 -0500 Received: by mail-wm1-x329.google.com with SMTP id l41-20020a05600c1d2900b003daf986faaeso3062738wms.3 for ; Fri, 20 Jan 2023 00:23:50 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id n42-20020a05600c3baa00b003d96efd09b7sm1729432wms.19.2023.01.20.00.23.47 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 20 Jan 2023 00:23:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Wur4svIjiQz2AhES/kPc/sLE88sCvtXVfBZRncbaNl8=; b=Tsd8yw8gjM9WiWFw1u+nhbOAlviY0vi1LROWylW2VzuI+GjIQLkfcFkOj0qWq4cMgi Ax69DOAlk87lTdD+yBFpWtmq6aLQkJApghGcFerFyX1zI+TfzTJj5qfiye/VTAzc2ApM TiioFwe5eIOPy9Wa/zNbXrzsVPX5Ol3mvuBXfQeJ9FINgzwYBGnDARrlwu/rslyymbDp 5dYc1jBdQxGIWTLm3TpABQ3BwNA8+n8PmfcxnDV/4lQa2ysYTWD2dwvb+kJ+31CrhE78 Wx5dSAKoR1euHRiWhboQjM111/r7IhS+4bOObXRRUd7lmu3TSjh5y8OFSjCE0KQ5I8UZ gKTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Wur4svIjiQz2AhES/kPc/sLE88sCvtXVfBZRncbaNl8=; b=RGlieFiqjNvOhGmD1YBVKwM+E7pkP0z1KwM5b480UASRlEcrR8PSsYb1B9ye5WqFV8 vZ3ki+4V1TVrXJAPInvO1EJ8P9NcxpxYBZBLKGPeaz6Xvsfg+mQ+t0CVOQAQ1RXcU2a9 l4dL3VY9WJo69ChuwxP0ebe77+IkeQrVhiz1h74Ce4LkwIb3I2YLGVkibMlk2ZIazwDQ KVBxNPHWYTDlQcRKdeDoJ6cdJ19oaVFfG2aNKIbvWzTfXTnDrrMJtmUW2i7+/AOhpQmb FMQRDcjE1DQGpvQ58qSp8BYW/lB3DP55MyokcthMFbDGri/vi6q5euWruUZM6CkgxEK4 k3cw== X-Gm-Message-State: AFqh2kqqJuYbOC+GvtzVi7Boe8nkUG2BihOfQMHzUM8vINaI7thKcXM1 2lvQqEV9kYGrzO/AwhfShlaJXgoIKqktcSgk X-Google-Smtp-Source: AMrXdXtkJ1jqB1i3+J7XJoKLCAWgrZIbC9+CEu5oqMd2BfXeESU6BsC6DedPr2M5YwP28x+UXo5ABA== X-Received: by 2002:a05:600c:1d8a:b0:3db:f0a:cfa1 with SMTP id p10-20020a05600c1d8a00b003db0f0acfa1mr9825757wms.9.1674203028581; Fri, 20 Jan 2023 00:23:48 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , "Dr. David Alan Gilbert" , Thomas Huth , Fabiano Rosas , Juan Quintela , Laurent Vivier , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PATCH v3 01/11] tests/qtest/boot-serial-test: Constify tests[] array Date: Fri, 20 Jan 2023 09:23:31 +0100 Message-Id: <20230120082341.59913-2-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230120082341.59913-1-philmd@linaro.org> References: <20230120082341.59913-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=philmd@linaro.org; helo=mail-wm1-x329.google.com 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 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1674203135432100001 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- tests/qtest/boot-serial-test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qtest/boot-serial-test.c b/tests/qtest/boot-serial-test.c index b216519b62..3aef3a97a9 100644 --- a/tests/qtest/boot-serial-test.c +++ b/tests/qtest/boot-serial-test.c @@ -139,7 +139,7 @@ typedef struct testdef { const uint8_t *bios; /* Set in case we use our own mini bios */ } testdef_t; =20 -static testdef_t tests[] =3D { +static const testdef_t tests[] =3D { { "alpha", "clipper", "", "PCI:" }, { "avr", "arduino-duemilanove", "", "T", sizeof(bios_avr), NULL, bios_= avr }, { "avr", "arduino-mega-2560-v3", "", "T", sizeof(bios_avr), NULL, bios= _avr}, --=20 2.38.1 From nobody Sat May 18 14:10:00 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1674203176; cv=none; d=zohomail.com; s=zohoarc; b=XuKxgMg2cg9RGW2bQ6b1L18R/ltAhVKEJNNMtS1TcMd/KyhpmBiXPt3F0Gp/T8aO3vVO+Sxs7sxzW2gyev5oksRHBgaYnp8ZRXgMQvtLny8m164qDngT4v11DeHgKSn7wgyDwJKYb8ngW0xqIzLTVJuFWXqjyJ8y5djzrDIwti8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1674203176; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=96awe59Bl1JmrEDLbt0RIPfUyUqBQm6nbi4HGeicux4=; b=gzTLJmS1ovEXJjIt2XxjtDHk2EX3n+8hJf6eup+c64I5GaecyKWJcAktH2NItGfqy+pJ7Q2XrNeUWF9AzrX0CBTmjZeuLos72kpAV0GFQOm/ejoSRaX2ZR8ne3d3kR0Bwk7bqtuPgjAQPZQ8VmNmNZJtNKFtxcaj/JHGGxg0LnI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1674203176556681.5927349043076; Fri, 20 Jan 2023 00:26:16 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pImgp-0004fl-1U; Fri, 20 Jan 2023 03:23:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pImgl-0004ch-W0 for qemu-devel@nongnu.org; Fri, 20 Jan 2023 03:23:57 -0500 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pImgk-0004Yl-F1 for qemu-devel@nongnu.org; Fri, 20 Jan 2023 03:23:55 -0500 Received: by mail-wm1-x32d.google.com with SMTP id k16so3391185wms.2 for ; Fri, 20 Jan 2023 00:23:54 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id u8-20020a05600c19c800b003db0647645fsm1571932wmq.48.2023.01.20.00.23.52 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 20 Jan 2023 00:23:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=96awe59Bl1JmrEDLbt0RIPfUyUqBQm6nbi4HGeicux4=; b=SiTX1VhsgcvxE1cKCro2n5Mi9jtOQaep9/ODJ5g0I8+IccdsjcoIpUGTPMAivMl57Q OaRxlXCu+tR9/p3M1Y5Tud8mXI0nVmo2kgJ7S9qBnKY0dh0PqQkuHEZr0TcmC86xsd3O 4vPMCgQSXG+msdPBFmNTR4OJiiTutJ8O5KeQhuE9R6jza0UaWXZJgdSGX/BxJRsEq2v3 zHeGDMqOrRGAFzDaVmAjOAMRiLxz/ubqnvgCGANAgh+oH9hQNlzHMkYNTOX/M8PcxeGj tESNWrq6K+XPjPacohfOGBXxO86UDMcXnYxAgVjbfs/+2nztFZLYBjfjjNkAO29ceibc KMOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=96awe59Bl1JmrEDLbt0RIPfUyUqBQm6nbi4HGeicux4=; b=OqMpDgTkXkh5Mxn2bBvbbWL+gJUosAZvUsB6K363yhHmk4jy3yvYj33bLVG3wJo/7V GHT900zwVyvAZEQnVpsuJc0v+5BddtrcXYuGOQv67MGehbDPdz10o5d4gDMUxTi3fzm3 QJITXtQkL97TvGKld4YtbIePw3a9vqvYs+vDS7y1VHySuNd4MvwSgiJB8tF74ODBg2cE oygTaIAb7q/NDyRhOkVh6BuTGKCc3xhb+raY8nxFyBstAlJ/b0U7qq8rvaI3XGBXHC/D VPiIF8Hn44e0XZ4Nu2ra0MBE8g2HIIAmH0XYhkCnpI0t7RpY/zLXrwrCVh8mW/zkhCZ+ pY9A== X-Gm-Message-State: AFqh2ko1d81ZQVvnSsDHbikrpIlBXlcOqDkshh9WlTPHaDw1xTGtHPrK MIDiQ3re+yZjXCbqpGicSfbRvCSpv8LrxbIA X-Google-Smtp-Source: AMrXdXvZKVn3PP4bk4JFVqH76dfRfGKrYtbK1mNI5XHgKTuM4WPasLKaop3eYYXhvIPFIm1Ecu3gTg== X-Received: by 2002:a05:600c:3d9b:b0:3db:1afd:ac36 with SMTP id bi27-20020a05600c3d9b00b003db1afdac36mr6977627wmb.32.1674203033493; Fri, 20 Jan 2023 00:23:53 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , "Dr. David Alan Gilbert" , Thomas Huth , Fabiano Rosas , Juan Quintela , Laurent Vivier , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PATCH v3 02/11] tests/qtest/boot-serial-test: Simplify test_machine() a bit Date: Fri, 20 Jan 2023 09:23:32 +0100 Message-Id: <20230120082341.59913-3-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230120082341.59913-1-philmd@linaro.org> References: <20230120082341.59913-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=philmd@linaro.org; helo=mail-wm1-x32d.google.com 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 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1674203177691100001 Slighly modify test_machine() to simplify next commit review. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- tests/qtest/boot-serial-test.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/tests/qtest/boot-serial-test.c b/tests/qtest/boot-serial-test.c index 3aef3a97a9..3a854b0174 100644 --- a/tests/qtest/boot-serial-test.c +++ b/tests/qtest/boot-serial-test.c @@ -227,7 +227,6 @@ static void test_machine(const void *data) g_autofree char *serialtmp =3D NULL; g_autofree char *codetmp =3D NULL; const char *codeparam =3D ""; - const uint8_t *code =3D NULL; QTestState *qts; int ser_fd; =20 @@ -235,21 +234,13 @@ static void test_machine(const void *data) g_assert(ser_fd !=3D -1); close(ser_fd); =20 - if (test->kernel) { - code =3D test->kernel; - codeparam =3D "-kernel"; - } else if (test->bios) { - code =3D test->bios; - codeparam =3D "-bios"; - } - - if (code) { + if (test->kernel || test->bios) { ssize_t wlen; int code_fd; =20 code_fd =3D g_file_open_tmp("qtest-boot-serial-cXXXXXX", &codetmp,= NULL); g_assert(code_fd !=3D -1); - wlen =3D write(code_fd, code, test->codesize); + wlen =3D write(code_fd, test->kernel ? : test->bios, test->codesiz= e); g_assert(wlen =3D=3D test->codesize); close(code_fd); } @@ -258,12 +249,14 @@ static void test_machine(const void *data) * Make sure that this test uses tcg if available: It is used as a * fast-enough smoketest for that. */ - qts =3D qtest_initf("%s %s -M %s -no-shutdown " + qts =3D qtest_initf("%s %s %s -M %s -no-shutdown " "-chardev file,id=3Dserial0,path=3D%s " "-serial chardev:serial0 -accel tcg -accel kvm %s", - codeparam, code ? codetmp : "", test->machine, + codeparam, + test->kernel ? "-kernel " : test->bios ? "-bios " : = "", + codetmp ? : "", test->machine, serialtmp, test->extra); - if (code) { + if (codetmp) { unlink(codetmp); } =20 --=20 2.38.1 From nobody Sat May 18 14:10:00 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1674203084; cv=none; d=zohomail.com; s=zohoarc; b=Uaal/Fv+u0apI4w35byIdZ8C/JtQbCxcomnsiVrPoa8zl7YThDyIqRggYOYAKy4TA5pdMyb5Ho9wf85ecii5E4fFrZshFDdAcMjjJbb1RvLbRih5XPY/DIqYODMAG7D4JZ8rsmAHcbMZh6D45hpO0cDLpRSuUWV4ajkpzEUAo1o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1674203084; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=1A5XESI7TZ+yAtbO2UTL/bHexDg6E6J3DUKnc81TIsg=; b=fgQeNxXlj+vFrFxH0fKO1ZbbqLFu85Q4WaXmVt6Xs9UaOUK8kl7GTlgLe2Ia3GKBbc1zVpITalTQhEtcKUt+X6mKNGkuuMRxpb4IKp6nGeP0Or/mREbREkUTIuUEOFrogMYc7UyeE1iMCZJ3J0xvAbcvA+7OdY43kHa1+jt5Q4k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1674203084433355.4763860995283; Fri, 20 Jan 2023 00:24:44 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pImgy-0004i7-29; Fri, 20 Jan 2023 03:24:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pImgs-0004ga-Dx for qemu-devel@nongnu.org; Fri, 20 Jan 2023 03:24:03 -0500 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pImgq-0004aU-Ai for qemu-devel@nongnu.org; Fri, 20 Jan 2023 03:24:02 -0500 Received: by mail-wr1-x42a.google.com with SMTP id d14so446574wrr.9 for ; Fri, 20 Jan 2023 00:23:59 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id w5-20020adfcd05000000b002bdc914a139sm26774409wrm.108.2023.01.20.00.23.57 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 20 Jan 2023 00:23:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=1A5XESI7TZ+yAtbO2UTL/bHexDg6E6J3DUKnc81TIsg=; b=sij4FTf8IkBYLrd8CAQVgE2UQ7XoNGnRjyz4CuHxqJ5axll55NYvvPM++dJGCBMbW7 gQLLsZ4bjPl3pTq7+7ASYx7fZ2tWD35dIhf4w1QqU0eaqdpWdun/3DrDEypBIDcb9BNE dzuVHpYP5D+toXTbos1pgLwNQLlz9hZMpRwcE5SDOFUwPPDqvPfyLN1Gg/Kahpxnvw2Q rWh/nzhKEo61zV/Y/lDcbo+MlsyVSsDOXkoCqDYDiIJq6TrN0IBwIo0MJw9QmLm9+eH4 bAgSHRwY5yIg+BGbTBuZQpP81fhAeRFcwJBH5woEBNuZtH881ww9zI1xkcYfs/xMOZEV WGtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1A5XESI7TZ+yAtbO2UTL/bHexDg6E6J3DUKnc81TIsg=; b=ntr4v7udm1uTcKrk/yqtYQ+GF7REhmD8krhAMImDMIgo8VzoE0tYyzgLsd/YAFx/fq yZMbQPRSB1SU8lDT2/MtMW0Z+SyV3J7atzdqjhoKRXok11S9mmxyBEPQGISVez7/+auH vds56kFJndCr70GOQEDC8QzYvMwncVCrXjqE4fsjqTGZ+EEZsdnGcKRADKPZRlt/c0Vu zviWC9QlcEx3vWzZWaL13PpCJ+GhNY6WvY0SKwFAakGnEGn8eO3hOBwiCKBzplPcbEzL nSdW+3u3hP+JkXhvcOtpGnAmtcBBuS2laA1h2krJ6VPO+wmLe23Rp6QexkC8HT5a6tv0 fAIw== X-Gm-Message-State: AFqh2kpU1rFSB8rvVaUrRgbdn3Y8soHH2uw1V8bn65n2FvkZeM0yA3gJ rwDJEy1S1ICw4xVJHrkTZuIOsgqlc8z7TIwb X-Google-Smtp-Source: AMrXdXvm7fQhQCgW5HA6O5z7zQJve6GqD5VYOdHhabI3S2jJBJxpA2cTd88yuaZp/aZkQxEBYUt2YA== X-Received: by 2002:a5d:4842:0:b0:2bd:eccd:7ea4 with SMTP id n2-20020a5d4842000000b002bdeccd7ea4mr12256356wrs.47.1674203038501; Fri, 20 Jan 2023 00:23:58 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , "Dr. David Alan Gilbert" , Thomas Huth , Fabiano Rosas , Juan Quintela , Laurent Vivier , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PATCH v3 03/11] tests/qtest/boot-serial-test: Build command line using GString API Date: Fri, 20 Jan 2023 09:23:33 +0100 Message-Id: <20230120082341.59913-4-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230120082341.59913-1-philmd@linaro.org> References: <20230120082341.59913-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=philmd@linaro.org; helo=mail-wr1-x42a.google.com 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 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1674203086467100003 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- tests/qtest/boot-serial-test.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/tests/qtest/boot-serial-test.c b/tests/qtest/boot-serial-test.c index 3a854b0174..92890b409d 100644 --- a/tests/qtest/boot-serial-test.c +++ b/tests/qtest/boot-serial-test.c @@ -226,14 +226,17 @@ static void test_machine(const void *data) const testdef_t *test =3D data; g_autofree char *serialtmp =3D NULL; g_autofree char *codetmp =3D NULL; - const char *codeparam =3D ""; QTestState *qts; int ser_fd; + g_autoptr(GString) cmd =3D g_string_new(""); =20 ser_fd =3D g_file_open_tmp("qtest-boot-serial-sXXXXXX", &serialtmp, NU= LL); g_assert(ser_fd !=3D -1); close(ser_fd); =20 + g_string_append_printf(cmd, "-M %s ", test->machine); + g_string_append(cmd, "-no-shutdown "); + if (test->kernel || test->bios) { ssize_t wlen; int code_fd; @@ -243,19 +246,23 @@ static void test_machine(const void *data) wlen =3D write(code_fd, test->kernel ? : test->bios, test->codesiz= e); g_assert(wlen =3D=3D test->codesize); close(code_fd); + g_string_append_printf(cmd, "%s %s ", + test->kernel ? "-kernel " : "-bios ", codet= mp); } =20 + g_string_append_printf(cmd, "-chardev file,id=3Dserial0,path=3D%s " + "-serial chardev:serial0 ", serialtmp); + /* * Make sure that this test uses tcg if available: It is used as a * fast-enough smoketest for that. */ - qts =3D qtest_initf("%s %s %s -M %s -no-shutdown " - "-chardev file,id=3Dserial0,path=3D%s " - "-serial chardev:serial0 -accel tcg -accel kvm %s", - codeparam, - test->kernel ? "-kernel " : test->bios ? "-bios " : = "", - codetmp ? : "", test->machine, - serialtmp, test->extra); + g_string_append(cmd, "-accel tcg "); + g_string_append(cmd, "-accel kvm "); + g_string_append(cmd, test->extra); + + qts =3D qtest_init(cmd->str); + if (codetmp) { unlink(codetmp); } --=20 2.38.1 From nobody Sat May 18 14:10:00 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1674203114; cv=none; d=zohomail.com; s=zohoarc; b=LbaXwA4S1lWRuiDBBrPxV8z5rD1aKk5a2ZvlllqAvCN0UInGpIDCSCdG82oyhLyDuyrbffxepHF808Vbml+tMP9SmTh6iFKOM+cZiQJZBF15dw7Pyf/IjGtKMzMeUJgMNSycVo2iN/10fuSK9ICZPhdrCvwSOZMruUvD6x7Q+/4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1674203114; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Cm+umm3mYxK9+2vcvx9AjhkEUHA7aStmnl97320UCkM=; b=XrEcR0Zx6ybZ+2D1/zi+3rHhPsuDN0wIeMc8xp0U6DwfoQx1z/8EmarOP1MA7t74J6Hz6WBBzcsbHZF0cKalK8jNJ5FZ9m8pFi7y2Zq738rYvrNWQdx8OgziwH56R8pjJxYBzMJSFo4ckf21VGIAauNfXcuft3zJDToDCtTGHRA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 167420311443240.30051388574441; Fri, 20 Jan 2023 00:25:14 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pImh6-0004k3-M3; Fri, 20 Jan 2023 03:24:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pImgw-0004hp-2F for qemu-devel@nongnu.org; Fri, 20 Jan 2023 03:24:06 -0500 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pImgu-0004YJ-K9 for qemu-devel@nongnu.org; Fri, 20 Jan 2023 03:24:05 -0500 Received: by mail-wr1-x433.google.com with SMTP id h16so4105328wrz.12 for ; Fri, 20 Jan 2023 00:24:04 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id f3-20020adfdb43000000b00236883f2f5csm36048130wrj.94.2023.01.20.00.24.02 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 20 Jan 2023 00:24:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Cm+umm3mYxK9+2vcvx9AjhkEUHA7aStmnl97320UCkM=; b=ZpunFXMVSA4HnDYLCxUAriPXIak+DVQgFJdJ2EuMNuyS4tj/uWIf8PWhBitRFop6yM pZg2ZYBwWNXuqkCEu3FrSdWX/fiVN3a0Nu4s22Ptreha+vqxjn0w7hofupOEswa0ASiW B7Ws4CDr5rYpBswrj92vVOGSHQETB0E9euM+Dn32W5ySyheZcrpixWE9OApSqHEysK9u d+fPWpWjF+oqtke4aQ+78zL/2eSEh8erc5RaNGAfa7DQBmbpsOK2WSr1Px+TCK25DB5U m4p4dDUX2+oT9lJZbOxUTMp+1J2A4EtTcLiSTA7f7uJ1uTlkak7w3StJ0ibhty+THl3r OgEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Cm+umm3mYxK9+2vcvx9AjhkEUHA7aStmnl97320UCkM=; b=WmedSSO7QeSl+OcC0oYN4RQ4WOi5mSZQ7z4NUsbO3Rq81anLWBGLYF43c7VuQQi8G1 k+IMUDl0Cu12Vk554wh+X9O47UvlWP9R8ZaX9YDztITXfmXUQ5B/+75Q9PgQg1i5SFzZ OD6qeEqm0h6+tJ5S6zz7nbGmDELE9sUy4lePqYOeJT9Qm0+Qikx/jeOd0SAxeBcg3hDk usAmcwMKxjKyOewJz1lfk+OBpI3oblrXZe3QTGpta2VciqxRId4M1yyPDbeNY1HVUDd8 BV0L88xTGIAsw/mRv2Jtj1bMXytSuAvt9AWyQwNyXFMfM9TTIrO0jTWAkgRoZ69ZCsdq 1V2A== X-Gm-Message-State: AFqh2krdtXWPLkTNTXJcvJy4soXLFBkDekjERRr/BXG8WGRCbGIjcFkS LgQdy6t/sdWKXpYGVwdp+LcwaAPCDPQ3CILX X-Google-Smtp-Source: AMrXdXsfmBZ5MjQCb5Dqpr1yZdVvUB+CsAu0vjBhxBYqpeRVQKmTgKibwgePyL+e8zL9t8eT/6BmUg== X-Received: by 2002:a5d:4dcb:0:b0:2bd:c1de:a33f with SMTP id f11-20020a5d4dcb000000b002bdc1dea33fmr7516960wru.19.1674203043574; Fri, 20 Jan 2023 00:24:03 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , "Dr. David Alan Gilbert" , Thomas Huth , Fabiano Rosas , Juan Quintela , Laurent Vivier , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PATCH v3 04/11] tests/qtest/boot-serial-test: Only use available accelerators Date: Fri, 20 Jan 2023 09:23:34 +0100 Message-Id: <20230120082341.59913-5-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230120082341.59913-1-philmd@linaro.org> References: <20230120082341.59913-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=philmd@linaro.org; helo=mail-wr1-x433.google.com 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 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1674203115359100001 For example, avoid when TCG is disabled: $ make check-qtest-aarch64 ... 18/20 qemu:qtest+qtest-aarch64 / qtest-aarch64/boot-serial-test qemu-system-aarch64: -accel tcg: invalid accelerator tcg Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Fabiano Rosas Reviewed-by: Richard Henderson --- tests/qtest/boot-serial-test.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/tests/qtest/boot-serial-test.c b/tests/qtest/boot-serial-test.c index 92890b409d..f375b16dae 100644 --- a/tests/qtest/boot-serial-test.c +++ b/tests/qtest/boot-serial-test.c @@ -17,6 +17,9 @@ #include "libqtest.h" #include "libqos/libqos-spapr.h" =20 +static bool has_tcg; +static bool has_kvm; + static const uint8_t bios_avr[] =3D { 0x88, 0xe0, /* ldi r24, 0x08 */ 0x80, 0x93, 0xc1, 0x00, /* sts 0x00C1, r24 ; Enable tx */ @@ -257,8 +260,12 @@ static void test_machine(const void *data) * Make sure that this test uses tcg if available: It is used as a * fast-enough smoketest for that. */ - g_string_append(cmd, "-accel tcg "); - g_string_append(cmd, "-accel kvm "); + if (has_tcg) { + g_string_append(cmd, "-accel tcg "); + } + if (has_kvm) { + g_string_append(cmd, "-accel kvm "); + } g_string_append(cmd, test->extra); =20 qts =3D qtest_init(cmd->str); @@ -285,6 +292,9 @@ int main(int argc, char *argv[]) const char *arch =3D qtest_get_arch(); int i; =20 + has_tcg =3D qtest_has_accel("tcg"); + has_kvm =3D qtest_has_accel("kvm"); + g_test_init(&argc, &argv, NULL); =20 for (i =3D 0; tests[i].arch !=3D NULL; i++) { --=20 2.38.1 From nobody Sat May 18 14:10:00 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1674203148; cv=none; d=zohomail.com; s=zohoarc; b=DYGZb1OvuMYvvOdpkC/MxGo5Y94X6GGIZpa4s8K5qaY4IZ+m5xImEd65Cv7doSKUA3U6Lj8jOLtfveIp03k0J8gw5ayVE+Cf9DvexvPYqv9+qKBo4UQ8gmbAmuOI9JO24eiX8bwFYAzlrTrsMw2otWXAZ+dlOzDnXG1Avw1u1Mg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1674203148; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=mY7oyQj8bfUQn3aOeG+xwKrGHm6i2eqj02t4Nx+dHyw=; b=cSnhianA5/oTf8LcLo2Y05No+765YNzUT8Dn1SvKJ02J/QlELwDhWLwEcpyoNsV4/D/KwrGzeUiPQgbjNWyb8EHn0k70Y0UFgu+Fp7IOYIrbolW3G/NXAp0aKlVlLOksNZesZbBPfN7vUbSmfpNgVZLgdSPMpcrELhfth6mgcSY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1674203148650793.5373055377859; Fri, 20 Jan 2023 00:25:48 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pImh8-0004mz-43; Fri, 20 Jan 2023 03:24:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pImh3-0004jl-NL for qemu-devel@nongnu.org; Fri, 20 Jan 2023 03:24:14 -0500 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pImh0-0004dI-2O for qemu-devel@nongnu.org; Fri, 20 Jan 2023 03:24:11 -0500 Received: by mail-wm1-x32b.google.com with SMTP id g10so3398396wmo.1 for ; Fri, 20 Jan 2023 00:24:09 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id z4-20020a05600c0a0400b003db01178b62sm1674206wmp.40.2023.01.20.00.24.07 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 20 Jan 2023 00:24:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=mY7oyQj8bfUQn3aOeG+xwKrGHm6i2eqj02t4Nx+dHyw=; b=mI6b9UHz7VwJB3FJYRPDidQ8ghs6YLa7TctpxwlzBiJMTF7IWbrDr65GAtGWb/CvIp 3CmTgRniDVM8QNqpxP/Al+k/4j8UJs4qqdMA482KJKjXui3GDtQ2QE3IrXRiO5HwYmW6 dMX0bOpXxKupdjH//dwviLouy1U9kDGrrIq+KeJe6NpLXlkfeCbIP+HzNbA8pQY8Royr agKHrebV5a59vBOA0/tyzKmvdAvC2mNKZNJ++kuhR0l2RxYUkIQ/Vx9KCccuVvz2uQmu +ivTAr74lXB6f+FzCSJhYVvJUjkBKHSvzpJPSH5crBOLmJakPtIH2wx+1OCV6zwdPrNV ZdbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mY7oyQj8bfUQn3aOeG+xwKrGHm6i2eqj02t4Nx+dHyw=; b=fSH38oUHAggd6vgi2CKlb2PznUlBE5GImWgN3uqgOL/wPVsoXcTIPkiVGwZM2LOT3d XjnGnkZ1Q0c9boaxO0Sy4W1etfrNY97mdJHsmAgKXMYPyyj5UQjXtN6o40a6dH/AbwXz jQ1ouexpRTrEd0kFjuKTXycuX33E+KP9OZV7gn1lGxywHupDWMYSQG2kkgwZmHTrCgbj KeFsQL8BymUTvtFBmW8EdE7ovNmsHCjr9Z4E1BHw+AWmovg2YEVaFjgo6Y4hN+m6yPlB MMUNdbRgWKAHRZJGp1IBK4i8xhVPWL/LDAKD06pr93FFfSbhH3G145XviXf7nfbf8Ny9 qZeg== X-Gm-Message-State: AFqh2krORmNipOrXXX1PIKlyjVX8KVsqzf4io3GlDJaWFv2QazPpdTYL erMQloRVTFTxeZCaJAbxD5ybPRrwYT55suxO X-Google-Smtp-Source: AMrXdXv0YkdNv99JTOn1W2EMKhicmo/LKD8OCAWPhq3mqjiFoMa6P60E2+DyvsVGvT3TpbyyWUSMRw== X-Received: by 2002:a05:600c:cc8:b0:3cf:497c:c59e with SMTP id fk8-20020a05600c0cc800b003cf497cc59emr9568717wmb.6.1674203048594; Fri, 20 Jan 2023 00:24:08 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , "Dr. David Alan Gilbert" , Thomas Huth , Fabiano Rosas , Juan Quintela , Laurent Vivier , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PATCH v3 05/11] tests/qtest/migration-test: Inverse #ifdef'ry ladders Date: Fri, 20 Jan 2023 09:23:35 +0100 Message-Id: <20230120082341.59913-6-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230120082341.59913-1-philmd@linaro.org> References: <20230120082341.59913-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.google.com 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 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1674203149668100003 This slighly simplify the logic, and eases the following conversion. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Juan Quintela --- tests/qtest/migration-test.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c index 1dd32c9506..5271ddb868 100644 --- a/tests/qtest/migration-test.c +++ b/tests/qtest/migration-test.c @@ -647,15 +647,15 @@ static int test_migrate_start(QTestState **from, QTes= tState **to, } =20 if (!getenv("QTEST_LOG") && args->hide_stderr) { -#ifndef _WIN32 - ignore_stderr =3D "2>/dev/null"; -#else +#ifdef _WIN32 /* * On Windows the QEMU executable is created via CreateProcess() a= nd * IO redirection does not work, so don't bother adding IO redirec= tion * to the command line. */ ignore_stderr =3D ""; +#else + ignore_stderr =3D "2>/dev/null"; #endif } else { ignore_stderr =3D ""; --=20 2.38.1 From nobody Sat May 18 14:10:00 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1674203120; cv=none; d=zohomail.com; s=zohoarc; b=S2yjAYSQl+nMu2CDJybYqQyALf/CWB6uOt712kSPLPNbtEx3JQDupgDGe4gYV8xPB0H5nS3pyNqu4cww2guL7mwTkcQbGkHNbgTq8/nfm4EVAnGbQM0prB88/p7ZzhQOr80gLQqbAjBjVzN+/NFE9hTrbBoN2jM/POjpKlMyt9w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1674203120; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=N5m6RkKP7q/TMIRjDQYBTfdOOAJj550dV/XF1lV81V8=; b=EPjT5OW9NVzIm64/EtrylkksUx02hGKTcNoBFAMBhFFUgY1qtCqA7IXYt/FdxGa0cPViVEZLka3QhwAFylbATIhHQ/pvC6TUM8ZoG+Ab15g//jFzwgcmHZT/WJs78ptf1ulSZ+b6QRRa3DB6db3dGW0XNg9mPFto5eGHZLAdrnU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1674203120286653.4080731882887; Fri, 20 Jan 2023 00:25:20 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pImhB-0004pX-Fq; Fri, 20 Jan 2023 03:24:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pImh8-0004no-Ra for qemu-devel@nongnu.org; Fri, 20 Jan 2023 03:24:19 -0500 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pImh5-0004dh-EO for qemu-devel@nongnu.org; Fri, 20 Jan 2023 03:24:18 -0500 Received: by mail-wm1-x32e.google.com with SMTP id iv8-20020a05600c548800b003db04a0a46bso724603wmb.0 for ; Fri, 20 Jan 2023 00:24:14 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id v17-20020a05600c445100b003d9e74dd9b2sm1583458wmn.9.2023.01.20.00.24.12 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 20 Jan 2023 00:24:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=N5m6RkKP7q/TMIRjDQYBTfdOOAJj550dV/XF1lV81V8=; b=Ejrrv4oC3Wuul2SsVkNrFQoWgwLiPrb2VP/L/gZnJuK1k2l9cH5aFBAorzBfVEWACk pC3NmbWFsoiL0i/Jd4lULB5tJi4ZXnjrr+PxSPZ5cStlWa+FNFx9gKtcEomzCJ9W3gcM CxfWTsH8SlNfhMTs7XKT6zWMm5JY3NI/sisp9CHqSyB1chy+6KB+OH2IL2OeXYzE/EWC mAdHJ5tPPLl0EEh89kqCtVbDSLYFHYrYg4rkX/6GH1w5vVk3lTxivOsIzZwF1wT3v4hQ Msr8JET+3dvYNOdR67L9QeCtrtyekGUg8klr5z0sqlcF2EEI0MHayCuy0epUFKpdJwWm 4U0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=N5m6RkKP7q/TMIRjDQYBTfdOOAJj550dV/XF1lV81V8=; b=YJwiJWsMo5JZD+sE3fnOw8SfLtp2kJ3sdMq526FeLWVOC9ikqQX0WrSjkuHDh/9A4x wRC89CIvv4SjHXpNkcgH07QONau5BV32yiTlSQ7Q0x/blAx72q6gGf+i71Rr1jTOlD20 F9XmUdCdlWzJWm6hmR8msO/u9MnVeLNZ6ZaHuMPrKl56DRk3mRBb7vTvzhVRG8PqWqnt J0zv1oCOEQD+zPXRmtRqBhxsZ122THSUzRlWlVlAB83JLTXGYEXqT9kMvvo+n80Mr+9s AxPnyAwQGPej82tPtMoo6SwrgWY+fxSXsRTFo+TfFI3/ymHg8Dq2DBVOIAKqgS7C0y1S qbEg== X-Gm-Message-State: AFqh2kr2HRvTLm8MaA2XVFa4Ib9/vXdity3v/ioFmm5KJTk6GnwpkrCU DvCnZmOuAgcXZ/agVWdsijBEIZIZHEZr/FuM X-Google-Smtp-Source: AMrXdXs4e+K72zPHdtLRAR/OKp1SDTdf94fwA3k0TIpVKzgBixhnO+qdkNV2Wdfu4y/fUV2ibB06cg== X-Received: by 2002:a05:600c:4256:b0:3da:2a78:d7a3 with SMTP id r22-20020a05600c425600b003da2a78d7a3mr12691383wmm.33.1674203053573; Fri, 20 Jan 2023 00:24:13 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , "Dr. David Alan Gilbert" , Thomas Huth , Fabiano Rosas , Juan Quintela , Laurent Vivier , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PATCH v3 06/11] tests/qtest/migration-test: Reduce 'cmd_source' string scope Date: Fri, 20 Jan 2023 09:23:36 +0100 Message-Id: <20230120082341.59913-7-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230120082341.59913-1-philmd@linaro.org> References: <20230120082341.59913-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=philmd@linaro.org; helo=mail-wm1-x32e.google.com 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 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1674203121340100001 Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Juan Quintela --- tests/qtest/migration-test.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c index 5271ddb868..f96c73f552 100644 --- a/tests/qtest/migration-test.c +++ b/tests/qtest/migration-test.c @@ -584,7 +584,6 @@ static int test_migrate_start(QTestState **from, QTestS= tate **to, { g_autofree gchar *arch_source =3D NULL; g_autofree gchar *arch_target =3D NULL; - g_autofree gchar *cmd_source =3D NULL; g_autofree gchar *cmd_target =3D NULL; const gchar *ignore_stderr; g_autofree char *bootpath =3D NULL; @@ -672,20 +671,22 @@ static int test_migrate_start(QTestState **from, QTes= tState **to, shmem_opts =3D g_strdup(""); } =20 - cmd_source =3D g_strdup_printf("-accel kvm%s -accel tcg%s%s " - "-name source,debug-threads=3Don " - "-m %s " - "-serial file:%s/src_serial " - "%s %s %s %s", - args->use_dirty_ring ? - ",dirty-ring-size=3D4096" : "", - machine_opts ? " -machine " : "", - machine_opts ? machine_opts : "", - memory_size, tmpfs, - arch_source, shmem_opts, - args->opts_source ? args->opts_source : "= ", - ignore_stderr); if (!args->only_target) { + g_autofree gchar *cmd_source =3D NULL; + + cmd_source =3D g_strdup_printf("-accel kvm%s -accel tcg%s%s " + "-name source,debug-threads=3Don " + "-m %s " + "-serial file:%s/src_serial " + "%s %s %s %s", + args->use_dirty_ring ? + ",dirty-ring-size=3D4096" : "", + machine_opts ? " -machine " : "", + machine_opts ? machine_opts : "", + memory_size, tmpfs, + arch_source, shmem_opts, + args->opts_source ? args->opts_source= : "", + ignore_stderr); *from =3D qtest_init(cmd_source); } =20 --=20 2.38.1 From nobody Sat May 18 14:10:00 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1674203158; cv=none; d=zohomail.com; s=zohoarc; b=akbTBxZGBtYKPp2VUiIJim+3n8EnRva1WFHShTQla0++JW/qpEjl0luy/kVz8u0cFf1eXl6+GZo8qBveA+tG9dqWY38KCVJkhCR0KW6glYkL5CYRiJ9SLmVmTLjjAisigJ3V908TDI79bCnVsU3X/LaVaMuzQpBcmM1R/ajFD6U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1674203158; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=V49wRNxwVefl714Mn2UmK/YcN8/tnExcJzoF8D3gX0Y=; b=nYskOm/Fh+u2IQb/2cTNqSAWeYk9EFxDxOhY/g2j/uj46iVo/V/LiZwcOEAddw+GUrllCMIBlSAcK8xe/KpiE22O2bYqpFnHvCWfh/3HDVD5gtb6AhkGqC/wdqzW0edlbV5Oh9cE3YvEKxY8rQFjjejmv4DPr1WOQ1bTUp5tZ6s= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16742031582121.0868609642762976; Fri, 20 Jan 2023 00:25:58 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pImhD-0004qg-Bl; Fri, 20 Jan 2023 03:24:23 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pImhB-0004pc-PC for qemu-devel@nongnu.org; Fri, 20 Jan 2023 03:24:21 -0500 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pImhA-0004eL-7s for qemu-devel@nongnu.org; Fri, 20 Jan 2023 03:24:21 -0500 Received: by mail-wm1-x333.google.com with SMTP id e19-20020a05600c439300b003db1cac0c1fso3791430wmn.5 for ; Fri, 20 Jan 2023 00:24:19 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id b10-20020a05600c4e0a00b003db0cab0844sm1507471wmq.40.2023.01.20.00.24.17 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 20 Jan 2023 00:24:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=V49wRNxwVefl714Mn2UmK/YcN8/tnExcJzoF8D3gX0Y=; b=o0vr145+gFbKvwUSR9+CpLM+GMLsJSuJbsC54vIZlk+ggA6K0uqDBjISQlaLvLV1j8 9k6gO5YfKHXmnXBKPLKW0RXSuILVsngZTvi+EXZMKc4+ZD2OAGqwbo8CaOaESJ7HZzs4 w2fcXU0VDjXsy1g1Q/lg4PkACpRu384iKN9JilIQbOQUFDvTT594/YiPU3861zLwsYvW yvt9oH+Tv8VCsZH7vjwFdN+5/mX0vkEjIqDS7s4zpGlQB+WQ6XnQNV0KpCzfoUSMZfD7 cncvB/DznVuqUICow5wb3yHe/YfpWmfDBcwYG/2tA1RtSLzmt7wD6YoZ/UL7FZU3EIt9 iIdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=V49wRNxwVefl714Mn2UmK/YcN8/tnExcJzoF8D3gX0Y=; b=vZzaMY8YzaP+FFT5lwaXPT9f5CDqScP81rBQ6gq9bkvRfieIW4Q8PY/U30nZO4EzdD 2Cq/k63ul3ZK8QxZWx7XIhhMJI6+f9PvxkK8OzH9HnuiR0iVptTiVVQSiDJt7SPE6e1W ZKNAbO9/lWbogUkemlK1AGTA5kPPZ3dD12UTPqtZOPN3m418BIIf6hefyi6SKn1AQ0xt xUgzTl+s2KC58k9LWvKMKzkjZfBV1TIFlmFU+vyG6Me5hQNU/Kj5ag1HvPk/usCWewrI gx13Xfn3u4aGeAwvuqhVIbFnBaOpGuyD9Btig48ULxVrvejvc9B57sFk+J7mIdiLBrVi R0wA== X-Gm-Message-State: AFqh2krWuOc3IL8aYXh3mhaKHOxTutb3wC0z15JKUrbV4OuNKqfU8e46 GED+9u/lo9EtNPisnHrGE7+NQPNyIM0bYVRg X-Google-Smtp-Source: AMrXdXtLqdgPjTcCFIf7EWzokIkDV3lEeJqfjO01MsXfjyVHawfPp38JUEfGAXi5ZnX3Ls9K2UWXSQ== X-Received: by 2002:a05:600c:2255:b0:3da:f950:8168 with SMTP id a21-20020a05600c225500b003daf9508168mr12617985wmm.35.1674203058641; Fri, 20 Jan 2023 00:24:18 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , "Dr. David Alan Gilbert" , Thomas Huth , Fabiano Rosas , Juan Quintela , Laurent Vivier , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 07/11] tests/qtest/migration-test: Build command line using GString API (1/4) Date: Fri, 20 Jan 2023 09:23:37 +0100 Message-Id: <20230120082341.59913-8-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230120082341.59913-1-philmd@linaro.org> References: <20230120082341.59913-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=philmd@linaro.org; helo=mail-wm1-x333.google.com 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 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1674203159627100001 Part 1/4: Convert memory & machine options. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Dr. David Alan Gilbert Reviewed-by: Juan Quintela --- tests/qtest/migration-test.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c index f96c73f552..9cdef4fa65 100644 --- a/tests/qtest/migration-test.c +++ b/tests/qtest/migration-test.c @@ -582,6 +582,7 @@ typedef struct { static int test_migrate_start(QTestState **from, QTestState **to, const char *uri, MigrateStart *args) { + g_autoptr(GString) cmd_common =3D NULL; g_autofree gchar *arch_source =3D NULL; g_autofree gchar *arch_target =3D NULL; g_autofree gchar *cmd_target =3D NULL; @@ -601,6 +602,9 @@ static int test_migrate_start(QTestState **from, QTestS= tate **to, } =20 got_stop =3D false; + + cmd_common =3D g_string_new(""); + bootpath =3D g_strdup_printf("%s/bootsect", tmpfs); if (strcmp(arch, "i386") =3D=3D 0 || strcmp(arch, "x86_64") =3D=3D 0) { /* the assembled x86 boot sector should be exactly one sector larg= e */ @@ -644,6 +648,10 @@ static int test_migrate_start(QTestState **from, QTest= State **to, } else { g_assert_not_reached(); } + if (machine_opts) { + g_string_append_printf(cmd_common, " -machine %s ", machine_opts); + } + g_string_append_printf(cmd_common, "-m %s ", memory_size); =20 if (!getenv("QTEST_LOG") && args->hide_stderr) { #ifdef _WIN32 @@ -674,33 +682,29 @@ static int test_migrate_start(QTestState **from, QTes= tState **to, if (!args->only_target) { g_autofree gchar *cmd_source =3D NULL; =20 - cmd_source =3D g_strdup_printf("-accel kvm%s -accel tcg%s%s " + cmd_source =3D g_strdup_printf("-accel kvm%s -accel tcg %s " "-name source,debug-threads=3Don " - "-m %s " "-serial file:%s/src_serial " "%s %s %s %s", args->use_dirty_ring ? ",dirty-ring-size=3D4096" : "", - machine_opts ? " -machine " : "", - machine_opts ? machine_opts : "", - memory_size, tmpfs, + cmd_common->str, + tmpfs, arch_source, shmem_opts, args->opts_source ? args->opts_source= : "", ignore_stderr); *from =3D qtest_init(cmd_source); } =20 - cmd_target =3D g_strdup_printf("-accel kvm%s -accel tcg%s%s " + cmd_target =3D g_strdup_printf("-accel kvm%s -accel tcg %s " "-name target,debug-threads=3Don " - "-m %s " "-serial file:%s/dest_serial " "-incoming %s " "%s %s %s %s", args->use_dirty_ring ? ",dirty-ring-size=3D4096" : "", - machine_opts ? " -machine " : "", - machine_opts ? machine_opts : "", - memory_size, tmpfs, uri, + cmd_common->str, + tmpfs, uri, arch_target, shmem_opts, args->opts_target ? args->opts_target : "= ", ignore_stderr); --=20 2.38.1 From nobody Sat May 18 14:10:00 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1674203142; cv=none; d=zohomail.com; s=zohoarc; b=Bm9ESz6lIZhNfqkKGuVXhB1y9mzHIqUinSq19BA6Ul9o0z2SywMqNv5m42tCHhBtsnvtyXBVV2tBqsIOUZ8lU4KOuJp3zPMhSj7HerC0rqV/HX6TpGvJF/XqUXOM6XFcYFjUJj8Fs2ZhFBk4YcwQ2DKOXP/xhvZiyPE1jnQCb5Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1674203142; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=lFLQeKMXh/hwQNy/OTcwcNWvQl29Jep2/8SFzcZ0GJ0=; b=R55cF+T8gDoRVuNzDM3feudIg/4wwTjHRobV+5BDvW8MlceB7Go2jo5ycrA5ho1GyxIB2hLlTPU+T+ZPNySzFYurARXhSm180Fees5HP2J89kbiU7rjWjt83qGuBQvUPeAwA8oHRQHqAMAYEqpVkNGbLlHuQFY+YQ85uJe7S7Rs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1674203142778507.19452683331326; Fri, 20 Jan 2023 00:25:42 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pImhH-0004tm-Ua; Fri, 20 Jan 2023 03:24:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pImhG-0004sL-Sl for qemu-devel@nongnu.org; Fri, 20 Jan 2023 03:24:26 -0500 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pImhF-0004er-By for qemu-devel@nongnu.org; Fri, 20 Jan 2023 03:24:26 -0500 Received: by mail-wm1-x333.google.com with SMTP id f19-20020a1c6a13000000b003db0ef4dedcso5272144wmc.4 for ; Fri, 20 Jan 2023 00:24:24 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id n42-20020a05600c3baa00b003d96efd09b7sm1731671wms.19.2023.01.20.00.24.22 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 20 Jan 2023 00:24:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=lFLQeKMXh/hwQNy/OTcwcNWvQl29Jep2/8SFzcZ0GJ0=; b=IF5pz5EprsFwFttDnqA4mYpz1vqAulCqFdgm1415c/oQai+BOzDMRJ+lSz+uQSveBj GtzmEx/uiLWnAmp6lWJkD3OIWcKGplUAWSNz7WAs1r0Euw/ZNmRkIePLJybTW1YSvX5k AZhQbrcZ+lAxtUR372TG6VIZ9hwEJPWg0Apml16OxxQ1UDE5m0nZ6yyLR0aM6HOg1Yjw lEuzCwKmXxbPnKoQDE+LmtqJWR4KfOwV7QU9ePwYV71SqUCOLhVUNI8G/XpsgQAbmX9z CWrymwzf60FnSeRQP9q0Eg106RlosCXMD+KUmvsbeWwSaUveM3QwmR8LOIvzSBrSAPb3 eeAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lFLQeKMXh/hwQNy/OTcwcNWvQl29Jep2/8SFzcZ0GJ0=; b=Wz8Kp/yK7ocbfJutF65Q+aKCz5erKLCDJMs9i3rtJuCpzGn2mMuCcMDtxM3I16T8LD LvYOIZXLmeX2UhPVLSFpK0P52ptvnG1l4UOY8Cp0E9FJ2Akne/cOG69ztJ2Xfq7l9cib 7olD8JMYRPAu0/6aQfjCTDgLBXuah38w0329Upjz2WtQUj5twGjYndPzKpworOOg/Ctr ziC2MDnZ4RNtv7iZdViK3YTLPnYWsS61ue8bSRvmrtMfIRiRWkJ2fliL7k4DB+PP0M2D cvIvBSe1Rl/nI0xLs1bHPXVd3wOIHbADipbh9ogt/bwYpEJ+kjUB8Z2rEnjU9nct4Ash 9qfw== X-Gm-Message-State: AFqh2kpLWH2EZCfSpIsmQlhkoJOUUZun9NVqBp4hGwLEsyyRvDMbvy+W 4Ra6ydTHwcXF1e29YtvFXfmKJEgipdC/s9MX X-Google-Smtp-Source: AMrXdXs944Jv3bO15N6VZt03X5aD/nWKC0MLUjySKXp7gVgfeHzdr291x+xzscD2pcu4J0ddYuDt1Q== X-Received: by 2002:a05:600c:1d05:b0:3d2:3be4:2d9a with SMTP id l5-20020a05600c1d0500b003d23be42d9amr12725435wms.20.1674203063879; Fri, 20 Jan 2023 00:24:23 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , "Dr. David Alan Gilbert" , Thomas Huth , Fabiano Rosas , Juan Quintela , Laurent Vivier , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PATCH v3 08/11] tests/qtest/migration-test: Build command line using GString API (2/4) Date: Fri, 20 Jan 2023 09:23:38 +0100 Message-Id: <20230120082341.59913-9-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230120082341.59913-1-philmd@linaro.org> References: <20230120082341.59913-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=philmd@linaro.org; helo=mail-wm1-x333.google.com 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 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1674203143580100001 Part 2/4: Convert shmem option. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Juan Quintela --- tests/qtest/migration-test.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c index 9cdef4fa65..670097a956 100644 --- a/tests/qtest/migration-test.c +++ b/tests/qtest/migration-test.c @@ -588,7 +588,6 @@ static int test_migrate_start(QTestState **from, QTestS= tate **to, g_autofree gchar *cmd_target =3D NULL; const gchar *ignore_stderr; g_autofree char *bootpath =3D NULL; - g_autofree char *shmem_opts =3D NULL; g_autofree char *shmem_path =3D NULL; const char *arch =3D qtest_get_arch(); const char *machine_opts =3D NULL; @@ -670,13 +669,10 @@ static int test_migrate_start(QTestState **from, QTes= tState **to, =20 if (args->use_shmem) { shmem_path =3D g_strdup_printf("/dev/shm/qemu-%d", getpid()); - shmem_opts =3D g_strdup_printf( + g_string_append_printf(cmd_common, "-object memory-backend-file,id=3Dmem0,size=3D%s" ",mem-path=3D%s,share=3Don -numa node,memdev=3Dmem0", memory_size, shmem_path); - } else { - shmem_path =3D NULL; - shmem_opts =3D g_strdup(""); } =20 if (!args->only_target) { @@ -685,12 +681,12 @@ static int test_migrate_start(QTestState **from, QTes= tState **to, cmd_source =3D g_strdup_printf("-accel kvm%s -accel tcg %s " "-name source,debug-threads=3Don " "-serial file:%s/src_serial " - "%s %s %s %s", + "%s %s %s", args->use_dirty_ring ? ",dirty-ring-size=3D4096" : "", cmd_common->str, tmpfs, - arch_source, shmem_opts, + arch_source, args->opts_source ? args->opts_source= : "", ignore_stderr); *from =3D qtest_init(cmd_source); @@ -700,12 +696,12 @@ static int test_migrate_start(QTestState **from, QTes= tState **to, "-name target,debug-threads=3Don " "-serial file:%s/dest_serial " "-incoming %s " - "%s %s %s %s", + "%s %s %s", args->use_dirty_ring ? ",dirty-ring-size=3D4096" : "", cmd_common->str, tmpfs, uri, - arch_target, shmem_opts, + arch_target, args->opts_target ? args->opts_target : "= ", ignore_stderr); *to =3D qtest_init(cmd_target); --=20 2.38.1 From nobody Sat May 18 14:10:00 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1674203127; cv=none; d=zohomail.com; s=zohoarc; b=f3kocFPIey6zxR3PgMyMVuJztFnxUptWsxZV9+UuR7CyXfnllXPuHMMzl32y3AE4gOA5Y9yU/Sphgfzygirzn91QvRjWoGRoJkfNxbS8KwDU7r1Mcu08brAYwNRU00cUgIeF+NoyoNdRRdZIabXq07l2hE7tM7GiKg73TMrQFnY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1674203127; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=W5TXNXh3AquUKHDIlWKH1U7Rhf/WLE5rFLgjN1F2D1o=; b=EeGELx5Mz2+4TSO/jxwAr31u+MIikIeS95JWLi7GUO1+qRaTwhMX+LIiKa2ZjrXHVFr/iL/Z8A+vG/TTh/JggTOxcNYCd2Z/IXWNumgjmeW85CT+tLR+kAM2VE7zJziIlpGEYa5kbRvQ+AeYtF4Z+ihPFebTsXi2AVlutPVcrHs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1674203127052297.1103343533806; Fri, 20 Jan 2023 00:25:27 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pImhM-00058n-U8; Fri, 20 Jan 2023 03:24:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pImhL-0004zF-CZ for qemu-devel@nongnu.org; Fri, 20 Jan 2023 03:24:31 -0500 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pImhJ-0004aS-RB for qemu-devel@nongnu.org; Fri, 20 Jan 2023 03:24:31 -0500 Received: by mail-wr1-x42d.google.com with SMTP id b5so4182365wrn.0 for ; Fri, 20 Jan 2023 00:24:29 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id l5-20020adfe9c5000000b002238ea5750csm21286817wrn.72.2023.01.20.00.24.27 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 20 Jan 2023 00:24:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=W5TXNXh3AquUKHDIlWKH1U7Rhf/WLE5rFLgjN1F2D1o=; b=m+LYgICbB3UFgva2MXKv+qAr8r7Oq0PXc7tul9i4gg3Q/F9UhvTonjUMBspmItaCqX hMq3q7Rj35P7cRKzQT4KGysEppzXmAs8sYgRrhpQWuxl9vNEWOpR5hrBXdx08NnojJWy 5kjbKLwb2x3F8sk6dfHV0zgFpupBp5sHK5kgcpPzx3kXOsMOJEru80ppnyANl9WmWwjP zABs3FVzfNK0OVnxDpvlcucXuWppqxDEzUAbh1NdE9Sd51j/wtbH+bcFOtMH6lpGOmkZ jIUfHoaqRi9VCMIx1DAh7tGQJRzkmrMLKy9WfbWIrVF+SeScEmGcOnacVdWsM78Raw2p mOxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=W5TXNXh3AquUKHDIlWKH1U7Rhf/WLE5rFLgjN1F2D1o=; b=KJZk1fKo5pUrJYPFTftvL19OVB5F1mFrxE57psT7Z+EV3gU3evSsXSKoKkfF/0eMMB k/eVkdxhtZNmU/pcXERa4etjlreDdZmGa5IUq07QtV6iC7DqDsKS89Ah+oa0QHHzGHgu z0c3i6nBDmzzahx/eqoZ2yqwKFbz/6k5hrhNKRRPmYHKsgHAbqS5bURyc2Z7v4GPWVgX z7bOS+9Zz2LWagSfkxmC/URbgDIMgY2OjpO6tXJCY/2S1mv8W3sxxm9gBiLMMD7MXWE+ 7HPoZJzVm5L17spLDKKF/6ZNigbsK3yOH/by6Zrydf/PRpY6QFw4pPhMSpTBVrv9U3DY +hHg== X-Gm-Message-State: AFqh2kp9hsQ8CnZO+/U93Pk7PKRIJoGjTUMlnfyPTriix8SDLKdIfeqQ 2D1HvEg+SMKovhLyPxvR+2JSMRikbaC/vBrk X-Google-Smtp-Source: AMrXdXuC5vZRHgVufqpsAP+rKowZjd7q0YoxCUDQHO5KdF0LlGmvCL2XyiaGitzHxM1yiD8+Aid3uw== X-Received: by 2002:a05:6000:608:b0:2bd:db84:d663 with SMTP id bn8-20020a056000060800b002bddb84d663mr8787590wrb.5.1674203068931; Fri, 20 Jan 2023 00:24:28 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , "Dr. David Alan Gilbert" , Thomas Huth , Fabiano Rosas , Juan Quintela , Laurent Vivier , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PATCH v3 09/11] tests/qtest/migration-test: Build command line using GString API (3/4) Date: Fri, 20 Jan 2023 09:23:39 +0100 Message-Id: <20230120082341.59913-10-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230120082341.59913-1-philmd@linaro.org> References: <20230120082341.59913-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=philmd@linaro.org; helo=mail-wr1-x42d.google.com 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 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1674203127408100001 Part 3/4: Convert accelerator options. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Dr. David Alan Gilbert Reviewed-by: Juan Quintela --- tests/qtest/migration-test.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c index 670097a956..1ed3505c91 100644 --- a/tests/qtest/migration-test.c +++ b/tests/qtest/migration-test.c @@ -603,6 +603,13 @@ static int test_migrate_start(QTestState **from, QTest= State **to, got_stop =3D false; =20 cmd_common =3D g_string_new(""); + /* KVM first */ + if (args->use_dirty_ring) { + g_string_append(cmd_common, "-accel kvm,dirty-ring-size=3D4096 "); + } else { + g_string_append(cmd_common, "-accel kvm "); + } + g_string_append(cmd_common, "-accel tcg "); =20 bootpath =3D g_strdup_printf("%s/bootsect", tmpfs); if (strcmp(arch, "i386") =3D=3D 0 || strcmp(arch, "x86_64") =3D=3D 0) { @@ -678,12 +685,10 @@ static int test_migrate_start(QTestState **from, QTes= tState **to, if (!args->only_target) { g_autofree gchar *cmd_source =3D NULL; =20 - cmd_source =3D g_strdup_printf("-accel kvm%s -accel tcg %s " + cmd_source =3D g_strdup_printf("%s " "-name source,debug-threads=3Don " "-serial file:%s/src_serial " "%s %s %s", - args->use_dirty_ring ? - ",dirty-ring-size=3D4096" : "", cmd_common->str, tmpfs, arch_source, @@ -692,13 +697,11 @@ static int test_migrate_start(QTestState **from, QTes= tState **to, *from =3D qtest_init(cmd_source); } =20 - cmd_target =3D g_strdup_printf("-accel kvm%s -accel tcg %s " + cmd_target =3D g_strdup_printf("%s " "-name target,debug-threads=3Don " "-serial file:%s/dest_serial " "-incoming %s " "%s %s %s", - args->use_dirty_ring ? - ",dirty-ring-size=3D4096" : "", cmd_common->str, tmpfs, uri, arch_target, --=20 2.38.1 From nobody Sat May 18 14:10:00 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1674203136; cv=none; d=zohomail.com; s=zohoarc; b=EufRL6YRBQomoaODxXqXTuSl7Be/kRF2sps+H2sRBSgdsvErTbvoXCzcQGiL1qZrt7MaOodB0QeVwbpao5Ts8kOlXMoHFYheUeVCZpsmVI0hq2ZUUWF/QDHZoMmAX8XcXrcdKSvaaRtN+dAgIpzaGpM7M76IFzHLUjsz8YPqdvc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1674203136; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=8eiWB2mgS5s8IODt1mSJBolF54HXrNWV0tPwSRIkLm8=; b=gbqty7A1dkov1cXqbY/pdFYpxk5CDPIeIhBk5EFc1c/yQDGSVI+mAkdOshUEMD7xwEHWyLcBL5qaUfBKZCamNxuqOjTZ9OexedeNVzjwKgPKgz9wnrapdrC/vWreER+RJPZyZKvuq7XjlIRvS5WEeL5fGx8bFjHO6ngK2XIV6ag= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1674203136535289.90592396388877; Fri, 20 Jan 2023 00:25:36 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pImhX-0005O9-0R; Fri, 20 Jan 2023 03:24:43 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pImhS-0005Ia-QX for qemu-devel@nongnu.org; Fri, 20 Jan 2023 03:24:38 -0500 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pImhP-0004gJ-HP for qemu-devel@nongnu.org; Fri, 20 Jan 2023 03:24:37 -0500 Received: by mail-wm1-x332.google.com with SMTP id f12-20020a7bc8cc000000b003daf6b2f9b9so5273068wml.3 for ; Fri, 20 Jan 2023 00:24:35 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id hg8-20020a05600c538800b003d974076f13sm1552992wmb.3.2023.01.20.00.24.32 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 20 Jan 2023 00:24:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8eiWB2mgS5s8IODt1mSJBolF54HXrNWV0tPwSRIkLm8=; b=T9fNlr7qdkM84eEPuX5uCJ76nlAtPpVEul0xug1Pz08e652KrE84UQWICNDZMBTEp7 If0+D41sb1wOoRWMMpmcG3Ab+JKEsBgY2q/ruawR0hNU3/U++QQc+uRklunMUUxHeyj1 /o9FbNoE2iSiLlW2WdqfMOGYsNe/r9RYgTMwmBh8S6G3V+Ngr8M55U4jM+pIx5lDH2CC RopvZgZ0ERsE0Z4U7m3pZLlyclIxTFdwDKLavsoz1HyTOm5SN2gDgS09QOm8275Ze7Ux cMuOdMbkKTi9h7XrwddtIb3AOmk/0iUmW9B8ifWc45hqvc03zmkANKHf6RpUUyDRyP44 CliQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8eiWB2mgS5s8IODt1mSJBolF54HXrNWV0tPwSRIkLm8=; b=eXL7CCYF8lVLOdpMH4KYSP8uvSQd2AP6Kykuj1j2HuGwIxtjUwWfuvdpQCdl95kTd/ oWF1jOa8DEjER1HI0TMuc+d428q2afXXfcxiBu2Df+LXuer3gkGrsv9ZDwiFquxrnoMo PU/WnjFig1V19dmVu9sr6saTuz3g6q/L1Gi1xckUHCzCfn2P5nEc+muPqiQlT2I/nwr8 9CRS+AXr4ZAjTEyV5Dox45++lrJ9hZulT4lotNr19XPSKZfV2sUa2xkaFzm2UhIkzyIx OFyvxBL7SEb8oaVbY3zIJHvOOIxxdnEsiTwYKZ2o8aKB2yyzdGB6MDz9FrOaBOJxy5Bm AGdQ== X-Gm-Message-State: AFqh2krUg5WypVB++OvqqraiNeZN3V5z6ho7Fg1Ocz7gWmCNE6haIbXh RyzHVATboTpAFIs8Nc3Pxo0XdmEkyboX/UUf X-Google-Smtp-Source: AMrXdXtmC+HEvptR8nXq9UryNyg55l1bKzq96sDgtQebkqTaOxjpmybbYyq+wpG5lujY/PmZLwFzrw== X-Received: by 2002:a05:600c:354e:b0:3db:331b:bd57 with SMTP id i14-20020a05600c354e00b003db331bbd57mr1073167wmq.23.1674203073952; Fri, 20 Jan 2023 00:24:33 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , "Dr. David Alan Gilbert" , Thomas Huth , Fabiano Rosas , Juan Quintela , Laurent Vivier , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PATCH v3 10/11] tests/qtest/migration-test: Build command line using GString API (4/4) Date: Fri, 20 Jan 2023 09:23:40 +0100 Message-Id: <20230120082341.59913-11-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230120082341.59913-1-philmd@linaro.org> References: <20230120082341.59913-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=philmd@linaro.org; helo=mail-wm1-x332.google.com 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 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1674203137523100005 Part 4/4: Convert rest of options. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Juan Quintela --- tests/qtest/migration-test.c | 53 +++++++++++++++++------------------- 1 file changed, 25 insertions(+), 28 deletions(-) diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c index 1ed3505c91..e7786bcbc5 100644 --- a/tests/qtest/migration-test.c +++ b/tests/qtest/migration-test.c @@ -585,8 +585,8 @@ static int test_migrate_start(QTestState **from, QTestS= tate **to, g_autoptr(GString) cmd_common =3D NULL; g_autofree gchar *arch_source =3D NULL; g_autofree gchar *arch_target =3D NULL; - g_autofree gchar *cmd_target =3D NULL; - const gchar *ignore_stderr; + g_autoptr(GString) cmd_target =3D NULL; + const gchar *ignore_stderr =3D NULL; g_autofree char *bootpath =3D NULL; g_autofree char *shmem_path =3D NULL; const char *arch =3D qtest_get_arch(); @@ -666,12 +666,9 @@ static int test_migrate_start(QTestState **from, QTest= State **to, * IO redirection does not work, so don't bother adding IO redirec= tion * to the command line. */ - ignore_stderr =3D ""; #else ignore_stderr =3D "2>/dev/null"; #endif - } else { - ignore_stderr =3D ""; } =20 if (args->use_shmem) { @@ -683,31 +680,31 @@ static int test_migrate_start(QTestState **from, QTes= tState **to, } =20 if (!args->only_target) { - g_autofree gchar *cmd_source =3D NULL; - - cmd_source =3D g_strdup_printf("%s " - "-name source,debug-threads=3Don " - "-serial file:%s/src_serial " - "%s %s %s", - cmd_common->str, - tmpfs, - arch_source, - args->opts_source ? args->opts_source= : "", - ignore_stderr); - *from =3D qtest_init(cmd_source); + g_autoptr(GString) cmd_source =3D g_string_new(cmd_common->str); + g_string_append(cmd_source, "-name source,debug-threads=3Don "); + g_string_append_printf(cmd_source, "-serial file:%s/src_serial ", = tmpfs); + g_string_append_printf(cmd_source, "%s ", arch_source); + if (args->opts_source) { + g_string_append_printf(cmd_source, "%s ", args->opts_source); + } + if (ignore_stderr) { + g_string_append(cmd_source, ignore_stderr); /* last string */ + } + *from =3D qtest_init(cmd_source->str); } =20 - cmd_target =3D g_strdup_printf("%s " - "-name target,debug-threads=3Don " - "-serial file:%s/dest_serial " - "-incoming %s " - "%s %s %s", - cmd_common->str, - tmpfs, uri, - arch_target, - args->opts_target ? args->opts_target : "= ", - ignore_stderr); - *to =3D qtest_init(cmd_target); + cmd_target =3D g_string_new(cmd_common->str); + g_string_append(cmd_target, "-name target,debug-threads=3Don "); + g_string_append_printf(cmd_target, "-serial file:%s/dest_serial ", tmp= fs); + g_string_append_printf(cmd_target, "-incoming %s ", uri); + g_string_append_printf(cmd_target, "%s ", arch_target); + if (args->opts_target) { + g_string_append_printf(cmd_target, "%s ", args->opts_target); + } + if (ignore_stderr) { + g_string_append(cmd_target, ignore_stderr); /* last string */ + } + *to =3D qtest_init(cmd_target->str); =20 /* * Remove shmem file immediately to avoid memory leak in test failed c= ase. --=20 2.38.1 From nobody Sat May 18 14:10:00 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1674203159; cv=none; d=zohomail.com; s=zohoarc; b=bU/5jisdK0yd7Sbl0kKhI7znQWVwRIDxA+zLZwEFlFO0WgiP1deoPVnazc+E3qyrRA4qDWahQXUPipah+fvi2uFs0aHcRsixEjEBcRaFyuqzio9mH7DrYtmFPO4riWcS/mbkCrtps192m9fa81pdSdOwKSJGFpyz15UzeldoVuo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1674203159; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ZIdBPotAEeCeaU6kILE+ldJwz4Si4KaekjZjTSfk694=; b=FiI64kCjDTf/WdmF+dVtPVOUk23KMNI0pHL2HRwEU8cs5+Z1PWw3nqbFHUaMDyh77U0sdulr9x3Cgj/Tlu/4dvX69iLA7QxS+zFPSCSa0sete4VideWMPmSbcoGRpz7rFSBpF2cxTLmv8mElqNZFjn1LZzf1vJcZ96kHH3nlGQA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1674203159937927.3300556825312; Fri, 20 Jan 2023 00:25:59 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pImhg-0005Yc-3T; Fri, 20 Jan 2023 03:24:52 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pImhY-0005T0-85 for qemu-devel@nongnu.org; Fri, 20 Jan 2023 03:24:45 -0500 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pImhV-0004h8-GH for qemu-devel@nongnu.org; Fri, 20 Jan 2023 03:24:43 -0500 Received: by mail-wm1-x335.google.com with SMTP id d4-20020a05600c3ac400b003db1de2aef0so3068174wms.2 for ; Fri, 20 Jan 2023 00:24:40 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id o28-20020a05600c511c00b003dab40f9eafsm1611013wms.35.2023.01.20.00.24.37 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 20 Jan 2023 00:24:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZIdBPotAEeCeaU6kILE+ldJwz4Si4KaekjZjTSfk694=; b=sHvxXtKKINDL5U6Fdhmg7M/qsjYAQGf7jqQBR9ve+9ggFVkRejHOhRUwvWa1s0Q5fx +g8BJsZ3n/aQOGSDk3KKxYaov7iqSrSb5nHxix93hueSgapMFY7RArUk2lMxlJQ+azAg nggVngL6RMipESmiyLR3BmJ7CYRz5qOZZiGcIE0DIPUvQUDHdIb9QyWPJdURibsk+hOI SJmGbuLeJTfg2gmxWxlnqiqd81UcfV3aFXKvHb6qA+/xgQHPoZTlW5JQ9pnNldiawUIL 4fPBBInWldoqtoBuvL9DvmCgRTP4Pr+YXuymCBo8ls95IoW6MYwjDdgq2BG9nnSo+O4y SZug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZIdBPotAEeCeaU6kILE+ldJwz4Si4KaekjZjTSfk694=; b=t802sdBiMr7MXHbYDaiTgCuhJPYg2ZB0e3oXHG5vEAK/xCUcrg+G8tvLpQ4fo4T7D3 I6w4k8iO8+41cwgFezGhxJY+N/U7ln5P1PrvySMla1/1hF+qh6aYoZjK9HoRHIH+DURt Fu4Fd9BWAVwOWxYPz4GWMXbn+txSvSSBhT7OkYn7SxJI1OJWtLXJ13nhp8QmleynuJyI QbRaCp9SMip8ICLBbs9EHTFg7o2vGxPk5Tu6+DGubNPYmK3dY7rb0XN57G3PpL3FC1O3 MuUAu465l97/KnOXcOrXthBv2YKIatlYQwXHkrsg2ZR7VB9WFAKiUVITvUaiR2ZrZcsv b65A== X-Gm-Message-State: AFqh2krwqc1Pf7Bhr9scimFPXouVjzqaLqg6WT9by9D9rloVEM2H0YZK mzCIQHAmhLydoPTUz8ICjauOXO5fpwerp0cx X-Google-Smtp-Source: AMrXdXutn9acx2Abb9jKlleMzX/a7PqpWRWGDL6NBeEQvyMICa5w6TtgvWFAZ/57QMT2yWaZXOy6sA== X-Received: by 2002:a05:600c:a29e:b0:3d9:ee01:ae5b with SMTP id hu30-20020a05600ca29e00b003d9ee01ae5bmr13156308wmb.12.1674203078971; Fri, 20 Jan 2023 00:24:38 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , "Dr. David Alan Gilbert" , Thomas Huth , Fabiano Rosas , Juan Quintela , Laurent Vivier , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PATCH v3 11/11] tests/qtest/migration-test: Only use available accelerators Date: Fri, 20 Jan 2023 09:23:41 +0100 Message-Id: <20230120082341.59913-12-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230120082341.59913-1-philmd@linaro.org> References: <20230120082341.59913-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=philmd@linaro.org; helo=mail-wm1-x335.google.com 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 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1674203161652100005 For example, avoid when TCG is disabled: $ make check-qtest-aarch64 ... 20/20 qemu:qtest+qtest-aarch64 / qtest-aarch64/migration-test qemu-system-aarch64: -accel tcg: invalid accelerator tcg Reviewed-by: Dr. David Alan Gilbert Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Juan Quintela --- tests/qtest/migration-test.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c index e7786bcbc5..b0eaddbf5a 100644 --- a/tests/qtest/migration-test.c +++ b/tests/qtest/migration-test.c @@ -45,6 +45,8 @@ =20 unsigned start_address; unsigned end_address; +static bool has_tcg; +static bool has_kvm; static bool uffd_feature_thread_id; =20 /* @@ -603,13 +605,16 @@ static int test_migrate_start(QTestState **from, QTes= tState **to, got_stop =3D false; =20 cmd_common =3D g_string_new(""); - /* KVM first */ - if (args->use_dirty_ring) { - g_string_append(cmd_common, "-accel kvm,dirty-ring-size=3D4096 "); - } else { - g_string_append(cmd_common, "-accel kvm "); + if (has_kvm) { /* KVM first */ + if (args->use_dirty_ring) { + g_string_append(cmd_common, "-accel kvm,dirty-ring-size=3D4096= "); + } else { + g_string_append(cmd_common, "-accel kvm "); + } + } + if (has_tcg) { + g_string_append(cmd_common, "-accel tcg "); } - g_string_append(cmd_common, "-accel tcg "); =20 bootpath =3D g_strdup_printf("%s/bootsect", tmpfs); if (strcmp(arch, "i386") =3D=3D 0 || strcmp(arch, "x86_64") =3D=3D 0) { @@ -2460,12 +2465,14 @@ static bool kvm_dirty_ring_supported(void) =20 int main(int argc, char **argv) { - const bool has_kvm =3D qtest_has_accel("kvm"); const bool has_uffd =3D ufd_version_check(); const char *arch =3D qtest_get_arch(); g_autoptr(GError) err =3D NULL; int ret; =20 + has_tcg =3D qtest_has_accel("tcg"); + has_kvm =3D qtest_has_accel("kvm"); + g_test_init(&argc, &argv, NULL); =20 /* --=20 2.38.1