From nobody Mon Feb 9 08:57:55 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1768224027; cv=none; d=zohomail.com; s=zohoarc; b=Z3pMSmR9vib7Q50pB47g4NjMQrZiHeBhc+EMoStZ9542catRvKUZNt5u9KN/nFjZ2JQYWnuuGhlOlDyO0Tmb4id8HXq3L7q7JQ0ztaiaEUY4+v3b0tYH9HTDHLHl4V21BFHsHaIW72g8tKkn/kM4hFZJiTb4pGXXsNos6dbm/vs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768224027; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=oG9Dsze0JU1GCFIaRY/UGoIwmjHYD7VTV+1WbSmKAZo=; b=Q5Ptf+5obQqxm7XMKVyeEl8aLnrPOfOn6fDIv+wF6xzN71GY4AMtAC2qvijI83ydAPGTErLFUbWy54myre0W66bnVyvGvwHK8R6uZ0rzKmj7Qia3CuAqXeCRilLmq0R7iPsPLKlQV+ETVPFi+NW7Dj4PywO2+XokhoS5+KP8KKc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1768224027944203.93677806019002; Mon, 12 Jan 2026 05:20:27 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vfHp5-0003nj-L4; Mon, 12 Jan 2026 08:19:07 -0500 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 1vfHll-0001d3-Pz for qemu-devel@nongnu.org; Mon, 12 Jan 2026 08:16:00 -0500 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 1vfHlj-0002ce-0S for qemu-devel@nongnu.org; Mon, 12 Jan 2026 08:15:41 -0500 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-169-wyUBvxG-MSCeg-jkX7WDgw-1; Mon, 12 Jan 2026 08:15:32 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 29D4318005AF; Mon, 12 Jan 2026 13:15:31 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.45.224.179]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 5473D30001A2; Mon, 12 Jan 2026 13:15:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1768223737; 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=oG9Dsze0JU1GCFIaRY/UGoIwmjHYD7VTV+1WbSmKAZo=; b=WJL2aKF1RajyIlZKsRxbOCQZkCnpIa26fDprqsi/3CRgGqtNog2c0m1VwZjHf8/bnxyzPz VP1lvgUu6cA9Qo3zp3D0nKSZifFVQ7HJ0fwW0E9uZgylGvko9W6DUp1LIdgpYB1MxCn3ES ECWU1zMVoQamFYtQeAPxOteMKeLEusQ= X-MC-Unique: wyUBvxG-MSCeg-jkX7WDgw-1 X-Mimecast-MFC-AGG-ID: wyUBvxG-MSCeg-jkX7WDgw_1768223731 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 13/15] target/s390x: Un-inline s390_is_pv() Date: Mon, 12 Jan 2026 14:14:55 +0100 Message-ID: <20260112131457.67128-14-thuth@redhat.com> In-Reply-To: <20260112131457.67128-1-thuth@redhat.com> References: <20260112131457.67128-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H2=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1768224030044158500 From: Philippe Mathieu-Daud=C3=A9 Inlining a method which use a static variable is really a bad idea, as it totally defeats the point of both concepts. Currently we have 12 + 4 =3D 16 static 'ccw' variables...: $ git grep -wl target/s390x/kvm/pv.h | fgrep .h hw/s390x/ipl.h $ git grep -wl target/s390x/kvm/pv.h | fgrep .c | wc -l 12 $ git grep -wl hw/s390x/ipl.h | fgrep .c | wc -l 4 Fixes: c3347ed0d2e ("s390x: protvirt: Support unpack facility") Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth Message-ID: <20260107130807.69870-16-philmd@linaro.org> Signed-off-by: Thomas Huth --- target/s390x/kvm/pv.h | 24 +----------------------- target/s390x/kvm/pv.c | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 23 deletions(-) diff --git a/target/s390x/kvm/pv.h b/target/s390x/kvm/pv.h index 94e885e9335..e266fc3d545 100644 --- a/target/s390x/kvm/pv.h +++ b/target/s390x/kvm/pv.h @@ -12,8 +12,6 @@ #ifndef HW_S390_PV_H #define HW_S390_PV_H =20 -#include "qapi/error.h" -#include "system/kvm.h" #include "hw/s390x/s390-virtio-ccw.h" =20 struct S390PVResponse { @@ -23,27 +21,7 @@ struct S390PVResponse { }; =20 #ifdef CONFIG_KVM -#include "cpu.h" - -static inline bool s390_is_pv(void) -{ - static S390CcwMachineState *ccw; - Object *obj; - - if (ccw) { - return ccw->pv; - } - - /* we have to bail out for the "none" machine */ - obj =3D object_dynamic_cast(qdev_get_machine(), - TYPE_S390_CCW_MACHINE); - if (!obj) { - return false; - } - ccw =3D S390_CCW_MACHINE(obj); - return ccw->pv; -} - +bool s390_is_pv(void); int s390_pv_query_info(void); int s390_pv_vm_enable(void); void s390_pv_vm_disable(void); diff --git a/target/s390x/kvm/pv.c b/target/s390x/kvm/pv.c index 2bc916a5455..3d508165f34 100644 --- a/target/s390x/kvm/pv.c +++ b/target/s390x/kvm/pv.c @@ -25,6 +25,24 @@ #include "target/s390x/kvm/kvm_s390x.h" #include "target/s390x/kvm/pv.h" =20 +bool s390_is_pv(void) +{ + static S390CcwMachineState *ccw; + Object *obj; + + if (ccw) { + return ccw->pv; + } + + /* we have to bail out for the "none" machine */ + obj =3D object_dynamic_cast(qdev_get_machine(), TYPE_S390_CCW_MACHINE); + if (!obj) { + return false; + } + ccw =3D S390_CCW_MACHINE(obj); + return ccw->pv; +} + static bool info_valid; static struct kvm_s390_pv_info_vm info_vm; static struct kvm_s390_pv_info_dump info_dump; --=20 2.52.0