[Qemu-devel] [PATCH v4 27/33] nvdimm acpi: save arg3 for NVDIMM device _DSM method

[Xiao Guangrong]

Check if the input Arg3 is valid then store it into dsm_in if needed

Signed-off-by: Xiao Guangrong <address@hidden>
---
 hw/acpi/nvdimm.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/hw/acpi/nvdimm.c b/hw/acpi/nvdimm.c
index 7e99889..b211b8b 100644
--- a/hw/acpi/nvdimm.c
+++ b/hw/acpi/nvdimm.c
@@ -624,10 +624,29 @@ static void nvdimm_build_acpi_devices(NVDIMMState *state, 
GSList *device_list,
 
     method = aml_method_serialized("NCAL", 4);
     {
+        Aml *ifctx;
+
         aml_append(method, aml_store(aml_arg(0), aml_name("HDLE")));
         aml_append(method, aml_store(aml_arg(1), aml_name("REVS")));
         aml_append(method, aml_store(aml_arg(2), aml_name("FUNC")));
 
+        /* Arg3 is passed as Package and it has one element? */
+        ifctx = aml_if(aml_and(aml_equal(aml_object_type(aml_arg(3)),
+                                         aml_int(4)),
+                               aml_equal(aml_sizeof(aml_arg(3)),
+                                         aml_int(1))));
+        {
+            /* Local0 = Index(Arg3, 0) */
+            aml_append(ifctx, aml_store(aml_index(aml_arg(3), aml_int(0)),
+                                        aml_local(0)));
+            /* Local3 = DeRefOf(Local0) */
+            aml_append(ifctx, aml_store(aml_derefof(aml_local(0)),
+                                        aml_local(3)));
+            /* ARG3 = Local3 */
+            aml_append(ifctx, aml_store(aml_local(3), aml_name("ARG3")));
+        }
+        aml_append(method, ifctx);
+
         aml_append(method, aml_store(aml_int(NOTIFY_VALUE), aml_name("NOTI")));
 
         aml_append(method, aml_store(aml_name("RLEN"), aml_local(6)));
-- 
1.8.3.1