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 0087BC433E9 for ; Sun, 21 Feb 2021 14:00:47 +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 8A5B064EEF for ; Sun, 21 Feb 2021 14:00:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8A5B064EEF 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]:34882 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lDpHx-0004gV-Lt for qemu-devel@archiver.kernel.org; Sun, 21 Feb 2021 09:00:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55288) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lDpGw-0003qF-1E for qemu-devel@nongnu.org; Sun, 21 Feb 2021 08:59:42 -0500 Received: from mx2.suse.de ([195.135.220.15]:37174) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lDpGu-0003oX-Em for qemu-devel@nongnu.org; Sun, 21 Feb 2021 08:59:41 -0500 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 0EEC3AB95; Sun, 21 Feb 2021 13:59:39 +0000 (UTC) Subject: Re: [RFC v1 34/38] target/arm: cpu: only initialize TCG gt timers under CONFIG_TCG To: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , Peter Maydell , Richard Henderson , =?UTF-8?Q?Alex_Benn=c3=a9e?= References: <20210221092449.7545-1-cfontana@suse.de> <20210221092449.7545-35-cfontana@suse.de> From: Claudio Fontana Message-ID: <9c82fac6-68f3-6e27-1e2a-54cb2236c1d6@suse.de> Date: Sun, 21 Feb 2021 14:59:38 +0100 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: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit 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.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: Claudio Fontana , qemu-devel , Olaf Hering , Roman Bolshakov , Paolo Bonzini , Eduardo Habkost Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 2/21/21 10:55 AM, Philippe Mathieu-Daudé wrote: > On 2/21/21 10:24 AM, Claudio Fontana wrote: >> From: Claudio Fontana >> >> KVM has its own cpu->kvm_vtime. >> >> Adjust cpu vmstate by putting unused fields instead of the >> VMSTATE_TIMER_PTR when TCG is not available. >> >> Signed-off-by: Claudio Fontana >> --- >> target/arm/cpu.c | 4 +++- >> target/arm/machine.c | 5 +++++ >> 2 files changed, 8 insertions(+), 1 deletion(-) >> >> diff --git a/target/arm/cpu.c b/target/arm/cpu.c >> index 1d81a1e7ac..b929109054 100644 >> --- a/target/arm/cpu.c >> +++ b/target/arm/cpu.c >> @@ -1322,6 +1322,7 @@ static void arm_cpu_realizefn(DeviceState *dev, Error **errp) >> } >> } >> >> +#ifdef CONFIG_TCG >> { >> uint64_t scale; >> >> @@ -1347,7 +1348,8 @@ static void arm_cpu_realizefn(DeviceState *dev, Error **errp) >> cpu->gt_timer[GTIMER_HYPVIRT] = timer_new(QEMU_CLOCK_VIRTUAL, scale, >> arm_gt_hvtimer_cb, cpu); > > What about Xen? Good question, what about it.. Ccing also Olaf. > >> } >> -#endif >> +#endif /* CONFIG_TCG */ >> +#endif /* !CONFIG_USER_ONLY */ >> >> cpu_exec_realizefn(cs, &local_err); >> if (local_err != NULL) { >> diff --git a/target/arm/machine.c b/target/arm/machine.c >> index 666ef329ef..13d7c6d930 100644 >> --- a/target/arm/machine.c >> +++ b/target/arm/machine.c >> @@ -822,8 +822,13 @@ const VMStateDescription vmstate_arm_cpu = { >> VMSTATE_UINT32(env.exception.syndrome, ARMCPU), >> VMSTATE_UINT32(env.exception.fsr, ARMCPU), >> VMSTATE_UINT64(env.exception.vaddress, ARMCPU), >> +#ifdef CONFIG_TCG >> VMSTATE_TIMER_PTR(gt_timer[GTIMER_PHYS], ARMCPU), >> VMSTATE_TIMER_PTR(gt_timer[GTIMER_VIRT], ARMCPU), >> +#else >> + VMSTATE_UNUSED(sizeof(QEMUTimer *)), >> + VMSTATE_UNUSED(sizeof(QEMUTimer *)), >> +#endif /* CONFIG_TCG */ >> { >> .name = "power_state", >> .version_id = 0, >> >