From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48630) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c09zs-0007EP-Ko for qemu-devel@nongnu.org; Fri, 28 Oct 2016 12:27:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c09zo-0000dV-JV for qemu-devel@nongnu.org; Fri, 28 Oct 2016 12:27:12 -0400 Received: from mga03.intel.com ([134.134.136.65]:28741) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1c09zo-0000bA-AM for qemu-devel@nongnu.org; Fri, 28 Oct 2016 12:27:08 -0400 From: Xiao Guangrong Date: Sat, 29 Oct 2016 00:11:52 +0800 Message-Id: <1477671116-24079-5-git-send-email-guangrong.xiao@linux.intel.com> In-Reply-To: <1477671116-24079-1-git-send-email-guangrong.xiao@linux.intel.com> References: <1477671116-24079-1-git-send-email-guangrong.xiao@linux.intel.com> Subject: [Qemu-devel] [PATCH 4/8] acpi nvdimm: fix ARG3 conflict List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: pbonzini@redhat.com, imammedo@redhat.com Cc: gleb@kernel.org, mtosatti@redhat.com, stefanha@redhat.com, mst@redhat.com, rth@twiddle.net, ehabkost@redhat.com, dan.j.williams@intel.com, kvm@vger.kernel.org, qemu-devel@nongnu.org, Xiao Guangrong As ARG3 is a reserved name, we rename it to FARG Suggested-by: Igor Mammedov Signed-off-by: Xiao Guangrong --- 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 c2f5caa..0b8c275 100644 --- a/hw/acpi/nvdimm.c +++ b/hw/acpi/nvdimm.c @@ -816,7 +816,8 @@ static void nvdimm_build_common_dsm(Aml *dev) * on NVDIMM Root Device. * REVS: store the Arg1 of _DSM call. * FUNC: store the Arg2 of _DSM call. - * ARG3: store the Arg3 of _DSM call. + * FARG: store the Arg3 of _DSM call which is a Package containing + * function-specific arguments. * * They are RAM mapping on host so that these accesses never cause * VM-EXIT. @@ -828,7 +829,7 @@ static void nvdimm_build_common_dsm(Aml *dev) sizeof(typeof_field(NvdimmDsmIn, revision)) * BITS_PER_BYTE)); aml_append(field, aml_named_field("FUNC", sizeof(typeof_field(NvdimmDsmIn, function)) * BITS_PER_BYTE)); - aml_append(field, aml_named_field("ARG3", + aml_append(field, aml_named_field("FARG", (sizeof(NvdimmDsmIn) - offsetof(NvdimmDsmIn, arg3)) * BITS_PER_BYTE)); aml_append(method, field); @@ -910,7 +911,7 @@ static void nvdimm_build_common_dsm(Aml *dev) pckg_buf = aml_local(3); aml_append(ifctx, aml_store(aml_index(pckg, aml_int(0)), pckg_index)); aml_append(ifctx, aml_store(aml_derefof(pckg_index), pckg_buf)); - aml_append(ifctx, aml_store(pckg_buf, aml_name("ARG3"))); + aml_append(ifctx, aml_store(pckg_buf, aml_name("FARG"))); aml_append(method, ifctx); /* -- 1.8.3.1