From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55333) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c0xb3-0003qT-On for qemu-devel@nongnu.org; Sun, 30 Oct 2016 17:24:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c0xb2-0007DA-TW for qemu-devel@nongnu.org; Sun, 30 Oct 2016 17:24:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44722) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1c0xb2-0007D2-OC for qemu-devel@nongnu.org; Sun, 30 Oct 2016 17:24:52 -0400 Date: Sun, 30 Oct 2016 23:24:50 +0200 From: "Michael S. Tsirkin" Message-ID: <1477850917-1214-33-git-send-email-mst@redhat.com> References: <1477850917-1214-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1477850917-1214-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL 32/47] acpi nvdimm: fix Arg6 usage List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Xiao Guangrong , Igor Mammedov From: Xiao Guangrong As the function only has 5 args, we use local7 instead of it Suggested-by: Igor Mammedov Signed-off-by: Xiao Guangrong Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/acpi/nvdimm.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/acpi/nvdimm.c b/hw/acpi/nvdimm.c index 0b8c275..cc958a4 100644 --- a/hw/acpi/nvdimm.c +++ b/hw/acpi/nvdimm.c @@ -780,7 +780,7 @@ static void nvdimm_build_common_dsm(Aml *dev) { Aml *method, *ifctx, *function, *handle, *uuid, *dsm_mem, *result_size; Aml *elsectx, *unsupport, *unpatched, *expected_uuid, *uuid_invalid; - Aml *pckg, *pckg_index, *pckg_buf, *field; + Aml *pckg, *pckg_index, *pckg_buf, *field, *dsm_out_buf; uint8_t byte_list[1]; method = aml_method(NVDIMM_COMMON_DSM, 5, AML_SERIALIZED); @@ -788,6 +788,7 @@ static void nvdimm_build_common_dsm(Aml *dev) function = aml_arg(2); handle = aml_arg(4); dsm_mem = aml_local(6); + dsm_out_buf = aml_local(7); aml_append(method, aml_store(aml_name(NVDIMM_ACPI_MEM_ADDR), dsm_mem)); @@ -928,8 +929,8 @@ static void nvdimm_build_common_dsm(Aml *dev) aml_append(method, aml_create_field(aml_name("ODAT"), aml_int(0), result_size, "OBUF")); aml_append(method, aml_concatenate(aml_buffer(0, NULL), aml_name("OBUF"), - aml_arg(6))); - aml_append(method, aml_return(aml_arg(6))); + dsm_out_buf)); + aml_append(method, aml_return(dsm_out_buf)); aml_append(dev, method); } -- MST