From: Xiao Guangrong <guangrong.xiao@linux.intel.com>
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 <guangrong.xiao@linux.intel.com>
Subject: [PATCH 5/8] acpi nvdimm: fix Arg6 usage
Date: Sat, 29 Oct 2016 00:11:53 +0800 [thread overview]
Message-ID: <1477671116-24079-6-git-send-email-guangrong.xiao@linux.intel.com> (raw)
In-Reply-To: <1477671116-24079-1-git-send-email-guangrong.xiao@linux.intel.com>
As the function only has 5 args, we use local7 instead of it
Suggested-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Xiao Guangrong <guangrong.xiao@linux.intel.com>
---
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);
}
--
1.8.3.1
next prev parent reply other threads:[~2016-10-28 16:27 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-28 16:11 [PATCH 0/8] nvdimm acpi: bug fix and cleanup Xiao Guangrong
2016-10-28 16:11 ` [PATCH 1/8] acpi nvdimm: fix wrong buffer size returned by DSM method Xiao Guangrong
2016-10-28 16:11 ` [PATCH 2/8] acpi nvdimm: fix device physical address base Xiao Guangrong
2016-10-28 16:11 ` [PATCH 3/8] acpi nvdimm: fix OperationRegion definition Xiao Guangrong
2016-10-28 16:11 ` [PATCH 4/8] acpi nvdimm: fix ARG3 conflict Xiao Guangrong
2016-10-28 16:11 ` Xiao Guangrong [this message]
2016-10-28 16:11 ` [PATCH 6/8] nvdimm acpi: compile nvdimm acpi code arch-independently Xiao Guangrong
2016-10-28 16:11 ` [PATCH 7/8] acpi nvdimm: rename result_size to dsm_out_buf_siz Xiao Guangrong
2016-10-28 16:11 ` [PATCH 8/8] nvdimm acpi: use common macros instead of magic names Xiao Guangrong
2016-11-01 14:50 ` Stefan Hajnoczi
2016-11-01 14:50 ` [PATCH 0/8] nvdimm acpi: bug fix and cleanup Stefan Hajnoczi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1477671116-24079-6-git-send-email-guangrong.xiao@linux.intel.com \
--to=guangrong.xiao@linux.intel.com \
--cc=dan.j.williams@intel.com \
--cc=ehabkost@redhat.com \
--cc=gleb@kernel.org \
--cc=imammedo@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=mst@redhat.com \
--cc=mtosatti@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=rth@twiddle.net \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).