From patchwork Thu Apr 19 12:43:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?C=C3=A9dric_Le_Goater?= X-Patchwork-Id: 901035 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=kaod.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40RfJZ36txz9s27 for ; Thu, 19 Apr 2018 23:01:50 +1000 (AEST) Received: from localhost ([::1]:45192 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f99C8-0004oB-C2 for incoming@patchwork.ozlabs.org; Thu, 19 Apr 2018 09:01:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57889) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f98wc-0000rf-7f for qemu-devel@nongnu.org; Thu, 19 Apr 2018 08:45:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f98wY-0000Wc-Bp for qemu-devel@nongnu.org; Thu, 19 Apr 2018 08:45:46 -0400 Received: from 4.mo68.mail-out.ovh.net ([46.105.59.63]:38597) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1f98wY-0000W8-4H for qemu-devel@nongnu.org; Thu, 19 Apr 2018 08:45:42 -0400 Received: from player792.ha.ovh.net (unknown [10.109.120.111]) by mo68.mail-out.ovh.net (Postfix) with ESMTP id B30EBD38DF for ; Thu, 19 Apr 2018 14:45:40 +0200 (CEST) Received: from zorba.kaod.org.com (LFbn-REN-1-664-241.w81-53.abo.wanadoo.fr [81.53.234.241]) (Authenticated sender: clg@kaod.org) by player792.ha.ovh.net (Postfix) with ESMTPSA id E3759A0087; Thu, 19 Apr 2018 14:45:34 +0200 (CEST) From: =?utf-8?q?C=C3=A9dric_Le_Goater?= To: qemu-ppc@nongnu.org, qemu-devel@nongnu.org Date: Thu, 19 Apr 2018 14:43:16 +0200 Message-Id: <20180419124331.3915-21-clg@kaod.org> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180419124331.3915-1-clg@kaod.org> References: <20180419124331.3915-1-clg@kaod.org> MIME-Version: 1.0 X-Ovh-Tracer-Id: 10336887045312514899 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedtgedrjeehgdehjecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 46.105.59.63 Subject: [Qemu-devel] [PATCH v3 20/35] spapr: add support to dump XIVE information X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?C=C3=A9dric_Le_Goater?= , David Gibson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Modify the InterruptStatsProvider output to reflect the interrupt mode currently in use by the machine. Signed-off-by: Cédric Le Goater --- hw/ppc/spapr.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 0c59816bf3d6..e3567543e6e6 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -4015,10 +4015,18 @@ static void spapr_pic_print_info(InterruptStatsProvider *obj, CPU_FOREACH(cs) { PowerPCCPU *cpu = POWERPC_CPU(cs); - icp_pic_print_info(ICP(cpu->intc), mon); + if (spapr_ovec_test(spapr->ov5_cas, OV5_XIVE_EXPLOIT)) { + xive_nvt_pic_print_info(XIVE_NVT(cpu->intc), mon); + } else { + icp_pic_print_info(ICP(cpu->intc), mon); + } } - ics_pic_print_info(spapr->ics, mon); + if (spapr_ovec_test(spapr->ov5_cas, OV5_XIVE_EXPLOIT)) { + spapr_xive_pic_print_info(spapr->xive, mon); + } else { + ics_pic_print_info(spapr->ics, mon); + } } int spapr_get_vcpu_id(PowerPCCPU *cpu)