From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50092) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ab3oZ-0008Er-6D for qemu-devel@nongnu.org; Wed, 02 Mar 2016 05:15:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ab3oV-0005sZ-Qv for qemu-devel@nongnu.org; Wed, 02 Mar 2016 05:15:31 -0500 Received: from e06smtp13.uk.ibm.com ([195.75.94.109]:49225) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ab3oV-0005s1-I5 for qemu-devel@nongnu.org; Wed, 02 Mar 2016 05:15:27 -0500 Received: from localhost by e06smtp13.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 2 Mar 2016 10:15:26 -0000 Received: from b06cxnps3075.portsmouth.uk.ibm.com (d06relay10.portsmouth.uk.ibm.com [9.149.109.195]) by d06dlp02.portsmouth.uk.ibm.com (Postfix) with ESMTP id 7785D219005C for ; Wed, 2 Mar 2016 10:15:06 +0000 (GMT) Received: from d06av10.portsmouth.uk.ibm.com (d06av10.portsmouth.uk.ibm.com [9.149.37.251]) by b06cxnps3075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u22AFMBO53805056 for ; Wed, 2 Mar 2016 10:15:22 GMT Received: from d06av10.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av10.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u229FHHL010127 for ; Wed, 2 Mar 2016 02:15:17 -0700 From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Date: Wed, 2 Mar 2016 11:14:55 +0100 Message-Id: <1456913698-11452-8-git-send-email-clg@fr.ibm.com> In-Reply-To: <1456913698-11452-1-git-send-email-clg@fr.ibm.com> References: <1456913698-11452-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 v2 07/10] ipmi: remove the need of an ending record in the SDR table List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Corey Minyard Cc: Marcel Apfelbaum , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , qemu-devel@nongnu.org, "Michael S. Tsirkin" 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 Acked-by: Corey Minyard Reviewed-by: Marcel Apfelbaum --- 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 1556332b9f5d..522cafa0ab4d 100644 --- a/hw/ipmi/ipmi_bmc_sim.c +++ b/hw/ipmi/ipmi_bmc_sim.c @@ -1674,34 +1674,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) { 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; } } -- 2.1.4