From patchwork Thu Dec 7 21:30:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Corey Minyard X-Patchwork-Id: 121083 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp8890190qgn; Thu, 7 Dec 2017 13:36:10 -0800 (PST) X-Google-Smtp-Source: AGs4zMakHo3h+1WYsrwb0fJ2FTeq0mbeGvL6IVYjA4baOiuyMVMD/U8hQap4JK32YMUF3utmOhOg X-Received: by 10.37.93.15 with SMTP id r15mr18981535ybb.12.1512682570803; Thu, 07 Dec 2017 13:36:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512682570; cv=none; d=google.com; s=arc-20160816; b=IaVVFNGbLCV8AAn9+qORfkxseBluyLH8uG+xomqvlGOG+UNOKhLGMWsosAlzIUEQk7 NUkQcT+YEkhv/uB+O1mzAVY1dxz2PpBTgR8jT6fNVtxSCbxFQbHxS6I0WPi+hTUXaVMQ u/szK8ca1yVbdS4pwK5YB9BhlTWT630AA2ssWmCRmRSJYfTR+YpggWyPlseJQEm78cIl 4TYBI+b6onu7UHaMapWO1BZ5NzhGR2m/uI4F9J5w4bxChxPbd5JXFtSYKKCBVhNiW/Yc j5VeNRYmq6wHU26XdwxxlgWtHyR9Nz76P51Q5W7N5rxnx8+Muq2RAClrtl6/jA6pGXNA cD0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=903jbIjY5CaeOB9ZbI4Pqip2txlVQbIiiI0khfFZqp4=; b=YI0b0Bv3vYnDa+dxTmIjNIH2KXtjh1MhrI3K4TiihFJQgEHktYmCcZJKrAEDHauTYx OJep8TQ2WHP53aVZiIK2Ym2u81eaS6+VN4LC2B6XEJ4Jay7XW4jesdxg0AZf9SSGTDhX tPXOrz9LTkwz715OMEkwLOKRPQAmcD9/VZjtJzj1ej/WgZYfIKcAaCPz3dJMiLK86sTE s9UegKDmzVlx96C20dkWgLy45x2X09GikDHZhKfkKH3exWyg7JZ/F7pkXGfXvLwOa3ol KpmU+hKIO/+jVLjFUB1qpao63HLxJfXr12o6GHoR0SOT0iHkBclAUuCEW89EaqwV5mNM KqSQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=nfVah41b; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id l67si1375415ywf.739.2017.12.07.13.36.10 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 07 Dec 2017 13:36:10 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=nfVah41b; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org Received: from localhost ([::1]:34437 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eN3py-0002cj-AY for patch@linaro.org; Thu, 07 Dec 2017 16:36:10 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44964) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eN3kW-0005b5-Gk for qemu-devel@nongnu.org; Thu, 07 Dec 2017 16:30:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eN3kV-000206-Ik for qemu-devel@nongnu.org; Thu, 07 Dec 2017 16:30:32 -0500 Received: from mail-pf0-x244.google.com ([2607:f8b0:400e:c00::244]:35336) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eN3kV-0001zJ-8f for qemu-devel@nongnu.org; Thu, 07 Dec 2017 16:30:31 -0500 Received: by mail-pf0-x244.google.com with SMTP id j124so5646359pfc.2 for ; Thu, 07 Dec 2017 13:30:31 -0800 (PST) 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; bh=903jbIjY5CaeOB9ZbI4Pqip2txlVQbIiiI0khfFZqp4=; b=nfVah41bhE4v93sa+DLMSRTge5TO3ug8GNic/Y7xSHbfP9L4b61zn42xir0qjr30YP T/rg/6PDQTS3vUpg/hlHUCOjgUg4Csp+XqcQp++2NSlK6NqvoPoxLmXuYf5e5GXDCuQS K/i4hdAZqqPcAbzoSDirS9uJlrki0fmjUwVkQkG29WikjcDBHr2VPw9fOZ4O6LGypRUB Pnc3yJ9Hru4T7B94m/hlcl5bV1H6Uw5s/cB2heb+1JeiOZF2PZqKk+mlRwthprMcZ33n wouicj8avtTHxPASsWUVeC48Qvfzyj8l6/DcSpP82pxh7R0I5BmR/DZh6VvB4I4fQZqP rKFQ== 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; bh=903jbIjY5CaeOB9ZbI4Pqip2txlVQbIiiI0khfFZqp4=; b=mBWaA1d/Cv6aVAhjBL1C1rgEWs3xQ4T9/xeMVzuw+NUdb91dUmXZCrVGdvdYk17YyY cnxQWF59F1NBiMG9motLHNxLB4GKOFrNuR9rAWrCZ/RtJDPdK9efoxG/SZVQ54EJDc14 NAKNqwMGu/RMPlHPgDQpdUCiPKww1hX3qoPzxSa6Lhikc/JooGlV2H+KXEkRhAfbh7At hgk3ENkszUlcxJN5NKhnj2POGAQ+l4xtbWkge3F5/pTZYTPeNnDkvk7preelgbwXgdRF fPx1opprAHrZfRXd52+w0h3PoR0qMLiLM1WJsVZdJh/VuGuiRKlgs51KRdbn9to/VeJX AWPQ== X-Gm-Message-State: AJaThX62tipBedA3dfoEi3lO3RAgUJYzgfwuAmttyJWl9FB5oget0A0K 3FZyWGhGZFxA2sVUZn9YVA== X-Received: by 10.99.127.14 with SMTP id a14mr27842879pgd.315.1512682230211; Thu, 07 Dec 2017 13:30:30 -0800 (PST) Received: from serve.minyard.net (serve.minyard.net. [2001:470:b8f6:1b::1]) by smtp.gmail.com with ESMTPSA id j79sm10998802pfe.129.2017.12.07.13.30.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Dec 2017 13:30:26 -0800 (PST) Received: from t430.minyard.net (t430m.minyard.net [192.168.27.3]) by serve.minyard.net (Postfix) with ESMTPA id 71BA5EB7; Thu, 7 Dec 2017 15:30:21 -0600 (CST) Received: by t430.minyard.net (Postfix, from userid 1000) id 22C8B302367; Thu, 7 Dec 2017 15:30:18 -0600 (CST) From: minyard@acm.org To: qemu-devel@nongnu.org Date: Thu, 7 Dec 2017 15:30:12 -0600 Message-Id: <1512682213-4354-8-git-send-email-minyard@acm.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1512682213-4354-1-git-send-email-minyard@acm.org> References: <1512682213-4354-1-git-send-email-minyard@acm.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::244 Subject: [Qemu-devel] [PATCH 7/8] ipmi: Allow BMC device properties to be set 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 Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Corey Minyard Signed-off-by: Corey Minyard --- hw/ipmi/ipmi_bmc_sim.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) -- 2.7.4 Reviewed-by: Marc-André Lureau diff --git a/hw/ipmi/ipmi_bmc_sim.c b/hw/ipmi/ipmi_bmc_sim.c index e84d710..9b509f8 100644 --- a/hw/ipmi/ipmi_bmc_sim.c +++ b/hw/ipmi/ipmi_bmc_sim.c @@ -214,8 +214,8 @@ struct IPMIBmcSim { uint8_t device_rev; uint8_t fwrev1; uint8_t fwrev2; - uint8_t mfg_id[3]; - uint8_t product_id[2]; + uint32_t mfg_id; + uint16_t product_id; uint8_t restart_cause; @@ -867,11 +867,11 @@ static void get_device_id(IPMIBmcSim *ibs, rsp_buffer_push(rsp, ibs->fwrev2); rsp_buffer_push(rsp, ibs->ipmi_version); rsp_buffer_push(rsp, 0x07); /* sensor, SDR, and SEL. */ - rsp_buffer_push(rsp, ibs->mfg_id[0]); - rsp_buffer_push(rsp, ibs->mfg_id[1]); - rsp_buffer_push(rsp, ibs->mfg_id[2]); - rsp_buffer_push(rsp, ibs->product_id[0]); - rsp_buffer_push(rsp, ibs->product_id[1]); + rsp_buffer_push(rsp, ibs->mfg_id & 0xff); + rsp_buffer_push(rsp, (ibs->mfg_id >> 8) & 0xff); + rsp_buffer_push(rsp, (ibs->mfg_id >> 16) & 0xff); + rsp_buffer_push(rsp, ibs->product_id & 0xff); + rsp_buffer_push(rsp, (ibs->product_id >> 8) & 0xff); } static void set_global_enables(IPMIBmcSim *ibs, uint8_t val) @@ -1997,6 +1997,13 @@ static Property ipmi_sim_properties[] = { DEFINE_PROP_UINT16("fruareasize", IPMIBmcSim, fru.areasize, 1024), DEFINE_PROP_STRING("frudatafile", IPMIBmcSim, fru.filename), DEFINE_PROP_STRING("sdrfile", IPMIBmcSim, sdr_filename), + DEFINE_PROP_UINT8("device_id", IPMIBmcSim, device_id, 0x20), + DEFINE_PROP_UINT8("ipmi_version", IPMIBmcSim, ipmi_version, 0x02), + DEFINE_PROP_UINT8("device_rev", IPMIBmcSim, device_rev, 0), + DEFINE_PROP_UINT8("fwrev1", IPMIBmcSim, fwrev1, 0), + DEFINE_PROP_UINT8("fwrev2", IPMIBmcSim, fwrev2, 0), + DEFINE_PROP_UINT32("mfg_id", IPMIBmcSim, mfg_id, 0), + DEFINE_PROP_UINT16("product_id", IPMIBmcSim, product_id, 0), DEFINE_PROP_END_OF_LIST(), };