From nobody Mon Feb 9 19:37:30 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1562048727; cv=none; d=zoho.com; s=zohoarc; b=Vvz7fgv/fKbHiGHR45nT0uwTKXaM1FPDmULAQU0ru6NN15cB4vmrztB71Im9+OAQMkvqL2TMkYUiBIk4caoLzQT8rNe2lWq7A6AM85AoICBMlZl/SvAb+BCVgu5qwFfsBf8XwfHgnAe4AoQaG35xRfnLF2j3HhXmPHR2TtnukGk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562048727; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=vCiKXXwoLMMslnqsc59Mp5/p4+tpvKa4BC0VFXJNGRk=; b=Xd+d9MuhVt7Eu2t5XEtbbrYnT7+WFW7hvuJ2jdo7XBArBOTQynd78EQyJ27HOm6LO3U+Xzqzf8EHAeObAgXeyveqHBrwCZSD76Sd0+ymxwlfpsP5GmkpqPwQjRgcJtcVRFqbCEFm9tmwacZsZ6tO7aDXCvH3F4qhqVUQcbnWgSg= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1562048711544960.759588364796; Mon, 1 Jul 2019 23:25:11 -0700 (PDT) Received: from localhost ([::1]:49466 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hiCE0-0002A8-Sh for importer@patchew.org; Tue, 02 Jul 2019 02:25:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58542) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hiByn-00055m-DT for qemu-devel@nongnu.org; Tue, 02 Jul 2019 02:09:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hiBym-0002yV-0t for qemu-devel@nongnu.org; Tue, 02 Jul 2019 02:09:25 -0400 Received: from bilbo.ozlabs.org ([2401:3900:2:1::2]:55627 helo=ozlabs.org) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hiByl-0002uW-I3; Tue, 02 Jul 2019 02:09:23 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 45dDMk31STz9sQp; Tue, 2 Jul 2019 16:09:05 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1562047746; bh=xQLujcppXzYZL936PFhH4Oiy7+tPKkVm9ZN46+bvTWg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BFE66Eppic9JqJrxhvSqEzKfB38iJpTwKGn1A8myavw1TsR9xECvI5XSiicgqYVmy d4/fo5cHZov2jOTFgfqQOmd/j2NjHFx9V9fck5lGiIfBdIQyh7B5GhRGk21VjJ3YgO etWbSy/oJ/rM027d824Bz3WhOfNZaaEjX6xn7qw8= From: David Gibson To: peter.maydell@linaro.org Date: Tue, 2 Jul 2019 16:08:30 +1000 Message-Id: <20190702060857.3926-23-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190702060857.3926-1-david@gibson.dropbear.id.au> References: <20190702060857.3926-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2401:3900:2:1::2 Subject: [Qemu-devel] [PULL 22/49] xics/spapr: Rename xics_kvm_init() 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: lvivier@redhat.com, aik@ozlabs.ru, qemu-devel@nongnu.org, groug@kaod.org, qemu-ppc@nongnu.org, clg@kaod.org, David Gibson , rth@twiddle.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Greg Kurz Switch to using the connect/disconnect terminology like we already do for XIVE. Signed-off-by: Greg Kurz Message-Id: <156077920102.433243.6605099291134598170.stgit@bahia.lan> Reviewed-by: C=C3=A9dric Le Goater Signed-off-by: David Gibson --- hw/intc/xics_kvm.c | 2 +- hw/ppc/spapr_irq.c | 2 +- include/hw/ppc/xics_spapr.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/intc/xics_kvm.c b/hw/intc/xics_kvm.c index c7f8f5edd2..534515143e 100644 --- a/hw/intc/xics_kvm.c +++ b/hw/intc/xics_kvm.c @@ -331,7 +331,7 @@ void ics_kvm_set_irq(ICSState *ics, int srcno, int val) } } =20 -int xics_kvm_init(SpaprMachineState *spapr, Error **errp) +int xics_kvm_connect(SpaprMachineState *spapr, Error **errp) { int rc; CPUState *cs; diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c index 75654fc67a..b2b01e850d 100644 --- a/hw/ppc/spapr_irq.c +++ b/hw/ppc/spapr_irq.c @@ -243,7 +243,7 @@ static void spapr_irq_init_emu_xics(SpaprMachineState *= spapr, Error **errp) static void spapr_irq_init_kvm_xics(SpaprMachineState *spapr, Error **errp) { if (kvm_enabled()) { - xics_kvm_init(spapr, errp); + xics_kvm_connect(spapr, errp); } } =20 diff --git a/include/hw/ppc/xics_spapr.h b/include/hw/ppc/xics_spapr.h index 3304481262..5dabc9a138 100644 --- a/include/hw/ppc/xics_spapr.h +++ b/include/hw/ppc/xics_spapr.h @@ -33,7 +33,7 @@ =20 void spapr_dt_xics(SpaprMachineState *spapr, uint32_t nr_servers, void *fd= t, uint32_t phandle); -int xics_kvm_init(SpaprMachineState *spapr, Error **errp); +int xics_kvm_connect(SpaprMachineState *spapr, Error **errp); void xics_kvm_disconnect(SpaprMachineState *spapr, Error **errp); bool xics_kvm_has_broken_disconnect(SpaprMachineState *spapr); void xics_spapr_init(SpaprMachineState *spapr); --=20 2.21.0