From patchwork Thu Jan 19 13:54:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabiano Rosas X-Patchwork-Id: 13108054 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0468EC00A5A for ; Thu, 19 Jan 2023 13:58:35 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pIVPi-0000O3-CQ; Thu, 19 Jan 2023 08:57:10 -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 1pIVPg-0000Ms-BJ; Thu, 19 Jan 2023 08:57:08 -0500 Received: from smtp-out2.suse.de ([2001:67c:2178:6::1d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pIVPe-0006CN-Tx; Thu, 19 Jan 2023 08:57:08 -0500 Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 812F95CE74; Thu, 19 Jan 2023 13:57:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1674136625; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lSvdW174UOhlYXful1RQDh/oCdWhWPqa904YnapxfRM=; b=QUorfxshpZcBdQ+tm2eXoTXzKsVxQmVHr+mc8l4n1SCmWq3A7af0JmicFtznPkwGmmmonI EK9lx/NqzjWvEhTsJNgXxpjfdiOnLg3qD2/060ttjLbi/gz/DLAPuaQbJFJaGmwr3J0BeS eMvw7XzT7sIxDnwMnCmu2aKVdHcJv68= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1674136625; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lSvdW174UOhlYXful1RQDh/oCdWhWPqa904YnapxfRM=; b=L2aRj21HezDQy7QuS8hkyo2FOCr3cc7x3SG/LC/VZyzu2XotU7kGO72qIvChC/O8biYkFt +dg4DY+rbLXzPcCQ== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 0609A134F5; Thu, 19 Jan 2023 13:57:01 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id YLplLy1MyWOCFAAAMHmgww (envelope-from ); Thu, 19 Jan 2023 13:57:01 +0000 From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Peter Maydell , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , Paolo Bonzini , Claudio Fontana , Eduardo Habkost , Alexander Graf , Cornelia Huck , Thomas Huth , Laurent Vivier Subject: [RFC PATCH v4 09/15] tests/qtest: Adjust device-introspect-test to always set a -cpu option Date: Thu, 19 Jan 2023 10:54:18 -0300 Message-Id: <20230119135424.5417-10-farosas@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230119135424.5417-1-farosas@suse.de> References: <20230119135424.5417-1-farosas@suse.de> MIME-Version: 1.0 Received-SPF: pass client-ip=2001:67c:2178:6::1d; envelope-from=farosas@suse.de; helo=smtp-out2.suse.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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_MED=-2.3, 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Signed-off-by: Fabiano Rosas --- tests/qtest/device-introspect-test.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/tests/qtest/device-introspect-test.c b/tests/qtest/device-introspect-test.c index 5b0ffe43f5..7d6ff6e3ef 100644 --- a/tests/qtest/device-introspect-test.c +++ b/tests/qtest/device-introspect-test.c @@ -304,17 +304,30 @@ static void test_abstract_interfaces(void) qtest_quit(qts); } +static const char *arch_get_cpu(const char *mname) +{ + const char *arch = qtest_get_arch(); + + if (g_str_equal(arch, "aarch64")) { + if (!strncmp(mname, "virt", 4)) { + return "cortex-a57"; + } + } + + return NULL; +} + static void add_machine_test_case(const char *mname) { char *path, *args; path = g_strdup_printf("device/introspect/concrete/defaults/%s", mname); - args = g_strdup_printf("-M %s", mname); + args = qtest_get_machine_args(mname, arch_get_cpu(mname), NULL); qtest_add_data_func(path, args, test_device_intro_concrete); g_free(path); path = g_strdup_printf("device/introspect/concrete/nodefaults/%s", mname); - args = g_strdup_printf("-nodefaults -M %s", mname); + args = qtest_get_machine_args(mname, arch_get_cpu(mname), "-nodefaults"); qtest_add_data_func(path, args, test_device_intro_concrete); g_free(path); }