[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 50/51] ipmi: add some local variables in ipmi_sdr_
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL v2 50/51] ipmi: add some local variables in ipmi_sdr_init |
Date: |
Tue, 15 Mar 2016 17:03:18 +0200 |
From: Cédric Le Goater <address@hidden>
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 <address@hidden>
Acked-by: Corey Minyard <address@hidden>
Reviewed-by: Marcel Apfelbaum <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
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 9176f8a..dc9c14c 100644
--- a/hw/ipmi/ipmi_bmc_sim.c
+++ b/hw/ipmi/ipmi_bmc_sim.c
@@ -1683,7 +1683,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,
@@ -1696,17 +1696,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;
}
--
MST
- [Qemu-devel] [PULL v2 41/51] MAINTAINERS: Add an entry for virtio header files, (continued)
- [Qemu-devel] [PULL v2 41/51] MAINTAINERS: Add an entry for virtio header files, Michael S. Tsirkin, 2016/03/15
- [Qemu-devel] [PULL v2 40/51] pc: acpi: clarify why possible LAPIC entries must be present in MADT, Michael S. Tsirkin, 2016/03/15
- [Qemu-devel] [PULL v2 42/51] MAINTAINERS: machine core, Michael S. Tsirkin, 2016/03/15
- [Qemu-devel] [PULL v2 43/51] ipmi: remove IPMI_CHECK_CMD_LEN() macro, Michael S. Tsirkin, 2016/03/15
- [Qemu-devel] [PULL v2 45/51] ipmi: remove IPMI_CHECK_RESERVATION() macro, Michael S. Tsirkin, 2016/03/15
- [Qemu-devel] [PULL v2 47/51] ipmi: add a realize function to the device class, Michael S. Tsirkin, 2016/03/15
- [Qemu-devel] [PULL v2 44/51] ipmi: replace IPMI_ADD_RSP_DATA() macro with inline helpers, Michael S. Tsirkin, 2016/03/15
- [Qemu-devel] [PULL v2 46/51] ipmi: add rsp_buffer_set_error() helper, Michael S. Tsirkin, 2016/03/15
- [Qemu-devel] [PULL v2 48/51] ipmi: use a function to initialize the SDR table, Michael S. Tsirkin, 2016/03/15
- [Qemu-devel] [PULL v2 49/51] ipmi: remove the need of an ending record in the SDR table, Michael S. Tsirkin, 2016/03/15
- [Qemu-devel] [PULL v2 50/51] ipmi: add some local variables in ipmi_sdr_init,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL v2 51/51] hw/acpi: fix GSI links UID, Michael S. Tsirkin, 2016/03/15
- Re: [Qemu-devel] [PULL v2 00/51] vhost, virtio, pci, pc, acpi, Peter Maydell, 2016/03/15