From patchwork Sun Aug 20 21:46:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Corey Minyard X-Patchwork-Id: 803804 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="BF0m1XnA"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xb9RL1N19z9t2R for ; Mon, 21 Aug 2017 07:47:55 +1000 (AEST) Received: from localhost ([::1]:35275 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1djY4V-0007GN-6K for incoming@patchwork.ozlabs.org; Sun, 20 Aug 2017 17:47:51 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44715) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1djY3e-0007Fc-8z for qemu-devel@nongnu.org; Sun, 20 Aug 2017 17:46:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1djY3b-0003qQ-Ae for qemu-devel@nongnu.org; Sun, 20 Aug 2017 17:46:58 -0400 Received: from mail-pg0-x244.google.com ([2607:f8b0:400e:c05::244]:33784) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1djY3b-0003po-56 for qemu-devel@nongnu.org; Sun, 20 Aug 2017 17:46:55 -0400 Received: by mail-pg0-x244.google.com with SMTP id n4so5970047pgn.0 for ; Sun, 20 Aug 2017 14:46:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xEV6SmV/vklWlR0FbWcQCRcVYfv2IMVPXqrDvll5yxI=; b=BF0m1XnA7UkFCelreNwiqaSOmgk/Mi+oNek0aPaBU+7zvJEJsyTeHSBNElN46aywi6 2vDtVjANzsPE2/HluPl9FdtvxUkdY6Ucv1I/GBLGjfrlvPYkWE+c0aumnbw5BpIEfrKD t2ro7ZhHF6SIgxIq1ZAzGq5S31gjh1thLmJTvKmWQ9oLEOrmWfgPIlz5xq6wyP8kunpH 3ovYnbhQGuWb8zyrOrVNZk23WC+yBVKLEGvtSz390bjgVQjKwI1b0CI+T/JaTx1PdpQF MI+eEKTZVRQ38rndZWVzI0wuXlavXjk3yLg23Os4hhLceRgbbbrEl6/5pRqb8Y0bBHtD p0jw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=xEV6SmV/vklWlR0FbWcQCRcVYfv2IMVPXqrDvll5yxI=; b=mzF1nLAi++AMa9j3rTrOFAa/dkDZScSYaa1GMQiQsQ4KMJueXFQ4yQmbi28v4+9Fzi ThEdfhabqrPSEXArL+uawTWduztHtS+VS0UZPrD8RhVvC0/7UOVglfZulToTsFxbFk3P 9BLaFIOEeYi3Rca7uTxq/ItrCvVfftS5NorZcHngww6r13YzmQtU6bqjyIOUdxCaJ2ft x0apT+3WqLt4FUXZTSIN6mtxypYJQwKI3Ft1tb0kZE8RfC+eyJMdb9SafCX/JNGRIgfB 0FeWQG943TurDMa9Mepg6LonFSAMlFq6DR0z38FRJPIG2/Nf3qxQK/vdOl3muzSH3/PP hoDA== X-Gm-Message-State: AHYfb5jITbpFokcWGvwBd9O92i8VM+VOIskjLbgW3OLvo368+UKVVy5T CWu72ARtgyIxrw== X-Received: by 10.99.170.3 with SMTP id e3mr14477773pgf.411.1503265612837; Sun, 20 Aug 2017 14:46:52 -0700 (PDT) Received: from serve.minyard.net ([47.184.154.34]) by smtp.gmail.com with ESMTPSA id 206sm19555197pfc.61.2017.08.20.14.46.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 20 Aug 2017 14:46:48 -0700 (PDT) Received: from t430.minyard.net (t430m.minyard.net [192.168.27.3]) by serve.minyard.net (Postfix) with ESMTPA id D5A3495D; Sun, 20 Aug 2017 16:46:46 -0500 (CDT) Received: by t430.minyard.net (Postfix, from userid 1000) id 661D8300080; Sun, 20 Aug 2017 16:46:45 -0500 (CDT) From: minyard@acm.org To: qemu-devel@nongnu.org Date: Sun, 20 Aug 2017 16:46:41 -0500 Message-Id: <1503265602-9349-3-git-send-email-minyard@acm.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1503265602-9349-1-git-send-email-minyard@acm.org> References: <1503265602-9349-1-git-send-email-minyard@acm.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c05::244 Subject: [Qemu-devel] [PATCH v2 2/3] ipmi: Don't set the timestamp on add events that don't have it X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Corey Minyard , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , David Gibson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Corey Minyard According to the spec, from section "32.3 OEM SEL Record - Type E0h-FFh", event types from 0x0e to 0xff do not have a timestamp. So don't set it when adding those types. This required putting the timestamp in a temporary buffer, since it's still required to set the last addition time. Signed-off-by: Corey Minyard Reviewed-by: Cédric Le Goater --- hw/ipmi/ipmi_bmc_sim.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/hw/ipmi/ipmi_bmc_sim.c b/hw/ipmi/ipmi_bmc_sim.c index cc068f2..a0bbfd5 100644 --- a/hw/ipmi/ipmi_bmc_sim.c +++ b/hw/ipmi/ipmi_bmc_sim.c @@ -443,16 +443,21 @@ static void sel_inc_reservation(IPMISel *sel) /* Returns 1 if the SEL is full and can't hold the event. */ static int sel_add_event(IPMIBmcSim *ibs, uint8_t *event) { + uint8_t ts[4]; + event[0] = 0xff; event[1] = 0xff; - set_timestamp(ibs, event + 3); + set_timestamp(ibs, ts); + if (event[2] < 0xe0) { /* Don't set timestamps for type 0xe0-0xff. */ + memcpy(event + 3, ts, 4); + } if (ibs->sel.next_free == MAX_SEL_SIZE) { ibs->sel.overflow = 1; return 1; } event[0] = ibs->sel.next_free & 0xff; event[1] = (ibs->sel.next_free >> 8) & 0xff; - memcpy(ibs->sel.last_addition, event + 3, 4); + memcpy(ibs->sel.last_addition, ts, 4); memcpy(ibs->sel.sel[ibs->sel.next_free], event, 16); ibs->sel.next_free++; sel_inc_reservation(&ibs->sel);