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 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 01350C43217 for ; Mon, 31 Jan 2022 16:37:17 +0000 (UTC) Received: from localhost ([::1]:52432 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nEZg4-0000ZT-QL for qemu-devel@archiver.kernel.org; Mon, 31 Jan 2022 11:37:16 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35256) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nEZLr-00083A-FT for qemu-devel@nongnu.org; Mon, 31 Jan 2022 11:16:24 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:33941) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nEZLp-0007IE-0a for qemu-devel@nongnu.org; Mon, 31 Jan 2022 11:16:22 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1643645753; h=from:from:reply-to: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=sbKtwxN9m5m0zYe/LSEkRpKGhWpmgcO7lxI2HAJZxd4=; b=bBzrsEVU8mol8pB0wwB5tnAaT3Bw/nSXrK7gGowSoxjV35Bm4lib8O6uiqDlXYF2o0+jOu ZiIoXXJbtwgjoJ6zPaAFptzrAk/w83ROUb5I0bnFXwGSBBRm20/YsRuwFWTlj2xWrEMgXT qPEOz5xgQdiyuNRh6J2qZc/xm85l+jM= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-22-gO3XSj9NO8GO0VMppE33Tw-1; Mon, 31 Jan 2022 11:15:52 -0500 X-MC-Unique: gO3XSj9NO8GO0VMppE33Tw-1 Received: by mail-wr1-f71.google.com with SMTP id q4-20020adfbb84000000b001dd3cfddb2dso5037132wrg.11 for ; Mon, 31 Jan 2022 08:15:51 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:reply-to:subject:to:cc:references:from :message-id:date:user-agent:mime-version:in-reply-to :content-transfer-encoding:content-language; bh=sbKtwxN9m5m0zYe/LSEkRpKGhWpmgcO7lxI2HAJZxd4=; b=phqMkBPVFpX8zsxKAclH0Ji0iVZQrdeK8H6VCg18A2KwuUlCXK6DwBlrl7vg+gr2NR rwPY4MzexQSoam0IwetnidboNIuaLxOOgQOx3BEWCV+qOGDuID1RlFSJ2RDxFI/f9WSE xeO7ZFkMIuLU1Jig7JrCgidqhdnVEstyFmnEKx44OSxJKJQrzW+yOrozPHVg7E2K9hlg a+Uf3EHF/loJLeoHQDoot5/GSZJddQMu+IUkmRhngL28K6ECQli6krwOnDBjFHVEtUf9 X4b3xmITHVMo+Ov98v9xrwEOzHWPvbOzIsLSInMKfxT8DB3rgdDBzWPMVjTFNbL9JGNm QCxw== X-Gm-Message-State: AOAM532CZGneQbDPG1Rq928KXL0lvFWNEvOYizFATivQJ4PJEh/KLrQK D8PQkB+ePVobSVOpcrxnXRYAIexN85DSbzckGDQ85qznhiBYlx3xfMmrvQSSR0+wLGaQgeOttBh R1v1iSHwPudhzSeY= X-Received: by 2002:a5d:5583:: with SMTP id i3mr18561132wrv.411.1643645750760; Mon, 31 Jan 2022 08:15:50 -0800 (PST) X-Google-Smtp-Source: ABdhPJyy1QXmq3m792I9DwXETwXbmUReXcMNRe7G4QOSMNBaBJ6rgTol7fUEDFBzHqrrbbUMonqn6Q== X-Received: by 2002:a5d:5583:: with SMTP id i3mr18561112wrv.411.1643645750553; Mon, 31 Jan 2022 08:15:50 -0800 (PST) Received: from ?IPv6:2a01:e0a:59e:9d80:527b:9dff:feef:3874? ([2a01:e0a:59e:9d80:527b:9dff:feef:3874]) by smtp.gmail.com with ESMTPSA id o14sm14128897wry.104.2022.01.31.08.15.49 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 31 Jan 2022 08:15:50 -0800 (PST) Subject: Re: [PATCH 2/2] tests/qtest: Special case sbsa-ref and xlnx-versal-virt if !CONFIG_ARM_GIC_TCG To: Andrew Jones References: <20220131154531.429533-1-eric.auger@redhat.com> <20220131154531.429533-3-eric.auger@redhat.com> <20220131155936.lm7jn32ihb2ndsf7@gator> From: Eric Auger Message-ID: Date: Mon, 31 Jan 2022 17:15:48 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.1 MIME-Version: 1.0 In-Reply-To: <20220131155936.lm7jn32ihb2ndsf7@gator> Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=eric.auger@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Content-Language: en-US Received-SPF: pass client-ip=170.10.133.124; envelope-from=eric.auger@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.088, 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_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: , Reply-To: eric.auger@redhat.com Cc: lvivier@redhat.com, peter.maydell@linaro.org, thuth@redhat.com, f4bug@amsat.org, qemu-devel@nongnu.org, qemu-arm@nongnu.org, pbonzini@redhat.com, eric.auger.pro@gmail.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Hi Drew, On 1/31/22 4:59 PM, Andrew Jones wrote: > On Mon, Jan 31, 2022 at 04:45:31PM +0100, Eric Auger wrote: >> qom-test and test-hmp shall not run tests on sbsa-ref and >> xlnx-versal-virt if CONFIG_ARM_GIC_TCG is unset as those machines >> always instantiate GICv3. >> >> Otherwise the tests fail with >> ERROR:../qom/object.c:715:object_new_with_type: assertion failed: (type != NULL) >> >> Signed-off-by: Eric Auger >> Fixes: a8a5546798c3 ("hw/intc/arm_gicv3: Introduce CONFIG_ARM_GIC_TCG Kconfig selector") >> --- >> tests/qtest/libqtest.c | 6 ++++++ >> 1 file changed, 6 insertions(+) >> >> diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c >> index 41f4da4e54..f53983a28e 100644 >> --- a/tests/qtest/libqtest.c >> +++ b/tests/qtest/libqtest.c >> @@ -1394,6 +1394,12 @@ void qtest_cb_for_every_machine(void (*cb)(const char *machine), >> g_str_equal("xenpv", machines[i].name)) { >> continue; >> } >> +#ifndef CONFIG_ARM_GIC_TCG >> + if (!strncmp("sbsa-ref", machines[i].name, 8) || >> + !strncmp("xlnx-versal-virt", machines[i].name, 16)) { >> + continue; >> + } >> +#endif > Hmm, if these machine types completely depend on userspace gicv3 > emulation, i.e. no way to use in-kernel gic or another tcg gic > model, then I guess they shouldn't be built at all when ARM_GIC_TCG > isn't configured. I.e. Yes your suggestion make sense to me, thatw would be a better fix indeed. Eric > > diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig > index 2e0049196d6c..d7cc028b049d 100644 > --- a/hw/arm/Kconfig > +++ b/hw/arm/Kconfig > @@ -209,6 +209,7 @@ config REALVIEW > > config SBSA_REF > bool > + depends on ARM_GIC_TCG > imply PCI_DEVICES > select AHCI > select ARM_SMMUV3 > @@ -378,6 +379,7 @@ config XLNX_ZYNQMP_ARM > > config XLNX_VERSAL > bool > + depends on ARM_GIC_TCG > select ARM_GIC > select PL011 > select CADENCE > > > Thanks, > drew > >> if (!skip_old_versioned || >> !qtest_is_old_versioned_machine(machines[i].name)) { >> cb(machines[i].name); >> -- >> 2.26.3 >>