From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47643) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aVMPt-0000Ay-Fy for qemu-devel@nongnu.org; Mon, 15 Feb 2016 11:54:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aVMPo-0000AS-GA for qemu-devel@nongnu.org; Mon, 15 Feb 2016 11:54:29 -0500 Received: from e06smtp13.uk.ibm.com ([195.75.94.109]:37781) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aVMPo-0000AO-6Z for qemu-devel@nongnu.org; Mon, 15 Feb 2016 11:54:24 -0500 Received: from localhost by e06smtp13.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 15 Feb 2016 16:54:23 -0000 Received: from b06cxnps3074.portsmouth.uk.ibm.com (d06relay09.portsmouth.uk.ibm.com [9.149.109.194]) by d06dlp03.portsmouth.uk.ibm.com (Postfix) with ESMTP id 78EC41B0805F for ; Mon, 15 Feb 2016 16:54:35 +0000 (GMT) Received: from d06av04.portsmouth.uk.ibm.com (d06av04.portsmouth.uk.ibm.com [9.149.37.216]) by b06cxnps3074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u1FGsJrT13566126 for ; Mon, 15 Feb 2016 16:54:19 GMT Received: from d06av04.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av04.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u1FGsI40015752 for ; Mon, 15 Feb 2016 09:54:19 -0700 References: <1455020010-17532-1-git-send-email-clg@fr.ibm.com> <1455020010-17532-5-git-send-email-clg@fr.ibm.com> <56C040F7.1050505@gmail.com> From: =?UTF-8?Q?C=c3=a9dric_Le_Goater?= Message-ID: <56C202B8.1090606@fr.ibm.com> Date: Mon, 15 Feb 2016 17:54:16 +0100 MIME-Version: 1.0 In-Reply-To: <56C040F7.1050505@gmail.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Subject: Re: [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: marcel@redhat.com, Corey Minyard Cc: "Michael S. Tsirkin" , qemu-devel@nongnu.org, Greg Kurz On 02/14/2016 09:55 AM, Marcel Apfelbaum wrote: > On 02/09/2016 02:13 PM, Cédric Le Goater wrote: >> 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. > > Hi, > > You could remove the const attribute when you have to, anyway OK. I can do that in the next patch. Thanks, C. > > Reviewed-by: Marcel Apfelbaum > > Thanks, > Marcel > > >> >> 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; >> } >> > >