[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 31/47] acpi nvdimm: fix ARG3 conflict
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 31/47] acpi nvdimm: fix ARG3 conflict |
Date: |
Sun, 30 Oct 2016 23:24:48 +0200 |
From: Xiao Guangrong <address@hidden>
As ARG3 is a reserved name, we rename it to FARG
Suggested-by: Igor Mammedov <address@hidden>
Signed-off-by: Xiao Guangrong <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
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);
/*
--
MST
- [Qemu-devel] [PULL 26/47] virtio-crypto: using bh to handle dataq's requests, (continued)
- [Qemu-devel] [PULL 26/47] virtio-crypto: using bh to handle dataq's requests, Michael S. Tsirkin, 2016/10/30
- [Qemu-devel] [PULL 27/47] virtio-crypto: add myself as virtio-crypto and cryptodev backends maintainer, Michael S. Tsirkin, 2016/10/30
- [Qemu-devel] [PULL 28/47] acpi nvdimm: fix wrong buffer size returned by DSM method, Michael S. Tsirkin, 2016/10/30
- [Qemu-devel] [PULL 29/47] acpi nvdimm: fix OperationRegion definition, Michael S. Tsirkin, 2016/10/30
- [Qemu-devel] [PULL 30/47] acpi nvdimm: fix device physical address base, Michael S. Tsirkin, 2016/10/30
[Qemu-devel] [PULL 31/47] acpi nvdimm: fix ARG3 conflict,
Michael S. Tsirkin <=
[Qemu-devel] [PULL 32/47] acpi nvdimm: fix Arg6 usage, Michael S. Tsirkin, 2016/10/30
[Qemu-devel] [PULL 34/47] acpi nvdimm: rename result_size to dsm_out_buf_siz, Michael S. Tsirkin, 2016/10/30
[Qemu-devel] [PULL 33/47] nvdimm acpi: compile nvdimm acpi code arch-independently, Michael S. Tsirkin, 2016/10/30
[Qemu-devel] [PULL 35/47] nvdimm acpi: use common macros instead of magic names, Michael S. Tsirkin, 2016/10/30
[Qemu-devel] [PULL 36/47] nvdimm acpi: prebuild nvdimm devices for available slots, Michael S. Tsirkin, 2016/10/30
[Qemu-devel] [PULL 37/47] nvdimm acpi: introduce fit buffer, Michael S. Tsirkin, 2016/10/30