OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

ipmi: add some local variables in ipmi_sdr_init

Browse Source 
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>
Acked-by: Corey Minyard <cminyard@mvista.com>
Reviewed-by: Marcel Apfelbaum <marcel@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Cédric Le Goater 2016-03-10 15:04:01 +01:00 committed by Michael S. Tsirkin
parent 52fc01d973
commit 5167560b03
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hw/ipmi/ipmi_bmc_sim.c
View File

@ -1683,7 +1683,7 @@ static void register_cmds(IPMIBmcSim *s)
ipmi_register_netfn(s, IPMI_NETFN_STORAGE, &storage_netfn); ipmi_register_netfn(s, IPMI_NETFN_STORAGE, &storage_netfn);
} }
static const uint8_t init_sdrs[] = { static uint8_t init_sdrs[] = {
/* Watchdog device */ /* Watchdog device */
0x00, 0x00, 0x51, 0x02, 35, 0x20, 0x00, 0x00, 0x00, 0x00, 0x51, 0x02, 35, 0x20, 0x00, 0x00,
0x23, 0x01, 0x63, 0x00, 0x23, 0x6f, 0x0f, 0x01, 0x23, 0x01, 0x63, 0x00, 0x23, 0x6f, 0x0f, 0x01,
@ -1696,17 +1696,22 @@ static void ipmi_sdr_init(IPMIBmcSim *ibs)
{ {
unsigned int i; unsigned int i;
int len; 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; 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); error_report("Problem with recid 0x%4.4x", i);
return; return;
} }
sdrh = (struct ipmi_sdr_header *) &init_sdrs[i]; sdrh = (struct ipmi_sdr_header *) &sdrs[i];
len = ipmi_sdr_length(sdrh); 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); error_report("Problem with recid 0x%4.4x", i);
return; return;
} }