diff mbox

[v3,09/10] ipmi: use a file to load SDRs

Message ID 1457618643-32310-10-git-send-email-clg@fr.ibm.com (mailing list archive)
State New, archived
Headers show

Commit Message

Cédric Le Goater March 10, 2016, 2:04 p.m. UTC 
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 <clg@fr.ibm.com>
Acked-by: Corey Minyard <cminyard@mvista.com>
Reviewed-by: Marcel Apfelbaum <marcel@redhat.com>
---

Changes since v1:

 - log an error if file does not exist.
 - change property name to 'sdrfile'
 - add documentation of new properties
 
 hw/ipmi/ipmi_bmc_sim.c |   23 +++++++++++++++++++++--
 qemu-options.hx        |   11 ++++++++++-
 2 files changed, 31 insertions(+), 3 deletions(-)

Comments

Michael S. Tsirkin March 15, 2016, 2:30 p.m. UTC | #1 
On Thu, Mar 10, 2016 at 03:04:02PM +0100, Cédric 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.
> 
> 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 <clg@fr.ibm.com>
> Acked-by: Corey Minyard <cminyard@mvista.com>
> Reviewed-by: Marcel Apfelbaum <marcel@redhat.com>

Same thing - I prefer deferring this until 2.7
as loading files needs to be done carefully.

> ---
> 
> Changes since v1:
> 
>  - log an error if file does not exist.
>  - change property name to 'sdrfile'
>  - add documentation of new properties
>  
>  hw/ipmi/ipmi_bmc_sim.c |   23 +++++++++++++++++++++--
>  qemu-options.hx        |   11 ++++++++++-
>  2 files changed, 31 insertions(+), 3 deletions(-)
> 
> Index: qemu-powernv.git/hw/ipmi/ipmi_bmc_sim.c
> ===================================================================
> --- 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"
>  
>  #define IPMI_NETFN_CHASSIS            0x00
>  
> @@ -213,6 +214,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];
> @@ -1701,22 +1703,33 @@ static void ipmi_sdr_init(IPMIBmcSim *ib
>  
>      sdrs_size = sizeof(init_sdrs);
>      sdrs = init_sdrs;
> +    if (ibs->sdr_filename &&
> +        !g_file_get_contents(ibs->sdr_filename, (gchar **) &sdrs, &sdrs_size,
> +                             NULL)) {
> +        error_report("failed to load sdr file '%s'", ibs->sdr_filename);
> +        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 = {
> @@ -1786,12 +1799,18 @@ static void ipmi_sim_realize(DeviceState
>      vmstate_register(NULL, 0, &vmstate_ipmi_sim, ibs);
>  }
>  
> +static Property ipmi_sim_properties[] = {
> +    DEFINE_PROP_STRING("sdrfile", IPMIBmcSim, sdr_filename),
> +    DEFINE_PROP_END_OF_LIST(),
> +};
> +
>  static void ipmi_sim_class_init(ObjectClass *oc, void *data)
>  {
>      DeviceClass *dc = DEVICE_CLASS(oc);
>      IPMIBmcClass *bk = IPMI_BMC_CLASS(oc);
>  
>      dc->realize = ipmi_sim_realize;
> +    dc->props = ipmi_sim_properties;
>      bk->handle_command = ipmi_sim_handle_command;
>  }
>  
> Index: qemu-powernv.git/qemu-options.hx
> ===================================================================
> --- 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}.
>  
>  Some drivers are:
> -@item -device ipmi-bmc-sim,id=@var{id}[,slave_addr=@var{val}]
> +@item -device ipmi-bmc-sim,id=@var{id}[,slave_addr=@var{val}][,sdrfile=@var{file}]
>  
>  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.
>  
> +@table @option
> +@item bmc=@var{id}
> +The BMC to connect to, one of ipmi-bmc-sim or ipmi-bmc-extern above.
> +@item slave_addr=@var{val}
> +Define slave address to use for the BMC.  The default is 0x20.
> +@item sdrfile=@var{file}
> +file containing raw Sensor Data Records (SDR) data.  The default is none.
> +@end table
> +
>  @item -device ipmi-bmc-extern,id=@var{id},chardev=@var{id}[,slave_addr=@var{val}]
>  
>  Add a connection to an external IPMI BMC simulator.  Instead of
diff mbox

Patch

Index: qemu-powernv.git/hw/ipmi/ipmi_bmc_sim.c
===================================================================
--- 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"
 
 #define IPMI_NETFN_CHASSIS            0x00
 
@@ -213,6 +214,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];
@@ -1701,22 +1703,33 @@  static void ipmi_sdr_init(IPMIBmcSim *ib
 
     sdrs_size = sizeof(init_sdrs);
     sdrs = init_sdrs;
+    if (ibs->sdr_filename &&
+        !g_file_get_contents(ibs->sdr_filename, (gchar **) &sdrs, &sdrs_size,
+                             NULL)) {
+        error_report("failed to load sdr file '%s'", ibs->sdr_filename);
+        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 = {
@@ -1786,12 +1799,18 @@  static void ipmi_sim_realize(DeviceState
     vmstate_register(NULL, 0, &vmstate_ipmi_sim, ibs);
 }
 
+static Property ipmi_sim_properties[] = {
+    DEFINE_PROP_STRING("sdrfile", IPMIBmcSim, sdr_filename),
+    DEFINE_PROP_END_OF_LIST(),
+};
+
 static void ipmi_sim_class_init(ObjectClass *oc, void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(oc);
     IPMIBmcClass *bk = IPMI_BMC_CLASS(oc);
 
     dc->realize = ipmi_sim_realize;
+    dc->props = ipmi_sim_properties;
     bk->handle_command = ipmi_sim_handle_command;
 }
 
Index: qemu-powernv.git/qemu-options.hx
===================================================================
--- 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}.
 
 Some drivers are:
-@item -device ipmi-bmc-sim,id=@var{id}[,slave_addr=@var{val}]
+@item -device ipmi-bmc-sim,id=@var{id}[,slave_addr=@var{val}][,sdrfile=@var{file}]
 
 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.
 
+@table @option
+@item bmc=@var{id}
+The BMC to connect to, one of ipmi-bmc-sim or ipmi-bmc-extern above.
+@item slave_addr=@var{val}
+Define slave address to use for the BMC.  The default is 0x20.
+@item sdrfile=@var{file}
+file containing raw Sensor Data Records (SDR) data.  The default is none.
+@end table
+
 @item -device ipmi-bmc-extern,id=@var{id},chardev=@var{id}[,slave_addr=@var{val}]
 
 Add a connection to an external IPMI BMC simulator.  Instead of