From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.1 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0A5B6C433B4 for ; Mon, 19 Apr 2021 10:58:08 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id A5ED761157 for ; Mon, 19 Apr 2021 10:58:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A5ED761157 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:55752 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lYRbS-0001IK-O6 for qemu-devel@archiver.kernel.org; Mon, 19 Apr 2021 06:58:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34442) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lYR9Y-0003cw-UQ for qemu-devel@nongnu.org; Mon, 19 Apr 2021 06:29:17 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:45827) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lYR9X-00064f-6b for qemu-devel@nongnu.org; Mon, 19 Apr 2021 06:29:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1618828154; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=T5tzCXZ3Nv/GgGMLKfRp23iHN/w7GJPrLUETdulwnWA=; b=e1q8auFkvY286vxRYxHgOF01GmJf+VTKHHjXbr12GTsFF1QaBeo+eLv4xJEo3MlOys+5+n XxumlERK7tWDri8BaMYcTj+qndDIDG6qmwuRwKLX+mWi2vUvALUFQY9I7E/GoLM3q3fedd ac4Rb6JV7ZytOFcoDwtt77/jPO8v3zg= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-108-Z7sCUpldOxWAYREjpUp9QA-1; Mon, 19 Apr 2021 06:29:10 -0400 X-MC-Unique: Z7sCUpldOxWAYREjpUp9QA-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 73F43107ACC7; Mon, 19 Apr 2021 10:29:09 +0000 (UTC) Received: from thuth.remote.csb (ovpn-112-129.ams2.redhat.com [10.36.112.129]) by smtp.corp.redhat.com (Postfix) with ESMTP id D275D60C04; Mon, 19 Apr 2021 10:29:06 +0000 (UTC) Subject: Re: [RFC v14 52/80] tests: device-introspect-test: cope with ARM TCG-only devices To: Claudio Fontana , Peter Maydell , =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , Richard Henderson , =?UTF-8?Q?Alex_Benn=c3=a9e?= References: <20210416162824.25131-1-cfontana@suse.de> <20210416162824.25131-53-cfontana@suse.de> <75c0236b-a8f1-c462-355b-945e509d90f5@redhat.com> <50171d6a-21dc-3017-c8f9-8d068fd843f5@suse.de> From: Thomas Huth Message-ID: <653b0188-c909-ba0c-00b2-735fb25d6703@redhat.com> Date: Mon, 19 Apr 2021 12:29:05 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.9.0 MIME-Version: 1.0 In-Reply-To: <50171d6a-21dc-3017-c8f9-8d068fd843f5@suse.de> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org, Paolo Bonzini , Roman Bolshakov , Eduardo Habkost , =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 19/04/2021 12.24, Claudio Fontana wrote: > On 4/19/21 12:22 PM, Thomas Huth wrote: >> On 16/04/2021 18.27, Claudio Fontana wrote: >>> Skip the test_device_intro_concrete for now for ARM KVM-only build, >>> as on ARM we currently build devices for ARM that are not >>> compatible with a KVM-only build. >>> >>> We can remove this workaround when we fix this in KConfig etc, >>> and we only list and build machines that are compatible with KVM >>> for KVM-only builds. >>> >>> Signed-off-by: Claudio Fontana >>> Cc: Philippe Mathieu-Daudé >>> --- >>> tests/qtest/device-introspect-test.c | 18 ++++++++++++++++++ >>> 1 file changed, 18 insertions(+) >>> >>> diff --git a/tests/qtest/device-introspect-test.c b/tests/qtest/device-introspect-test.c >>> index bbec166dbc..1ff15e2247 100644 >>> --- a/tests/qtest/device-introspect-test.c >>> +++ b/tests/qtest/device-introspect-test.c >>> @@ -329,12 +329,30 @@ int main(int argc, char **argv) >>> qtest_add_func("device/introspect/none", test_device_intro_none); >>> qtest_add_func("device/introspect/abstract", test_device_intro_abstract); >>> qtest_add_func("device/introspect/abstract-interfaces", test_abstract_interfaces); >>> + >>> + /* >>> + * XXX currently we build also boards for ARM that are incompatible with KVM. >>> + * We therefore need to check this explicitly, and only test virt for kvm-only >>> + * arm builds. >>> + * After we do the work of Kconfig etc to ensure that only KVM-compatible boards >>> + * are built for the kvm-only build, we could remove this. >>> + */ >>> +#ifndef CONFIG_TCG >>> + { >>> + const char *arch = qtest_get_arch(); >>> + if (strcmp(arch, "arm") == 0 || strcmp(arch, "aarch64") == 0) { >>> + goto add_machine_test_done; >>> + } >>> + } >>> +#endif /* !CONFIG_TCG */ >>> if (g_test_quick()) { >>> qtest_add_data_func("device/introspect/concrete/defaults/none", >>> g_strdup(common_args), test_device_intro_concrete); >>> } else { >>> qtest_cb_for_every_machine(add_machine_test_case, true); >>> } >>> + goto add_machine_test_done; >> >> That last goto does not make much sense, since the label is right below. > > It is necessary to remove the warning that is otherwise produced about the unused label IIRC. Ah, ok. Alternatively, you could maybe also drop the label completely and simply write the #ifndef block above like this (note the "else"): #ifndef CONFIG_TCG const char *arch = qtest_get_arch(); if (!strcmp(arch, "arm") || !strcmp(arch, "aarch64")) { /* Do nothing */ } else #endif /* !CONFIG_TCG */ ... not sure what's nicer, though. Thomas