From patchwork Wed May 28 10:04:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 892962 Delivered-To: patch@linaro.org Received: by 2002:a5d:6e53:0:b0:3a3:61c9:c5d4 with SMTP id j19csp2114016wrz; Wed, 28 May 2025 03:07:34 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXccAGvQmkBe8Qz7Uo9esJKNUakGpEtetneyepoX+MotRcTLMjmowqvdDXDXvJ4Fec7hrsPzQ==@linaro.org X-Google-Smtp-Source: AGHT+IFRFTnRpkZsktF9RTrMIn0iumsI5acYoLYABU+l3oaY6DQQt+15TvnltbVxhavp62D1b97+ X-Received: by 2002:a05:620a:f01:b0:7c7:a5e6:d287 with SMTP id af79cd13be357-7ceecbf9a87mr2510285885a.52.1748426854275; Wed, 28 May 2025 03:07:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1748426854; cv=none; d=google.com; s=arc-20240605; b=DGk6fjKfQsH5QY2gZm6fBwDr+SqW9w4mrxGAs8iRWfV5p79CVXNLPfA9zq5lEOsAva keok9g7OHPVBLlMzW2hoPS/2o2gvTE2N3abDuizQbC4DCSxLYTfAflz8tgD+PhZCO91u Kob58kG5WgAcFRnU2YKOUmrgUBnJG6rJZ1I/icrIV9xyuqckv+4ybFxwDyVpIEjH+Lj9 XrmaMvBLF3ePraiStJ+qvGbRreUiVhhPUnaJA2piQhyMat6rizJLYKlbnCRlFQ6sp4DV io+pMX8dpTqpvgu9/PdBs7SuBfIgMlbzcV9cE+iBn1iV8EMfbMAbdBduP0AbfbuAPOdV HamA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=tvapFg6ZdMY4hXPzf/ac/ZhCNA8XrEnKwnsjVhZAGDU=; fh=7aRxDtZP1Aq9vpCPLaCABi2Dx/PnTfPUrTuYqgFFRwg=; b=FT8Oslme3DwV5HVDFcWmcB1d2fH/aR2KGs5ljfBVUa7b+jNCcCwkpD0oqx5M249xE6 0g17mNnVdOD9V/85H/BGCmkYzBYKmfoD9TEGGEY28pBoVoOJ4vB360Gpo2GeWxpW1bkE 0hmU3NsppLISCUrrc7uLyiBH11TSsyIHMis9tvzmyE1O74wlqt6v2s3mZuZ6n9ClW4a0 k2VYdiJdkU68WZp4OMZzWV6SiNCykqmjtXfgg5sPBwQmcKutwmA9Eblp0ejSPsnARcsD sAt7YBIbJIJBZJXWj70tTpv3Yw+0R67M60TfoQzTwSoHQln0mIr7+WmgsbBkSQNSQLej Jf7A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=FXDwLr0O; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7cfc5d636d0si100072785a.411.2025.05.28.03.07.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 28 May 2025 03:07:34 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=FXDwLr0O; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uKDgL-0004X7-9S; Wed, 28 May 2025 06:06:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uKDfw-00048K-Ly for qemu-devel@nongnu.org; Wed, 28 May 2025 06:06:20 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uKDft-0007F3-Mb for qemu-devel@nongnu.org; Wed, 28 May 2025 06:06:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1748426774; 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=tvapFg6ZdMY4hXPzf/ac/ZhCNA8XrEnKwnsjVhZAGDU=; b=FXDwLr0OCW4itsCd37UEKCWO/nOWNeh8kpxl2uhm+wL+F0lSfNlO6zFcBCd8a9AX362j1u V9L7znBL/YIloNngsLBs1nd32CP1eVao5XVesrPUHjSd5YSGUh7rP9QSReD/a8c7g12c4t vHbrr8yBWSFSaew/XPfiekKVWzh/Df8= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-33-jFSDRmVPPtWESEMWyGIGZA-1; Wed, 28 May 2025 06:06:13 -0400 X-MC-Unique: jFSDRmVPPtWESEMWyGIGZA-1 X-Mimecast-MFC-AGG-ID: jFSDRmVPPtWESEMWyGIGZA_1748426772 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 37DD919560BC; Wed, 28 May 2025 10:06:12 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.44.34.110]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 91C8F18004A7; Wed, 28 May 2025 10:06:07 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Zhao Liu , Xiaoyao Li Subject: [PULL 18/27] hw/i386/x86: Remove X86MachineClass::save_tsc_khz field Date: Wed, 28 May 2025 12:04:58 +0200 Message-ID: <20250528100507.313906-19-thuth@redhat.com> In-Reply-To: <20250528100507.313906-1-thuth@redhat.com> References: <20250528100507.313906-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) DKIMWL_WL_HIGH=-2.907, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé The X86MachineClass::save_tsc_khz boolean was only used by the pc-q35-2.5 and pc-i440fx-2.5 machines, which got removed. Remove it and simplify tsc_khz_needed(). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé Reviewed-by: Thomas Huth Reviewed-by: Zhao Liu Reviewed-by: Xiaoyao Li Message-ID: <20250512083948.39294-11-philmd@linaro.org> Signed-off-by: Thomas Huth --- include/hw/i386/x86.h | 5 ----- hw/i386/x86.c | 1 - target/i386/machine.c | 5 ++--- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/include/hw/i386/x86.h b/include/hw/i386/x86.h index 258b1343a16..fc460b82f82 100644 --- a/include/hw/i386/x86.h +++ b/include/hw/i386/x86.h @@ -27,13 +27,8 @@ #include "qom/object.h" struct X86MachineClass { - /*< private >*/ MachineClass parent; - /*< public >*/ - - /* TSC rate migration: */ - bool save_tsc_khz; /* use DMA capable linuxboot option rom */ bool fwcfg_dma_enabled; /* CPU and apic information: */ diff --git a/hw/i386/x86.c b/hw/i386/x86.c index e2d04092992..f80533df1c5 100644 --- a/hw/i386/x86.c +++ b/hw/i386/x86.c @@ -382,7 +382,6 @@ static void x86_machine_class_init(ObjectClass *oc, const void *data) mc->get_default_cpu_node_id = x86_get_default_cpu_node_id; mc->possible_cpu_arch_ids = x86_possible_cpu_arch_ids; mc->kvm_type = x86_kvm_type; - x86mc->save_tsc_khz = true; x86mc->fwcfg_dma_enabled = true; nc->nmi_monitor_handler = x86_nmi; diff --git a/target/i386/machine.c b/target/i386/machine.c index 6cb561c6322..dd2dac1d443 100644 --- a/target/i386/machine.c +++ b/target/i386/machine.c @@ -1060,9 +1060,8 @@ static bool tsc_khz_needed(void *opaque) { X86CPU *cpu = opaque; CPUX86State *env = &cpu->env; - MachineClass *mc = MACHINE_GET_CLASS(qdev_get_machine()); - X86MachineClass *x86mc = X86_MACHINE_CLASS(mc); - return env->tsc_khz && x86mc->save_tsc_khz; + + return env->tsc_khz; } static const VMStateDescription vmstate_tsc_khz = {