From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48389) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1afpzs-0001N4-8L for qemu-devel@nongnu.org; Tue, 15 Mar 2016 10:31:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1afpzo-0005QT-3a for qemu-devel@nongnu.org; Tue, 15 Mar 2016 10:30:56 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34408) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1afpzn-0005QL-Kk for qemu-devel@nongnu.org; Tue, 15 Mar 2016 10:30:51 -0400 Date: Tue, 15 Mar 2016 16:30:48 +0200 From: "Michael S. Tsirkin" Message-ID: <20160315163016-mutt-send-email-mst@redhat.com> References: <1457618643-32310-1-git-send-email-clg@fr.ibm.com> <1457618643-32310-10-git-send-email-clg@fr.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <1457618643-32310-10-git-send-email-clg@fr.ibm.com> Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v3 09/10] ipmi: use a file to load SDRs List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?iso-8859-1?Q?C=E9dric?= Le Goater Cc: Marcel Apfelbaum , Corey Minyard , qemu-devel@nongnu.org On Thu, Mar 10, 2016 at 03:04:02PM +0100, C=E9dric Le Goater wrote: > 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. >=20 > 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. >=20 > Signed-off-by: C=E9dric Le Goater > Acked-by: Corey Minyard > Reviewed-by: Marcel Apfelbaum Same thing - I prefer deferring this until 2.7 as loading files needs to be done carefully. > --- >=20 > Changes since v1: >=20 > - log an error if file does not exist. > - change property name to 'sdrfile' > - add documentation of new properties > =20 > hw/ipmi/ipmi_bmc_sim.c | 23 +++++++++++++++++++++-- > qemu-options.hx | 11 ++++++++++- > 2 files changed, 31 insertions(+), 3 deletions(-) >=20 > Index: qemu-powernv.git/hw/ipmi/ipmi_bmc_sim.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > --- qemu-powernv.git.orig/hw/ipmi/ipmi_bmc_sim.c > +++ qemu-powernv.git/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" > =20 > #define IPMI_NETFN_CHASSIS 0x00 > =20 > @@ -213,6 +214,7 @@ struct IPMIBmcSim { > IPMISel sel; > IPMISdr sdr; > IPMISensor sensors[MAX_SENSORS]; > + char *sdr_filename; > =20 > /* Odd netfns are for responses, so we only need the even ones. */ > const IPMINetfn *netfns[MAX_NETFNS / 2]; > @@ -1701,22 +1703,33 @@ static void ipmi_sdr_init(IPMIBmcSim *ib > =20 > sdrs_size =3D sizeof(init_sdrs); > sdrs =3D init_sdrs; > + if (ibs->sdr_filename && > + !g_file_get_contents(ibs->sdr_filename, (gchar **) &sdrs, &sdr= s_size, > + NULL)) { > + error_report("failed to load sdr file '%s'", ibs->sdr_filename= ); > + sdrs_size =3D sizeof(init_sdrs); > + sdrs =3D init_sdrs; > + } > =20 > for (i =3D 0; i < sdrs_size; i +=3D len) { > struct ipmi_sdr_header *sdrh; > =20 > if (i + IPMI_SDR_HEADER_SIZE > sdrs_size) { > error_report("Problem with recid 0x%4.4x", i); > - return; > + break; > } > sdrh =3D (struct ipmi_sdr_header *) &sdrs[i]; > len =3D 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 !=3D init_sdrs) { > + g_free(sdrs); > + } > } > =20 > static const VMStateDescription vmstate_ipmi_sim =3D { > @@ -1786,12 +1799,18 @@ static void ipmi_sim_realize(DeviceState > vmstate_register(NULL, 0, &vmstate_ipmi_sim, ibs); > } > =20 > +static Property ipmi_sim_properties[] =3D { > + DEFINE_PROP_STRING("sdrfile", IPMIBmcSim, sdr_filename), > + DEFINE_PROP_END_OF_LIST(), > +}; > + > static void ipmi_sim_class_init(ObjectClass *oc, void *data) > { > DeviceClass *dc =3D DEVICE_CLASS(oc); > IPMIBmcClass *bk =3D IPMI_BMC_CLASS(oc); > =20 > dc->realize =3D ipmi_sim_realize; > + dc->props =3D ipmi_sim_properties; > bk->handle_command =3D ipmi_sim_handle_command; > } > =20 > Index: qemu-powernv.git/qemu-options.hx > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > --- qemu-powernv.git.orig/qemu-options.hx > +++ qemu-powernv.git/qemu-options.hx > @@ -387,7 +387,7 @@ possible drivers and properties, use @co > @code{-device @var{driver},help}. > =20 > Some drivers are: > -@item -device ipmi-bmc-sim,id=3D@var{id}[,slave_addr=3D@var{val}] > +@item -device ipmi-bmc-sim,id=3D@var{id}[,slave_addr=3D@var{val}][,sdr= file=3D@var{file}] > =20 > Add an IPMI BMC. This is a simulation of a hardware management > interface processor that normally sits on a system. It provides > @@ -399,6 +399,15 @@ This address is the BMC's address on the > controllers. If you don't know what this means, it is safe to ignore > it. > =20 > +@table @option > +@item bmc=3D@var{id} > +The BMC to connect to, one of ipmi-bmc-sim or ipmi-bmc-extern above. > +@item slave_addr=3D@var{val} > +Define slave address to use for the BMC. The default is 0x20. > +@item sdrfile=3D@var{file} > +file containing raw Sensor Data Records (SDR) data. The default is no= ne. > +@end table > + > @item -device ipmi-bmc-extern,id=3D@var{id},chardev=3D@var{id}[,slave_= addr=3D@var{val}] > =20 > Add a connection to an external IPMI BMC simulator. Instead of