From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48519) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aUsDA-0005K3-WF for qemu-devel@nongnu.org; Sun, 14 Feb 2016 03:39:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aUsD7-0005GF-Q7 for qemu-devel@nongnu.org; Sun, 14 Feb 2016 03:39:20 -0500 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:34466) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aUsD7-0005Ft-J1 for qemu-devel@nongnu.org; Sun, 14 Feb 2016 03:39:17 -0500 Received: by mail-wm0-x242.google.com with SMTP id b205so3114472wmb.1 for ; Sun, 14 Feb 2016 00:39:17 -0800 (PST) References: <1455020010-17532-1-git-send-email-clg@fr.ibm.com> <1455020010-17532-4-git-send-email-clg@fr.ibm.com> From: Marcel Apfelbaum Message-ID: <56C03D32.2050002@gmail.com> Date: Sun, 14 Feb 2016 10:39:14 +0200 MIME-Version: 1.0 In-Reply-To: <1455020010-17532-4-git-send-email-clg@fr.ibm.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH 3/8] ipmi: remove the need of an ending record in the SDR table Reply-To: marcel@redhat.com List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?UTF-8?Q?C=c3=a9dric_Le_Goater?= , Corey Minyard Cc: "Michael S. Tsirkin" , qemu-devel@nongnu.org, Greg Kurz On 02/09/2016 02:13 PM, Cédric Le Goater wrote: > Currently, the code initializing the sdr table relies on an ending > record with a recid of 0xffff. This patch changes the loop to use the > sdr size as a breaking condition. > > Signed-off-by: Cédric Le Goater > --- > hw/ipmi/ipmi_bmc_sim.c | 13 +++---------- > 1 file changed, 3 insertions(+), 10 deletions(-) > > diff --git a/hw/ipmi/ipmi_bmc_sim.c b/hw/ipmi/ipmi_bmc_sim.c > index 0abc9cb5de94..f219bfc7a2f3 100644 > --- a/hw/ipmi/ipmi_bmc_sim.c > +++ b/hw/ipmi/ipmi_bmc_sim.c > @@ -1699,34 +1699,27 @@ static const uint8_t init_sdrs[] = { > 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, > 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc8, > 'W', 'a', 't', 'c', 'h', 'd', 'o', 'g', > - /* End */ > - 0xff, 0xff, 0x00, 0x00, 0x00 > }; > > static void ipmi_sdr_init(IPMIBmcSim *ibs) > { > unsigned int i; > - unsigned int recid; > + int len; > > - for (i = 0;;) { > + for (i = 0; i < sizeof(init_sdrs); i += len) { Hi, This is much better, maybe you can squash it into the previous patch, but I understand if you want to separate re-factoring and new code. Reviewed-by: Marcel Apfelbaum > struct ipmi_sdr_header *sdrh; > - int len; > + > if ((i + IPMI_SDR_HEADER_SIZE) > sizeof(init_sdrs)) { > error_report("Problem with recid 0x%4.4x", i); > return; > } > sdrh = (struct ipmi_sdr_header *) &init_sdrs[i]; > len = ipmi_sdr_length(sdrh); > - recid = ipmi_sdr_recid(sdrh); > - if (recid == 0xffff) { > - break; > - } > if ((i + len) > sizeof(init_sdrs)) { > error_report("Problem with recid 0x%4.4x", i); > return; > } > sdr_add_entry(ibs, sdrh, len, NULL); > - i += len; > } > } > >