From nobody Sun Feb 8 13:45:44 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=1765982590; cv=none; d=zohomail.com; s=zohoarc; b=Rm4QtoOg/1RTCji+eNIIo06OOY6kgJmrCZIadEGBsYJVzhmLb4Q+l4EnD6Em9Yg/6ZU9QNxLmXMgFspYYIRpLLOrlQyLivRiCrHosgJed1hvh4JBO1vUsJhE78Bo+zbpTRHw9wqlHQkwPfxgBYboSodHt5p4ZObk/8bhOo1VKcs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1765982590; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=bhwlsNSpg0ybyjFJJ7qksQsiU9+VM/Izd/QWap6u5lQ=; b=NblZfXY9fdF4syohNCjSb8tjaB1BVuTbNo1L7RKohdxkNDeiYtcA3SG9+lfB3lSrU3sD7lWEAw4lg4X7lbp7coo+kdCIATLtCo6t2zhZW6Q2nTG6wz8Ya9IlX1ZtZDFq6qqKmpgN3arM8R/28jm5B4p3KbGJmA6QX4Io6k3hLbQ= 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 1765982590855424.74534056847097; Wed, 17 Dec 2025 06:43:10 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vVsk4-0001sf-Kn; Wed, 17 Dec 2025 09:43:04 -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 1vVsjt-0001jY-SO for qemu-devel@nongnu.org; Wed, 17 Dec 2025 09:42:54 -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 1vVsjr-0000TJ-Lq for qemu-devel@nongnu.org; Wed, 17 Dec 2025 09:42:52 -0500 Received: from mx-prod-mc-01.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-395-PQH3bXviP1ipb0xYeALzSg-1; Wed, 17 Dec 2025 09:42:45 -0500 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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A07F5195FCE8; Wed, 17 Dec 2025 14:42:43 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.44.32.192]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id D90DE1800576; Wed, 17 Dec 2025 14:42:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1765982569; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=bhwlsNSpg0ybyjFJJ7qksQsiU9+VM/Izd/QWap6u5lQ=; b=SFQtS5XtPs/Nvp3ocpw312hP31Sw7ld851ziG8eHt/c9nIsbYyVQY8Zc7j3lvZ2l98JRGu Y2+1liS/egeStLqY5kenaISrQPcngZp/l17YAp4PSs8i7rlbW0nlO/AZDj+HiFUGWRoX9M ROui1/sklTfbExIKBkJFfS2sLINFSr4= X-MC-Unique: PQH3bXviP1ipb0xYeALzSg-1 X-Mimecast-MFC-AGG-ID: PQH3bXviP1ipb0xYeALzSg_1765982563 From: Thomas Huth To: qemu-s390x@nongnu.org Cc: qemu-devel@nongnu.org, Halil Pasic , Christian Borntraeger , Eric Farman , Matthew Rosato , Ilya Leoshkevich , David Hildenbrand Subject: [PATCH] hw/s390x: Un-inline the s390_do_cpu_*() functions Date: Wed, 17 Dec 2025 15:42:38 +0100 Message-ID: <20251217144238.37610-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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_SBL_CSS=3.335, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1765982593135154100 Content-Type: text/plain; charset="utf-8" From: Thomas Huth These functions are only called via their function pointer by using the run_on_cpu() function, so it does not make sense to declare these as "inline" functions. Move the functions from cpu.h to either cpu.c (when they are still used in multiple places), or to s390-virtio-ccw.c (when they are only called from that file). Signed-off-by: Thomas Huth Reviewed-by: Eric Farman Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- target/s390x/cpu.h | 24 +----------------------- hw/s390x/s390-virtio-ccw.c | 19 ++++++++++++++++++- target/s390x/cpu.c | 5 +++++ 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h index aa931cb6748..ba2bf177e8f 100644 --- a/target/s390x/cpu.h +++ b/target/s390x/cpu.h @@ -845,30 +845,8 @@ static inline uint64_t s390_build_validity_mcic(void) return mcic; } =20 -static inline void s390_do_cpu_full_reset(CPUState *cs, run_on_cpu_data ar= g) -{ - cpu_reset(cs); -} - -static inline void s390_do_cpu_reset(CPUState *cs, run_on_cpu_data arg) -{ - resettable_reset(OBJECT(cs), RESET_TYPE_S390_CPU_NORMAL); -} - -static inline void s390_do_cpu_initial_reset(CPUState *cs, run_on_cpu_data= arg) -{ - resettable_reset(OBJECT(cs), RESET_TYPE_S390_CPU_INITIAL); -} - -static inline void s390_do_cpu_load_normal(CPUState *cs, run_on_cpu_data a= rg) -{ - S390CPUClass *scc =3D S390_CPU_GET_CLASS(cs); - - scc->load_normal(cs); -} - - /* cpu.c */ +void s390_do_cpu_full_reset(CPUState *cs, run_on_cpu_data arg); void s390_crypto_reset(void); void s390_cmma_reset(void); void s390_enable_css_support(S390CPU *cpu); diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 64b81345f1e..d8ef17b99bb 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -364,7 +364,24 @@ static void s390_cpu_plug(HotplugHandler *hotplug_dev, } } =20 -static inline void s390_do_cpu_ipl(CPUState *cs, run_on_cpu_data arg) +static void s390_do_cpu_reset(CPUState *cs, run_on_cpu_data arg) +{ + resettable_reset(OBJECT(cs), RESET_TYPE_S390_CPU_NORMAL); +} + +static void s390_do_cpu_initial_reset(CPUState *cs, run_on_cpu_data arg) +{ + resettable_reset(OBJECT(cs), RESET_TYPE_S390_CPU_INITIAL); +} + +static void s390_do_cpu_load_normal(CPUState *cs, run_on_cpu_data arg) +{ + S390CPUClass *scc =3D S390_CPU_GET_CLASS(cs); + + scc->load_normal(cs); +} + +static void s390_do_cpu_ipl(CPUState *cs, run_on_cpu_data arg) { S390CPU *cpu =3D S390_CPU(cs); =20 diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c index f05ce317da1..dc99226fcdf 100644 --- a/target/s390x/cpu.c +++ b/target/s390x/cpu.c @@ -141,6 +141,11 @@ static void s390_query_cpu_fast(CPUState *cpu, CpuInfo= Fast *value) #endif } =20 +void s390_do_cpu_full_reset(CPUState *cs, run_on_cpu_data arg) +{ + cpu_reset(cs); +} + /* S390CPUClass Resettable reset_hold phase method */ static void s390_cpu_reset_hold(Object *obj, ResetType type) { --=20 2.52.0