[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 49/53] ipmi: remove the need of an ending record in t
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 49/53] ipmi: remove the need of an ending record in the SDR table |
Date: |
Fri, 11 Mar 2016 17:10:27 +0200 |
From: Cédric Le Goater <address@hidden>
Currently, the code initializing the sdr table relies on an ending
record with a recid of 0xffff. This patch changes the loop to use the
sdr size as a breaking condition.
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 | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/hw/ipmi/ipmi_bmc_sim.c b/hw/ipmi/ipmi_bmc_sim.c
index 0d4d748..9176f8a 100644
--- a/hw/ipmi/ipmi_bmc_sim.c
+++ b/hw/ipmi/ipmi_bmc_sim.c
@@ -1690,34 +1690,27 @@ static const uint8_t init_sdrs[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc8,
'W', 'a', 't', 'c', 'h', 'd', 'o', 'g',
- /* End */
- 0xff, 0xff, 0x00, 0x00, 0x00
};
static void ipmi_sdr_init(IPMIBmcSim *ibs)
{
unsigned int i;
- unsigned int recid;
+ int len;
- for (i = 0;;) {
+ for (i = 0; i < sizeof(init_sdrs); i += len) {
struct ipmi_sdr_header *sdrh;
- int len;
+
if ((i + IPMI_SDR_HEADER_SIZE) > sizeof(init_sdrs)) {
error_report("Problem with recid 0x%4.4x", i);
return;
}
sdrh = (struct ipmi_sdr_header *) &init_sdrs[i];
len = ipmi_sdr_length(sdrh);
- recid = ipmi_sdr_recid(sdrh);
- if (recid == 0xffff) {
- break;
- }
if ((i + len) > sizeof(init_sdrs)) {
error_report("Problem with recid 0x%4.4x", i);
return;
}
sdr_add_entry(ibs, sdrh, len, NULL);
- i += len;
}
}
--
MST
- [Qemu-devel] [PULL 39/53] pc: acpi: drop cpu->found_cpus bitmap, (continued)
- [Qemu-devel] [PULL 39/53] pc: acpi: drop cpu->found_cpus bitmap, Michael S. Tsirkin, 2016/03/11
- [Qemu-devel] [PULL 40/53] pc: acpi: clarify why possible LAPIC entries must be present in MADT, Michael S. Tsirkin, 2016/03/11
- [Qemu-devel] [PULL 41/53] MAINTAINERS: Add an entry for virtio header files, Michael S. Tsirkin, 2016/03/11
- [Qemu-devel] [PULL 42/53] MAINTAINERS: machine core, Michael S. Tsirkin, 2016/03/11
- [Qemu-devel] [PULL 43/53] ipmi: remove IPMI_CHECK_CMD_LEN() macro, Michael S. Tsirkin, 2016/03/11
- [Qemu-devel] [PULL 44/53] ipmi: replace IPMI_ADD_RSP_DATA() macro with inline helpers, Michael S. Tsirkin, 2016/03/11
- [Qemu-devel] [PULL 45/53] ipmi: remove IPMI_CHECK_RESERVATION() macro, Michael S. Tsirkin, 2016/03/11
- [Qemu-devel] [PULL 46/53] ipmi: add rsp_buffer_set_error() helper, Michael S. Tsirkin, 2016/03/11
- [Qemu-devel] [PULL 48/53] ipmi: use a function to initialize the SDR table, Michael S. Tsirkin, 2016/03/11
- [Qemu-devel] [PULL 47/53] ipmi: add a realize function to the device class, Michael S. Tsirkin, 2016/03/11
- [Qemu-devel] [PULL 49/53] ipmi: remove the need of an ending record in the SDR table,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 50/53] ipmi: add some local variables in ipmi_sdr_init, Michael S. Tsirkin, 2016/03/11
- [Qemu-devel] [PULL 51/53] ipmi: use a file to load SDRs, Michael S. Tsirkin, 2016/03/11
- [Qemu-devel] [PULL 52/53] ipmi: provide support for FRUs, Michael S. Tsirkin, 2016/03/11
- [Qemu-devel] [PULL 53/53] fw-cfg: support writeable blobs, Michael S. Tsirkin, 2016/03/11
- Re: [Qemu-devel] [PULL 00/53] vhost, virtio, pci, pc, acpi, Peter Maydell, 2016/03/14