From nobody Mon Apr 29 14:51:49 2024 Delivered-To: importer@patchew.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; Authentication-Results: mx.zohomail.com; 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=fail(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1574882281; cv=none; d=zohomail.com; s=zohoarc; b=g/QFSa3XP2LuSTVkruDwU4sx7tOPtB+AMwojVkrWhIFbg8e2ZoqSNkOMoeMic+FWj+6KUcdroSP53g8j2CyBLqXQ3SR3E9Kh7FkAGOYbAFrVTxg60GEoBrRj4I/9gluBsisIJhBD7hr5rIIacjBSoGEBpkTqcQYxnzWLVeiRyfE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1574882281; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=f6E/vqbsCNV6YjBY2zA7K5Kui8lKuHKwWPa9TAFQlWg=; b=YE9ozHJltCLaUDsPGQtd4BPbds5XWIFtJbY72fz/PBmNTsKAtn84PTPUfOt2LOgIJIKodeWCbs5agjyqVfrnmlB6bbrI3aXqBGMmoxBnaY5v15jAqGpQLoeRhtXvBwjaakFxBcnP3DYQd4fJa0LyvHTK6EaI4w6FDOl+tOTjuPE= ARC-Authentication-Results: i=1; mx.zohomail.com; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1574882281847403.7650946683282; Wed, 27 Nov 2019 11:18:01 -0800 (PST) Received: from localhost ([::1]:42100 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ia2p6-0000ro-G1 for importer@patchew.org; Wed, 27 Nov 2019 14:18:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33159) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ia2m2-0007uS-A5 for qemu-devel@nongnu.org; Wed, 27 Nov 2019 14:14:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ia2m1-0003F7-7R for qemu-devel@nongnu.org; Wed, 27 Nov 2019 14:14:50 -0500 Received: from relay.sw.ru ([185.231.240.75]:53302) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ia2m0-0003Bc-Vm; Wed, 27 Nov 2019 14:14:49 -0500 Received: from vovaso.qa.sw.ru ([10.94.3.0] helo=kvm.qa.sw.ru) by relay.sw.ru with esmtp (Exim 4.92.3) (envelope-from ) id 1ia2lm-0003eZ-TT; Wed, 27 Nov 2019 22:14:35 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org, qemu-ppc@nongnu.org Subject: [PATCH v6] ppc: well form kvmppc_hint_smt_possible error hint helper Date: Wed, 27 Nov 2019 22:14:34 +0300 Message-Id: <20191127191434.20945-1-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 185.231.240.75 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: marcandre.lureau@redhat.com, vsementsov@virtuozzo.com, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Make kvmppc_hint_smt_possible hint append helper well formed: rename errp to errp_in, as it is IN-parameter here (which is unusual for errp), rename function to be kvmppc_error_append_*_hint. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Greg Kurz --- v6: keep kvmppc_ function prefix add r-b by Marc-Andr=C3=A9 target/ppc/kvm_ppc.h | 4 ++-- hw/ppc/spapr.c | 2 +- target/ppc/kvm.c | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/target/ppc/kvm_ppc.h b/target/ppc/kvm_ppc.h index 98bd7d5da6..47b08a4030 100644 --- a/target/ppc/kvm_ppc.h +++ b/target/ppc/kvm_ppc.h @@ -28,7 +28,7 @@ void kvmppc_set_papr(PowerPCCPU *cpu); int kvmppc_set_compat(PowerPCCPU *cpu, uint32_t compat_pvr); void kvmppc_set_mpic_proxy(PowerPCCPU *cpu, int mpic_proxy); int kvmppc_smt_threads(void); -void kvmppc_hint_smt_possible(Error **errp); +void kvmppc_error_append_smt_possible_hint(Error **errp_in); int kvmppc_set_smt_threads(int smt); int kvmppc_clear_tsr_bits(PowerPCCPU *cpu, uint32_t tsr_bits); int kvmppc_or_tsr_bits(PowerPCCPU *cpu, uint32_t tsr_bits); @@ -164,7 +164,7 @@ static inline int kvmppc_smt_threads(void) return 1; } =20 -static inline void kvmppc_hint_smt_possible(Error **errp) +static inline void kvmppc_error_append_smt_possible_hint(Error **errp_in) { return; } diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index e076f6023c..1b87eb0ffd 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2564,7 +2564,7 @@ static void spapr_set_vsmt_mode(SpaprMachineState *sp= apr, Error **errp) " requires the use of VSMT mode %d.\= n", smp_threads, kvm_smt, spapr->vsmt); } - kvmppc_hint_smt_possible(&local_err); + kvmppc_error_append_smt_possible_hint(&local_err); goto out; } } diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c index c77f9848ec..7406d18945 100644 --- a/target/ppc/kvm.c +++ b/target/ppc/kvm.c @@ -2076,7 +2076,7 @@ int kvmppc_set_smt_threads(int smt) return ret; } =20 -void kvmppc_hint_smt_possible(Error **errp) +void kvmppc_error_append_smt_possible_hint(Error **errp_in) { int i; GString *g; @@ -2091,10 +2091,10 @@ void kvmppc_hint_smt_possible(Error **errp) } } s =3D g_string_free(g, false); - error_append_hint(errp, "%s.\n", s); + error_append_hint(errp_in, "%s.\n", s); g_free(s); } else { - error_append_hint(errp, + error_append_hint(errp_in, "This KVM seems to be too old to support VSMT.\n= "); } } --=20 2.21.0