From: "Cédric Le Goater" <clg@fr.ibm.com>
To: Corey Minyard <cminyard@mvista.com>
Cc: "Cédric Le Goater" <clg@fr.ibm.com>,
"Greg Kurz" <gkurz@linux.vnet.ibm.com>,
qemu-devel@nongnu.org, "Michael S. Tsirkin" <mst@redhat.com>
Subject: [Qemu-devel] [PATCH 4/8] ipmi: add some local variables in ipmi_sdr_init
Date: Tue, 9 Feb 2016 13:13:26 +0100 [thread overview]
Message-ID: <1455020010-17532-5-git-send-email-clg@fr.ibm.com> (raw)
In-Reply-To: <1455020010-17532-1-git-send-email-clg@fr.ibm.com>
This patch adds a couple of variables to manipulate the raw sdr
entries. The const attribute is also removed on init_sdrs. This will
ease the introduction of a sdr loader using a file.
Signed-off-by: Cédric Le Goater <clg@fr.ibm.com>
---
hw/ipmi/ipmi_bmc_sim.c | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/hw/ipmi/ipmi_bmc_sim.c b/hw/ipmi/ipmi_bmc_sim.c
index f219bfc7a2f3..aff818cf22ab 100644
--- a/hw/ipmi/ipmi_bmc_sim.c
+++ b/hw/ipmi/ipmi_bmc_sim.c
@@ -1692,7 +1692,7 @@ static void register_cmds(IPMIBmcSim *s)
ipmi_register_netfn(s, IPMI_NETFN_STORAGE, &storage_netfn);
}
-static const uint8_t init_sdrs[] = {
+static uint8_t init_sdrs[] = {
/* Watchdog device */
0x00, 0x00, 0x51, 0x02, 35, 0x20, 0x00, 0x00,
0x23, 0x01, 0x63, 0x00, 0x23, 0x6f, 0x0f, 0x01,
@@ -1705,17 +1705,22 @@ static void ipmi_sdr_init(IPMIBmcSim *ibs)
{
unsigned int i;
int len;
+ size_t sdrs_size;
+ uint8_t *sdrs;
- for (i = 0; i < sizeof(init_sdrs); i += len) {
+ sdrs_size = sizeof(init_sdrs);
+ sdrs = init_sdrs;
+
+ for (i = 0; i < sdrs_size; i += len) {
struct ipmi_sdr_header *sdrh;
- if ((i + IPMI_SDR_HEADER_SIZE) > sizeof(init_sdrs)) {
+ if (i + IPMI_SDR_HEADER_SIZE > sdrs_size) {
error_report("Problem with recid 0x%4.4x", i);
return;
}
- sdrh = (struct ipmi_sdr_header *) &init_sdrs[i];
+ sdrh = (struct ipmi_sdr_header *) &sdrs[i];
len = ipmi_sdr_length(sdrh);
- if ((i + len) > sizeof(init_sdrs)) {
+ if (i + len > sdrs_size) {
error_report("Problem with recid 0x%4.4x", i);
return;
}
--
2.1.4
next prev parent reply other threads:[~2016-02-09 12:13 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-09 12:13 [Qemu-devel] [PATCH 0/8] ipmi: a couple of enhancements to the BMC simulator (round 2) Cédric Le Goater
2016-02-09 12:13 ` [Qemu-devel] [PATCH 1/8] ipmi: add a realize function to the device class Cédric Le Goater
2016-02-14 8:22 ` Marcel Apfelbaum
2016-02-09 12:13 ` [Qemu-devel] [PATCH 2/8] ipmi: use a function to initialize the SDR table Cédric Le Goater
2016-02-14 8:31 ` Marcel Apfelbaum
2016-02-15 16:52 ` Cédric Le Goater
2016-02-09 12:13 ` [Qemu-devel] [PATCH 3/8] ipmi: remove the need of an ending record in " Cédric Le Goater
2016-02-14 8:39 ` Marcel Apfelbaum
2016-02-09 12:13 ` Cédric Le Goater [this message]
2016-02-14 8:55 ` [Qemu-devel] [PATCH 4/8] ipmi: add some local variables in ipmi_sdr_init Marcel Apfelbaum
2016-02-15 16:54 ` Cédric Le Goater
2016-02-09 12:13 ` [Qemu-devel] [PATCH 5/8] ipmi: use a file to load SDRs Cédric Le Goater
2016-02-14 9:08 ` Marcel Apfelbaum
2016-02-15 17:02 ` Cédric Le Goater
2016-02-09 12:13 ` [Qemu-devel] [PATCH 6/8] ipmi: provide support for FRUs Cédric Le Goater
2016-02-14 9:25 ` Marcel Apfelbaum
2016-02-15 17:17 ` Cédric Le Goater
2016-02-15 18:40 ` Marcel Apfelbaum
2016-02-16 3:38 ` Corey Minyard
2016-02-16 8:47 ` Cédric Le Goater
2016-02-09 12:13 ` [Qemu-devel] [PATCH 7/8] ipmi: introduce an ipmi_bmc_sdr_find() API Cédric Le Goater
2016-02-14 9:30 ` Marcel Apfelbaum
2016-02-15 17:21 ` Cédric Le Goater
2016-02-09 12:13 ` [Qemu-devel] [PATCH 8/8] ipmi: introduce an ipmi_bmc_gen_event() API Cédric Le Goater
2016-02-14 9:32 ` Marcel Apfelbaum
2016-02-09 18:25 ` [Qemu-devel] [PATCH 0/8] ipmi: a couple of enhancements to the BMC simulator (round 2) Corey Minyard
2016-02-10 14:05 ` Cédric Le Goater
2016-02-10 16:06 ` Corey Minyard
2016-02-10 16:13 ` Cédric Le Goater
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=1455020010-17532-5-git-send-email-clg@fr.ibm.com \
--to=clg@fr.ibm.com \
--cc=cminyard@mvista.com \
--cc=gkurz@linux.vnet.ibm.com \
--cc=mst@redhat.com \
--cc=qemu-devel@nongnu.org \
/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).