From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58823) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1afqVM-0003PL-4d for qemu-devel@nongnu.org; Tue, 15 Mar 2016 11:03:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1afqVG-0007VV-8L for qemu-devel@nongnu.org; Tue, 15 Mar 2016 11:03:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55197) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1afqVG-0007VP-3M for qemu-devel@nongnu.org; Tue, 15 Mar 2016 11:03:22 -0400 Date: Tue, 15 Mar 2016 17:03:18 +0200 From: "Michael S. Tsirkin" Message-ID: <1458053975-2410-51-git-send-email-mst@redhat.com> References: <1458053975-2410-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <1458053975-2410-1-git-send-email-mst@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL v2 50/51] ipmi: add some local variables in ipmi_sdr_init List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Eduardo Habkost , Corey Minyard , =?us-ascii?B?PT9VVEYtOD9xP0M9QzM9QTlkcmljPTIwTGU9MjBHb2F0ZXI/PQ==?= , Marcel Apfelbaum , Greg Kurz From: C=E9dric Le Goater 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=E9dric Le Goater Acked-by: Corey Minyard Reviewed-by: Marcel Apfelbaum Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- 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); } =20 -static const uint8_t init_sdrs[] =3D { +static uint8_t init_sdrs[] =3D { /* 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; =20 - for (i =3D 0; i < sizeof(init_sdrs); i +=3D len) { + sdrs_size =3D sizeof(init_sdrs); + sdrs =3D init_sdrs; + + for (i =3D 0; i < sdrs_size; i +=3D len) { struct ipmi_sdr_header *sdrh; =20 - 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 =3D (struct ipmi_sdr_header *) &init_sdrs[i]; + sdrh =3D (struct ipmi_sdr_header *) &sdrs[i]; len =3D 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; } --=20 MST