From patchwork Wed Apr 24 07:57:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 791498 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:346:15ad:a2a with SMTP id g4csp697826wrq; Wed, 24 Apr 2024 00:59:06 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWpdwgIrQXTGv3CXysNoulk7NG2e+MP9kSlz4zDbDvFD1YibX2VZWk3UBJh15tXQHex4N3B9bU75+x6Pw8mAkAV X-Google-Smtp-Source: AGHT+IG/7ylPk15+hsnOf1G+IOy1e5rpFI6gYG7sAZ1US1DIgMVj/leO8vHxNLpsuymzV968BG6B X-Received: by 2002:a05:6359:4119:b0:18d:8d90:5844 with SMTP id kh25-20020a056359411900b0018d8d905844mr1419514rwc.8.1713945545722; Wed, 24 Apr 2024 00:59:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1713945545; cv=none; d=google.com; s=arc-20160816; b=iXR3Hvxk7wNCKiM+10Dl1DfeK4FabwbwNZ1XODFxvDha26h/fXhfdHlJrnNEY3Hue+ 2miNAdLKUT7Vf2jlCneb/7Zpc0hSoVQ9yF01+oAsOcrtXr6Hssb9nUGysELa7hYhqHOQ e8lROpXMa270N1BXc8bTYcDbr+6i5PrXLTDL08/5WBC7lyd9FEySWzDeI7mzDon51pog f4KPCDAqiZTvLLD3zA5Fbau7Z/mKdW3M5rEbIMQmqGBkVjeS4HbXb/E13iVpoB2qe2G8 aUlqC2jklkQmUHv16/x9P1ErG8yBoxs3/Hw9bjc+TVF3Tu7j1ObnKf6SH3aD0R0F43S2 dTeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; 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=/BEyNWolWnVTOxMJlngpc1vllM2q2ts8Q1bV3+bysT4=; fh=ZXDWg7hKG7Hj19AbRuutTLw+Zvn/B9RsGUUw/YagpFI=; b=oGM+AiK5QqFcLo/8BcP846JyM9iA/04RvsfkH9YxernHMNgLi7aXH3Z/H2zA3VpcoD SEfhhiOUYCLPpMoqAUz+xcWNFJbRKo2UH+PejZB5xE0skTXd1yNrmLK/2EQ/RqUsxMxC 0IVslL9DFrg2dD/vf3hDUP2VQ3YYs5nscZ/OF0AUJ3u64qBPSQf9xKtrqbF16CPcPHFf Uc1137qqfeWO/SORsestevMW0GjOoYRFT7y7nXVnovxnZsm74977p4p7wIz4zx4nO8GI jBHr/0hoUGESqP7faAGtSn4wlyM8flHcsm7GLKtd23m5G82LW2duNZbUWMjRwiLiOLjx dyFA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Nh7umMUh; 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=NONE sp=NONE 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 ey10-20020a0562140b6a00b0069b317ea520si14449887qvb.319.2024.04.24.00.59.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 24 Apr 2024 00:59:05 -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=Nh7umMUh; 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=NONE sp=NONE 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 1rzXWQ-00056K-6N; Wed, 24 Apr 2024 03:58:30 -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 1rzXWN-0004xd-JV for qemu-devel@nongnu.org; Wed, 24 Apr 2024 03:58:27 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rzXWM-00034L-2o for qemu-devel@nongnu.org; Wed, 24 Apr 2024 03:58:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1713945505; 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=/BEyNWolWnVTOxMJlngpc1vllM2q2ts8Q1bV3+bysT4=; b=Nh7umMUhNYJ04U2RBtAfnTx6Ag1D6nZtveAqJhaUoKACHu1BBT8NXck06IdDoMHNcSwk8y sFqL+M3POYV6nStNWzwj0wRSrhoksOubYYsymwwaS3v+lnY16b1kztQRoCgawmWN2HTBZb 2bk16dx7IGMGmrqCjSNdo8ZVhCAQP6U= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-142-vzmS_zCAPMWODCgD1bTNJA-1; Wed, 24 Apr 2024 03:58:21 -0400 X-MC-Unique: vzmS_zCAPMWODCgD1bTNJA-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 526991C4C3A0; Wed, 24 Apr 2024 07:58:21 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.67]) by smtp.corp.redhat.com (Postfix) with ESMTP id 403703543A; Wed, 24 Apr 2024 07:58:20 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org Cc: Richard Henderson , =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= Subject: [PULL 17/17] target/s390x: Remove KVM stubs in cpu_models.h Date: Wed, 24 Apr 2024 09:57:35 +0200 Message-ID: <20240424075735.248041-18-thuth@redhat.com> In-Reply-To: <20240424075735.248041-1-thuth@redhat.com> References: <20240424075735.248041-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.5 Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.67, 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_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.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é Since the calls are elided when KVM is not available, we can remove the stubs (which are never compiled). Signed-off-by: Philippe Mathieu-Daudé Message-ID: <20240419090631.48055-1-philmd@linaro.org> Signed-off-by: Thomas Huth --- target/s390x/cpu_models.h | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/target/s390x/cpu_models.h b/target/s390x/cpu_models.h index d7b8912989..a89c2a15ab 100644 --- a/target/s390x/cpu_models.h +++ b/target/s390x/cpu_models.h @@ -114,23 +114,8 @@ static inline uint64_t s390_cpuid_from_cpu_model(const S390CPUModel *model) S390CPUDef const *s390_find_cpu_def(uint16_t type, uint8_t gen, uint8_t ec_ga, S390FeatBitmap features); -#ifdef CONFIG_KVM bool kvm_s390_cpu_models_supported(void); void kvm_s390_get_host_cpu_model(S390CPUModel *model, Error **errp); void kvm_s390_apply_cpu_model(const S390CPUModel *model, Error **errp); -#else -static inline void kvm_s390_get_host_cpu_model(S390CPUModel *model, - Error **errp) -{ -} -static inline void kvm_s390_apply_cpu_model(const S390CPUModel *model, - Error **errp) -{ -} -static inline bool kvm_s390_cpu_models_supported(void) -{ - return false; -} -#endif #endif /* TARGET_S390X_CPU_MODELS_H */