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=-10.1 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,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 A92F5C433E0 for ; Tue, 16 Mar 2021 12:49:28 +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 1411A65040 for ; Tue, 16 Mar 2021 12:49:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1411A65040 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]:60972 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lM98Z-0002mw-1Q for qemu-devel@archiver.kernel.org; Tue, 16 Mar 2021 08:49:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47898) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lM97X-0002Ed-Jw for qemu-devel@nongnu.org; Tue, 16 Mar 2021 08:48:23 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:44763) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lM97V-0003SW-T2 for qemu-devel@nongnu.org; Tue, 16 Mar 2021 08:48:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615898900; 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=aEJIdtx3NygSAgiyhOoYN6SvXkEAQAJZhUpweFnx6Oc=; b=iwzy28XENoeONDcJe4uMpRKprI5zh+twf8ln7G6LDiXJdVaR1mrKf3H1lraSuKnBnV3ryI FVCHrxbv2H0OkBLONSD8KorlD9zVufpF2Kf35jrZPfexkdpjA1TU6n/wqm6Frf4da9PJ/M WeH9yoOM9zYrEIP3ClgwUd1MuEkVOb4= 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-306-bJPOeo6eMLi0Ou7u9JDUzg-1; Tue, 16 Mar 2021 08:48:19 -0400 X-MC-Unique: bJPOeo6eMLi0Ou7u9JDUzg-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C30E1801817; Tue, 16 Mar 2021 12:48:17 +0000 (UTC) Received: from thuth.remote.csb (ovpn-112-110.ams2.redhat.com [10.36.112.110]) by smtp.corp.redhat.com (Postfix) with ESMTP id 34FE719CAD; Tue, 16 Mar 2021 12:48:11 +0000 (UTC) Subject: Re: [PATCH 1/6] accel: Introduce 'query-accels' QMP command To: Markus Armbruster , =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= References: <20210311231202.1536040-1-philmd@redhat.com> <20210311231202.1536040-2-philmd@redhat.com> <87ft0va8wp.fsf@dusky.pond.sub.org> <04e9cbd3-1773-c953-10a5-ad6299c35354@redhat.com> <0b5efc04-817d-6e17-075c-86eab1b7ab1f@redhat.com> <74d442cd-5e39-f9a4-6ca5-e2656280aa73@redhat.com> <875z1rl18h.fsf@dusky.pond.sub.org> From: Thomas Huth Message-ID: <57f03668-a73a-32f2-bce8-4d70a13ccf77@redhat.com> Date: Tue, 16 Mar 2021 13:48:10 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.0 MIME-Version: 1.0 In-Reply-To: <875z1rl18h.fsf@dusky.pond.sub.org> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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=63.128.21.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.25, 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.001, RCVD_IN_MSPIKE_WL=0.001, 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: Laurent Vivier , Andrew Jones , =?UTF-8?Q?Daniel_P=2eBerrang=c3=a9?= , Eduardo Habkost , "Michael S. Tsirkin" , Richard Henderson , qemu-devel@nongnu.org, qemu-arm@nongnu.org, Claudio Fontana , Igor Mammedov , Paolo Bonzini Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 16/03/2021 13.41, Markus Armbruster wrote: > Philippe Mathieu-Daudé writes: > >> On 3/16/21 11:26 AM, Philippe Mathieu-Daudé wrote: >>> On 3/16/21 10:02 AM, Philippe Mathieu-Daudé wrote: >>>> On 3/16/21 7:51 AM, Markus Armbruster wrote: >>>>> Eric Blake writes: >>>>> >>>>>> On 3/11/21 5:11 PM, Philippe Mathieu-Daudé wrote: >>>>> [...] >>>>>>> diff --git a/accel/accel-qmp.c b/accel/accel-qmp.c >>>>>>> new file mode 100644 >>>>>>> index 00000000000..f16e49b8956 >>>>>>> --- /dev/null >>>>>>> +++ b/accel/accel-qmp.c >>>>>>> @@ -0,0 +1,47 @@ >>>>>>> +/* >>>>>>> + * QEMU accelerators, QMP commands >>>>>>> + * >>>>>>> + * Copyright (c) 2021 Red Hat Inc. >>>>>>> + * >>>>>>> + * SPDX-License-Identifier: GPL-2.0-or-later >>>>>>> + */ >>>>>>> + >>>>>>> +#include "qemu/osdep.h" >>>>>>> +#include "qapi/qapi-commands-machine.h" >>>>>>> + >>>>>>> +static const Accelerator accel_list[] = { >>>>>>> + ACCELERATOR_QTEST, >>>>>>> +#ifdef CONFIG_TCG >>>>>>> + ACCELERATOR_TCG, >>>>>>> +#endif >>>>>>> +#ifdef CONFIG_KVM >>>>>>> + ACCELERATOR_KVM, >>>>>>> +#endif >>>>>> >>>>>> ...would it be worth compiling the enum to only list enum values that >>>>>> were actually compiled in? That would change it to: >>>>>> >>>>>> { 'enum': 'Accelerator', >>>>>> 'data': [ 'qtest', >>>>>> { 'name': 'tcg', 'if': 'defined(CONFIG_TCG)' }, >>>>>> ... >>>> >>>> These accelerator definitions are supposed to be poisoned in generic >>>> code... But I like the simplicity of your suggestion, so I'll give it >>>> a try and see what happens with removing the poisoned definitions. >>> >>> This is actually quite interesting :) Accelerator definitions are >>> declared in config-target.h, but acceleration is host specific... >> >> Thomas, I guess I hit Claudio's reported bug again... >> >> 1/ generic libqemuutil.a is built without any CONFIG_accel definition. >> >> So this qapi-generated enum ... : >> >> typedef enum Accelerator { >> ACCELERATOR_QTEST, >> #if defined(CONFIG_TCG) >> ACCELERATOR_TCG, >> #endif /* defined(CONFIG_TCG) */ >> #if defined(CONFIG_KVM) >> ACCELERATOR_KVM, >> #endif /* defined(CONFIG_KVM) */ >> #if defined(CONFIG_HAX) >> ACCELERATOR_HAX, >> #endif /* defined(CONFIG_HAX) */ >> #if defined(CONFIG_HVF) >> ACCELERATOR_HVF, >> #endif /* defined(CONFIG_HVF) */ >> #if defined(CONFIG_WHPX) >> ACCELERATOR_WHPX, >> #endif /* defined(CONFIG_WHPX) */ >> #if defined(CONFIG_XEN_BACKEND) >> ACCELERATOR_XEN, >> #endif /* defined(CONFIG_XEN_BACKEND) */ >> ACCELERATOR__MAX, >> } Accelerator; >> >> ... is expanded to: >> >> typedef enum Accelerator { >> ACCELERATOR_QTEST, >> ACCELERATOR__MAX, >> } Accelerator; > > CONFIG_KVM, CONFIG_TCG, ... are defined in ${target}-config-target.h, > and may only be used in target-specific code. > > If the enum ends up in libqemuutil.a, there are uses outside > target-specific code. > > exec/poison.h lacks CONFIG_KVM, CONFIG_TCG, ... Should they be added? CONFIG_KVM is already in poison.h, and CONFIG_TCG cannot be added there since it is also defined in config-host.h. But the other accelerator switches should be marked as poisoned, too. I've got a patch for this in the works already - I'll send it out in a minute... Thomas