[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 5/8] ipmi: use a file to load SDRs
From: |
Cédric Le Goater |
Subject: |
[Qemu-devel] [PATCH 5/8] ipmi: use a file to load SDRs |
Date: |
Tue, 9 Feb 2016 13:13:27 +0100 |
The IPMI BMC simulator populates the sdr/sensor tables with a minimal
set of entries (Watchdog). But some qemu platforms might want to use
extra entries for their custom needs.
This patch modifies slighty the initializing routine to take into
account a larger set read from a file. The name of the file to use is
defined through a new 'sdr' property of the simulator device.
Signed-off-by: Cédric Le Goater <address@hidden>
---
hw/ipmi/ipmi_bmc_sim.c | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/hw/ipmi/ipmi_bmc_sim.c b/hw/ipmi/ipmi_bmc_sim.c
index aff818cf22ab..69318eb6b556 100644
--- a/hw/ipmi/ipmi_bmc_sim.c
+++ b/hw/ipmi/ipmi_bmc_sim.c
@@ -27,6 +27,7 @@
#include "qemu/timer.h"
#include "hw/ipmi/ipmi.h"
#include "qemu/error-report.h"
+#include "hw/loader.h"
#define IPMI_NETFN_CHASSIS 0x00
@@ -208,6 +209,7 @@ struct IPMIBmcSim {
IPMISel sel;
IPMISdr sdr;
IPMISensor sensors[MAX_SENSORS];
+ char *sdr_filename;
/* Odd netfns are for responses, so we only need the even ones. */
const IPMINetfn *netfns[MAX_NETFNS / 2];
@@ -1708,24 +1710,32 @@ static void ipmi_sdr_init(IPMIBmcSim *ibs)
size_t sdrs_size;
uint8_t *sdrs;
- sdrs_size = sizeof(init_sdrs);
- sdrs = init_sdrs;
+ if (!ibs->sdr_filename ||
+ !g_file_get_contents(ibs->sdr_filename, (gchar **) &sdrs, &sdrs_size,
+ NULL)) {
+ 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 > sdrs_size) {
error_report("Problem with recid 0x%4.4x", i);
- return;
+ break;
}
sdrh = (struct ipmi_sdr_header *) &sdrs[i];
len = ipmi_sdr_length(sdrh);
if (i + len > sdrs_size) {
error_report("Problem with recid 0x%4.4x", i);
- return;
+ break;
}
sdr_add_entry(ibs, sdrh, len, NULL);
}
+
+ if (sdrs != init_sdrs) {
+ g_free(sdrs);
+ }
}
static const VMStateDescription vmstate_ipmi_sim = {
@@ -1796,6 +1806,7 @@ static void ipmi_sim_realize(DeviceState *dev, Error
**errp)
}
static Property ipmi_sim_properties[] = {
+ DEFINE_PROP_STRING("sdr", IPMIBmcSim, sdr_filename),
DEFINE_PROP_END_OF_LIST(),
};
--
2.1.4
- Re: [Qemu-devel] [PATCH 2/8] ipmi: use a function to initialize the SDR table, (continued)
- [Qemu-devel] [PATCH 6/8] ipmi: provide support for FRUs, Cédric Le Goater, 2016/02/09
- [Qemu-devel] [PATCH 7/8] ipmi: introduce an ipmi_bmc_sdr_find() API, Cédric Le Goater, 2016/02/09
- [Qemu-devel] [PATCH 4/8] ipmi: add some local variables in ipmi_sdr_init, Cédric Le Goater, 2016/02/09
- [Qemu-devel] [PATCH 8/8] ipmi: introduce an ipmi_bmc_gen_event() API, Cédric Le Goater, 2016/02/09
- [Qemu-devel] [PATCH 5/8] ipmi: use a file to load SDRs,
Cédric Le Goater <=
- Re: [Qemu-devel] [PATCH 0/8] ipmi: a couple of enhancements to the BMC simulator (round 2), Corey Minyard, 2016/02/09