From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45561) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aT7Ax-0008Js-Ll for qemu-devel@nongnu.org; Tue, 09 Feb 2016 07:13:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aT7At-0003su-I3 for qemu-devel@nongnu.org; Tue, 09 Feb 2016 07:13:47 -0500 Received: from e06smtp15.uk.ibm.com ([195.75.94.111]:38948) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aT7At-0003sM-7H for qemu-devel@nongnu.org; Tue, 09 Feb 2016 07:13:43 -0500 Received: from localhost by e06smtp15.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 9 Feb 2016 12:13:42 -0000 Received: from b06cxnps3074.portsmouth.uk.ibm.com (d06relay09.portsmouth.uk.ibm.com [9.149.109.194]) by d06dlp02.portsmouth.uk.ibm.com (Postfix) with ESMTP id 2D6F42190046 for ; Tue, 9 Feb 2016 12:13:26 +0000 (GMT) Received: from d06av02.portsmouth.uk.ibm.com (d06av02.portsmouth.uk.ibm.com [9.149.37.228]) by b06cxnps3074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u19CDe2V16580648 for ; Tue, 9 Feb 2016 12:13:40 GMT Received: from d06av02.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av02.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u19CDdUT006339 for ; Tue, 9 Feb 2016 05:13:39 -0700 From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Date: Tue, 9 Feb 2016 13:13:26 +0100 Message-Id: <1455020010-17532-5-git-send-email-clg@fr.ibm.com> In-Reply-To: <1455020010-17532-1-git-send-email-clg@fr.ibm.com> References: <1455020010-17532-1-git-send-email-clg@fr.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH 4/8] ipmi: add some local variables in ipmi_sdr_init List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Corey Minyard Cc: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Greg Kurz , qemu-devel@nongnu.org, "Michael S. Tsirkin" 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édric Le Goater --- 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 f219bfc7a2f3..aff818cf22ab 100644 --- a/hw/ipmi/ipmi_bmc_sim.c +++ b/hw/ipmi/ipmi_bmc_sim.c @@ -1692,7 +1692,7 @@ static void register_cmds(IPMIBmcSim *s) ipmi_register_netfn(s, IPMI_NETFN_STORAGE, &storage_netfn); } -static const uint8_t init_sdrs[] = { +static uint8_t init_sdrs[] = { /* Watchdog device */ 0x00, 0x00, 0x51, 0x02, 35, 0x20, 0x00, 0x00, 0x23, 0x01, 0x63, 0x00, 0x23, 0x6f, 0x0f, 0x01, @@ -1705,17 +1705,22 @@ static void ipmi_sdr_init(IPMIBmcSim *ibs) { unsigned int i; int len; + size_t sdrs_size; + uint8_t *sdrs; - for (i = 0; i < sizeof(init_sdrs); i += len) { + 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) > sizeof(init_sdrs)) { + if (i + IPMI_SDR_HEADER_SIZE > sdrs_size) { error_report("Problem with recid 0x%4.4x", i); return; } - sdrh = (struct ipmi_sdr_header *) &init_sdrs[i]; + sdrh = (struct ipmi_sdr_header *) &sdrs[i]; len = 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; } -- 2.1.4