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.3 required=3.0 tests=BAYES_00, 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 BD69AC433B4 for ; Mon, 19 Apr 2021 16:15:00 +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 5D49561246 for ; Mon, 19 Apr 2021 16:15:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5D49561246 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:54182 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lYWY7-0004gK-Bo for qemu-devel@archiver.kernel.org; Mon, 19 Apr 2021 12:14:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36614) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lYWW8-0002tf-GE; Mon, 19 Apr 2021 12:12:56 -0400 Received: from mx2.suse.de ([195.135.220.15]:37158) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lYWW5-00053q-N7; Mon, 19 Apr 2021 12:12:56 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 34790B303; Mon, 19 Apr 2021 16:12:50 +0000 (UTC) Subject: Re: [RFC v1 1/5] hw/s390x: only build qemu-tod from the CONFIG_TCG build From: Claudio Fontana To: Cornelia Huck References: <20210322191551.25752-1-cfontana@suse.de> <20210322191551.25752-2-cfontana@suse.de> <20210331130756.20971c8a.cohuck@redhat.com> <4eaf4c51-b940-66df-7ef7-61782b0cf31d@suse.de> Message-ID: <0eecb78f-c521-f217-1ea5-e570dc080a15@suse.de> Date: Mon, 19 Apr 2021 18:12:48 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.12.0 MIME-Version: 1.0 In-Reply-To: <4eaf4c51-b940-66df-7ef7-61782b0cf31d@suse.de> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=195.135.220.15; envelope-from=cfontana@suse.de; helo=mx2.suse.de X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, NICE_REPLY_A=-0.001, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=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: Thomas Huth , David Hildenbrand , Richard Henderson , qemu-devel@nongnu.org, Halil Pasic , Christian Borntraeger , qemu-s390x@nongnu.org, Paolo Bonzini Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 4/19/21 11:11 AM, Claudio Fontana wrote: > Hi Cornelia, > > On 3/31/21 1:07 PM, Cornelia Huck wrote: >> On Mon, 22 Mar 2021 20:15:47 +0100 >> Claudio Fontana wrote: >> >>> this allows to remove unneeded stubs for target/s390x. >> >> This patch doesn't seem to remove any, though? > > The next patch does... I'll split more the patches so it becomes clearer. > >> >>> >>> Signed-off-by: Claudio Fontana >>> --- >>> hw/s390x/tod.c | 9 ++++++++- >>> hw/s390x/meson.build | 5 ++++- >>> 2 files changed, 12 insertions(+), 2 deletions(-) >>> >>> diff --git a/hw/s390x/tod.c b/hw/s390x/tod.c >>> index 3c2979175e..322732d7fd 100644 >>> --- a/hw/s390x/tod.c >>> +++ b/hw/s390x/tod.c >>> @@ -14,6 +14,8 @@ >>> #include "qemu/error-report.h" >>> #include "qemu/module.h" >>> #include "sysemu/kvm.h" >>> +#include "sysemu/tcg.h" >>> +#include "sysemu/qtest.h" >>> #include "migration/qemu-file-types.h" >>> #include "migration/register.h" >>> >>> @@ -23,8 +25,13 @@ void s390_init_tod(void) >>> >>> if (kvm_enabled()) { >>> obj = object_new(TYPE_KVM_S390_TOD); >>> - } else { >>> + } else if (tcg_enabled()) { >>> obj = object_new(TYPE_QEMU_S390_TOD); >>> + } else if (qtest_enabled()) { >>> + return; >>> + } else { >>> + warn_report("current accelerator not handled in s390_init_tod!"); >>> + return; >> >> I'm wondering whether this should be a fatal error. > > I would agree with that. > >> >>> } >>> object_property_add_child(qdev_get_machine(), TYPE_S390_TOD, obj); >>> object_unref(obj); >>> diff --git a/hw/s390x/meson.build b/hw/s390x/meson.build >>> index 91495b5631..7f31f9e5d5 100644 >>> --- a/hw/s390x/meson.build >>> +++ b/hw/s390x/meson.build >>> @@ -16,7 +16,6 @@ s390x_ss.add(files( >>> 'sclp.c', >>> 'sclpcpu.c', >>> 'sclpquiesce.c', >>> - 'tod-qemu.c', >>> 'tod.c', >>> )) >>> s390x_ss.add(when: 'CONFIG_KVM', if_true: files( >>> @@ -25,6 +24,10 @@ s390x_ss.add(when: 'CONFIG_KVM', if_true: files( >>> 's390-stattrib-kvm.c', >>> 'pv.c', >>> )) >>> +s390x_ss.add(when: 'CONFIG_TCG', if_true: files( >>> + 'tod-qemu.c', >> >> Should we rename this to tod-tcg.c? > > I think so. Here we are a bit limited though by the fact that the object is currently called: include/hw/s390x/tod.h:26:#define TYPE_QEMU_S390_TOD TYPE_S390_TOD "-qemu" So there might be a compatibility issue in trying to make this consistent, which would mean to replace this with: #define TYPE_TCG_S390_TOD TYPE_S390_TOD "-tcg" What do you think? > >> >>> +)) >>> + >>> s390x_ss.add(when: 'CONFIG_S390_CCW_VIRTIO', if_true: files('s390-virtio-ccw.c')) >>> s390x_ss.add(when: 'CONFIG_TERMINAL3270', if_true: files('3270-ccw.c')) >>> s390x_ss.add(when: 'CONFIG_VFIO', if_true: files('s390-pci-vfio.c')) >> >> > > Will prepare a new version, > > Thanks, > > Claudio >