diff options
| author | Xiao Guangrong <guangrong.xiao@linux.intel.com> | 2016-10-29 00:11:52 +0800 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2016-11-01 19:21:08 +0200 |
| commit | dba00936ea26e2b103ade4ac0f8a31aa6c410b6f (patch) | |
| tree | 7194041f564a9362a77828280e45bf467238a99c | |
| parent | 6ab0c4bd1dc758b8a1f456d7f748ec313b5fde3d (diff) | |
acpi nvdimm: fix ARG3 conflict
As ARG3 is a reserved name, we rename it to FARG
Suggested-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Xiao Guangrong <guangrong.xiao@linux.intel.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
| -rw-r--r-- | hw/acpi/nvdimm.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/hw/acpi/nvdimm.c b/hw/acpi/nvdimm.c index c2f5caa338..0b8c275f62 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); /* |