From patchwork Mon Sep 21 01:06:00 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 520087 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.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 5B353140771 for ; Mon, 21 Sep 2015 11:11:08 +1000 (AEST) Received: from localhost ([::1]:54584 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZdpdK-0003KO-46 for incoming@patchwork.ozlabs.org; Sun, 20 Sep 2015 21:11:06 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40143) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZdpYg-0002rP-GU for qemu-devel@nongnu.org; Sun, 20 Sep 2015 21:06:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZdpYf-00051C-D0 for qemu-devel@nongnu.org; Sun, 20 Sep 2015 21:06:18 -0400 Received: from ozlabs.org ([2401:3900:2:1::2]:56297) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZdpYe-0004yX-Uy; Sun, 20 Sep 2015 21:06:17 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 508F5140909; Mon, 21 Sep 2015 11:06:08 +1000 (AEST) From: David Gibson To: peter.maydell@linaro.org Date: Mon, 21 Sep 2015 11:06:00 +1000 Message-Id: <1442797588-26793-6-git-send-email-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1442797588-26793-1-git-send-email-david@gibson.dropbear.id.au> References: <1442797588-26793-1-git-send-email-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2401:3900:2:1::2 Cc: mdroth@linux.vnet.ibm.com, aik@ozlabs.ru, qemu-devel@nongnu.org, agraf@suse.de, qemu-ppc@nongnu.org, Sam Bobroff , David Gibson Subject: [Qemu-devel] [PULL 05/33] spapr: Make ibm, change-msi respect 3 return values X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Sam Bobroff Currently, rtas_ibm_change_msi() always returns four values even if less are specified. Correct this by only returning the fourth parameter if it was requested. This is specified by PAPR. Signed-off-by: Sam Bobroff Reviewed-by: David Gibson Signed-off-by: David Gibson --- hw/ppc/spapr_pci.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c index a2feb4c..6782fd0 100644 --- a/hw/ppc/spapr_pci.c +++ b/hw/ppc/spapr_pci.c @@ -375,7 +375,9 @@ out: rtas_st(rets, 0, RTAS_OUT_SUCCESS); rtas_st(rets, 1, req_num); rtas_st(rets, 2, ++seq_num); - rtas_st(rets, 3, ret_intr_type); + if (nret > 3) { + rtas_st(rets, 3, ret_intr_type); + } trace_spapr_pci_rtas_ibm_change_msi(config_addr, func, req_num, irq); }