From patchwork Thu Feb 1 18:52:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Corey Minyard X-Patchwork-Id: 126585 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp1979522ljc; Thu, 1 Feb 2018 11:01:44 -0800 (PST) X-Google-Smtp-Source: AH8x226ezc39HInvEHgcRmEaBsu6XOcfl5ochiIUJ+psUfpC8LL4Dm1bauPrN6B+ztgX2OS02pyY X-Received: by 10.37.4.10 with SMTP id 10mr26341460ybe.473.1517511704376; Thu, 01 Feb 2018 11:01:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517511704; cv=none; d=google.com; s=arc-20160816; b=jRPn03rbUf+ZggnylHXHvOtHUWrOIH0zD3GebQBIS3HQ8jmTkGQYcyHMkx71FBf8uE JBy+RrbczqfHtOUQ/VYd3KT+71Oc8RGCj9JCP2P8hr+Ii+14SnL/eolVajPJAk+fc33y ZQo5K0ViTgANUdQYt5aPMtIbj/dpXvM2fsQvVZ3DvUk0QHJN7eaDv/Zh6Rb7+guvJm5c wJFdasm4T+q0+XCVBK3Xwgv5kieOCJfoMJ0L6XFXxJLYCMA34GVb4fuqaimZm9HOMmCk bB/F9KuGUthZobYluYRq0zzdRy/XKNzCEBrvk15WSgpi9GR/UusTh/j8ZmnB4olM8qCk /2RQ== 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 :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=CCFIuAhcQclemmYhM3440tGVuHoL7wK3dFqdoYOcAXg=; b=ozhgzJ4CYzwE1CzKwVlRcTTUoGyVak81fQBri4gjR/Igsxd7Dy/FYkmRp50UG8OkIF UgF5exwpxNTW6mAdXtW4Hwyq3Vokoj2I4D7JZIL9qwt26hoaQGR7Hi38sPBojzLESH0J 41ZklOJTZ/PLsGWHHtn/F6WMm1ULUdFRVF21gO8/2aLhk8UBirYWdYsuaIlivTGnuaYY YIh88lQeInLEuQUbRwA33kZwQ0BlCk4RLxvr3jdp7DQFNnfpzoDEKZDOwwR+rXeAp7Pa loi17EGSAy9QPdyvtLg22iwTOS64TNLTFhZFyomtzqLTMaHF3B0BN6FnGobfkdYFGF8w OMcQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=ByT0Oq49; 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 t92si49950ybi.251.2018.02.01.11.01.44 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 01 Feb 2018 11:01:44 -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=ByT0Oq49; 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]:54899 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ehK7D-00015j-O0 for patch@linaro.org; Thu, 01 Feb 2018 14:01:43 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36386) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ehJz0-0003GH-Uy for qemu-devel@nongnu.org; Thu, 01 Feb 2018 13:53:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ehJyx-00005B-2n for qemu-devel@nongnu.org; Thu, 01 Feb 2018 13:53:15 -0500 Received: from mail-oi0-x242.google.com ([2607:f8b0:4003:c06::242]:39371) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ehJyw-0008WF-TZ for qemu-devel@nongnu.org; Thu, 01 Feb 2018 13:53:11 -0500 Received: by mail-oi0-x242.google.com with SMTP id j188so12763872oib.6 for ; Thu, 01 Feb 2018 10:53:10 -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 :mime-version:content-transfer-encoding; bh=CCFIuAhcQclemmYhM3440tGVuHoL7wK3dFqdoYOcAXg=; b=ByT0Oq49Z5+zCwt9PViekSi8mbrJRpNgBui4+ttv8aX+bddFyaU4+AM16eIoORFfhD LNmavacAH2qZTsh9Mpk/S/Gyi1610iwy3e1uLAH/LMaG6sRXpCzR+OP6o54rLIb4pKTW 4M0eDgKl3LeLTW53sW7YAe7HGjMbqCJUoKDkjtBO+djAXY/hmXZVx+++xEl0yBH2UllP Zzhat908T1Vjz9Hnh38X1+QeVQixm3dc+SiCsVZ8zLAOeP12hCsxglK1eCmM3VLzmmEr vNIGOum5v2OK93bAJwNoH+gJxY3tUSZbGEjGckkOXRSiEaMuuZ1DhaCilIaqvlHG4Hr7 7VWw== 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=CCFIuAhcQclemmYhM3440tGVuHoL7wK3dFqdoYOcAXg=; b=SabwIzQZGloL5THLEx+TB2Cz9PoVSZDlJ758PQo5KuOwbbRTRR/klErjgYG5mOEcqh zB35g5gvOFgLcEuvUQ5qE7QI8QVu5FvVI/7IoBdAd7IqIrFOVzYnvqKHZtVLEP3WGhgy DFpeaVLp7L2OqMQRYCR2J5mblWLWGuxPT+3VbKoTqWZqLlRp7mCCXmuFlfhmA5e7Sd+J UWjXEQ6uvp0lNTvhWxuK0iJQluT5+HTCMbzSvP9sh71sfRnNZuXGkj2GgA8rvmwcgnnh ibT6uNHw/LlBsZEjTwEboVHDPk6gF99QUnROJKOqNDfwSL9+DpIwPARLZOcb8wVysIzU DikQ== X-Gm-Message-State: AKwxytejc4UI8LhrGL7JeKyXqTYEz7TlaqjtWPh0qilIYigOiS2E9A26 lwEXkAGRBNDhJMtCphFlHg== X-Received: by 10.202.218.213 with SMTP id r204mr22861747oig.94.1517511189987; Thu, 01 Feb 2018 10:53:09 -0800 (PST) Received: from serve.minyard.net ([47.184.168.85]) by smtp.gmail.com with ESMTPSA id z42sm127536otz.43.2018.02.01.10.53.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Feb 2018 10:53:08 -0800 (PST) Received: from t430.minyard.net (t430m.minyard.net [192.168.27.3]) by serve.minyard.net (Postfix) with ESMTPA id 854CB9E7; Thu, 1 Feb 2018 12:53:06 -0600 (CST) Received: by t430.minyard.net (Postfix, from userid 1000) id B3A94300966; Thu, 1 Feb 2018 12:53:04 -0600 (CST) From: minyard@acm.org To: Peter Maydell , qemu-devel@nongnu.org Date: Thu, 1 Feb 2018 12:52:56 -0600 Message-Id: <1517511182-9944-2-git-send-email-minyard@acm.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1517511182-9944-1-git-send-email-minyard@acm.org> References: <1517511182-9944-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:4003:c06::242 Subject: [Qemu-devel] [PATCH 1/7] Add maintainer for the IPMI code 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 Acked-by: Marc-André Lureau --- MAINTAINERS | 9 +++++++++ 1 file changed, 9 insertions(+) -- 2.7.4 diff --git a/MAINTAINERS b/MAINTAINERS index fe39b30..192d8b8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -940,6 +940,15 @@ F: tests/ahci-test.c F: tests/libqos/ahci* T: git git://github.com/jnsnow/qemu.git ide +IPMI +M: Corey Minyard +S: Maintained +F: include/hw/ipmi/* +F: hw/ipmi/* +F: hw/smbios/smbios_type_38.c +F: tests/ipmi* +T: git git://github.com/cminyard/qemu.git master-ipmi-rebase + Floppy M: John Snow L: qemu-block@nongnu.org From patchwork Thu Feb 1 18:52:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Corey Minyard X-Patchwork-Id: 126582 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp1975480ljc; Thu, 1 Feb 2018 10:56:21 -0800 (PST) X-Google-Smtp-Source: AH8x227mXp15SUh5P3Y1+DT7+0XBoDaVHBr5UI/L7aCbTbbD4QvcLJ8z/GfouInW0sDTOxokfq/u X-Received: by 10.13.205.131 with SMTP id p125mr26515273ywd.3.1517511381641; Thu, 01 Feb 2018 10:56:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517511381; cv=none; d=google.com; s=arc-20160816; b=qSQkd4/CDtpEjau9eW2+XUEXGfBblIPgVznih+PEBblGwSopOwJDv0eBsNfKWxviBC cmuX24yhap7FIPw/SCjD5gSgNsdkDd9ZmhvAoCydkbGZVSAmwWKy5cevUG0rHDwbRAab DHLGnwwQEPDsjyRNesQDdPBaQyiK5+H+P/mcaQKFaIH1NETBocDhyglVH/txNXaJ+LO8 fVaouiN8BhAapLsoLaqvOroTJxUEk8Bz3JE6b4nPIbJuO3PNKL1xbgSR2iDXDtJDGoTY YmTd/vwAX9yZnTpuKA7eMX6IIeqWePL2vmenkatwxszbbOYx+nvyO4eCvua+i5wx0F9H S/1A== 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 :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=MLnDMEiGXNLnJ8nY3azyjqRx81CXcJgMOa0TSSywrj0=; b=t0tNikznJguVWhHz8jUL60DCDkPmtn4E0EYf9DFtvo6TO4Hh78nZnDaFuz2FhJhXd2 2FoqQ49xHB6YA9PBb9FiN0C3taHqEBbLM17fQVtN1wYk9S1SpByBfeT0dgnBKUgcs4zl KU7zjXp8p3+JH/qWT3hsilTlzBlMW3+jJbnrV4P6Wiq/5BewbGZN5O/7Q/nj7qwV6+7p 9uhukYriX7HozzERHo7HYP7bnGVaCBRII2uOd6eUtJkKkTYSmPG4dIOvaev65lQ+kvZZ apZHP2xS8OHRSiXPTumhSALReMMO2zW10gJnSjN2BPczVMhmrXjaTe5MSS9TDmyXi1a6 1RSQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=fzBA47/j; 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 g63si48632ywa.391.2018.02.01.10.56.21 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 01 Feb 2018 10:56:21 -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=fzBA47/j; 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]:54762 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ehK21-0005gt-36 for patch@linaro.org; Thu, 01 Feb 2018 13:56:21 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36346) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ehJyz-0003Eg-9U for qemu-devel@nongnu.org; Thu, 01 Feb 2018 13:53:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ehJyy-00008e-Jj for qemu-devel@nongnu.org; Thu, 01 Feb 2018 13:53:13 -0500 Received: from mail-ot0-x241.google.com ([2607:f8b0:4003:c0f::241]:45711) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ehJyy-00007N-Em for qemu-devel@nongnu.org; Thu, 01 Feb 2018 13:53:12 -0500 Received: by mail-ot0-x241.google.com with SMTP id 73so8756299oti.12 for ; Thu, 01 Feb 2018 10:53:12 -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 :mime-version:content-transfer-encoding; bh=MLnDMEiGXNLnJ8nY3azyjqRx81CXcJgMOa0TSSywrj0=; b=fzBA47/jdOrgPVEDC+50VBKqR784WlQfYATJspvsUBJNzCrgTCK9i5gVAl8Eeoa+T+ YGpjZY3d+Ld+7jgDgWHypD/T54wzB3FqRgqqcizyf+uvezalNNxuP+swjXcpO5m7L93+ FBM/MmrqOdAXEf394eRsqb3u0G5OMyM6uUklPr1AzeL7Fr6MPrSRG+jzrztMsamr4g1M jCMt+F7vVzp4zAAnAoIlB9YMhTVwlpUGjOIiKDIAGqNOJduWx+BR7R5nwopXHmXys1eD wE8wfrQgMy6XWbdqDA6Lfdfv1rb3VQncZa61a7a1Ic17TmAQ19OdUGYAeKW+MfL1QefK IfWQ== 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=MLnDMEiGXNLnJ8nY3azyjqRx81CXcJgMOa0TSSywrj0=; b=i6S+6S2agcdTyVrNDeIDgbxuoqJiUHr1SkfaL0Q6GpoGXiknDv7dpwKJLZVj2DV7FD UCaFcPDryenXGiaeI2C8LXVEqSsMw3s1TIu1OQYDLho+UPCddtQWQZZy8MxrvnI3p3vh hoVG7Nx+nisv7p8l97gcqt+xCvcNwTtjLaqxf9Pi4XJq7XyFIT9WM8BCYATad9E0NUyD qwpmIK7HiroIyxItHADKz9i0lQbadJFg13ria2M2oLqURXb78MBsq4g4/jh3R1nAAZQb NKS4oXJIy3i7K6m3agQq2kuf9tI5WMk0KzT1jz8b6DiW8HWwoz80fCnlo+FV8w8Z17s5 NZ6A== X-Gm-Message-State: AKwxytew12fZM/PNOkEbYa4Z/8mh1Qzqf93Oeq9y7MZyBDzydTNIRct4 MUThxMY0rlvveIUr9wlKTg== X-Received: by 10.157.41.218 with SMTP id g26mr13179904otd.375.1517511191538; Thu, 01 Feb 2018 10:53:11 -0800 (PST) Received: from serve.minyard.net (serve.minyard.net. [2001:470:b8f6:1b::1]) by smtp.gmail.com with ESMTPSA id n132sm109153oia.0.2018.02.01.10.53.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Feb 2018 10:53:08 -0800 (PST) Received: from t430.minyard.net (t430m.minyard.net [192.168.27.3]) by serve.minyard.net (Postfix) with ESMTPA id 04D4AC11; Thu, 1 Feb 2018 12:53:07 -0600 (CST) Received: by t430.minyard.net (Postfix, from userid 1000) id CC6663000A5; Thu, 1 Feb 2018 12:53:04 -0600 (CST) From: minyard@acm.org To: Peter Maydell , qemu-devel@nongnu.org Date: Thu, 1 Feb 2018 12:52:57 -0600 Message-Id: <1517511182-9944-3-git-send-email-minyard@acm.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1517511182-9944-1-git-send-email-minyard@acm.org> References: <1517511182-9944-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:4003:c0f::241 Subject: [Qemu-devel] [PATCH 2/7] ipmi: Fix SEL get/set time commands 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 The minimum message size was on the wrong commands, for getting the time it's zero and for setting the time it's 6. Signed-off-by: Corey Minyard Reviewed-by: Cédric Le Goater Reviewed-by: Marc-André Lureau --- hw/ipmi/ipmi_bmc_sim.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.7.4 diff --git a/hw/ipmi/ipmi_bmc_sim.c b/hw/ipmi/ipmi_bmc_sim.c index 277c28c..cc068f2 100644 --- a/hw/ipmi/ipmi_bmc_sim.c +++ b/hw/ipmi/ipmi_bmc_sim.c @@ -1802,8 +1802,8 @@ static const IPMICmdHandler storage_cmds[] = { [IPMI_CMD_GET_SEL_ENTRY] = { get_sel_entry, 8 }, [IPMI_CMD_ADD_SEL_ENTRY] = { add_sel_entry, 18 }, [IPMI_CMD_CLEAR_SEL] = { clear_sel, 8 }, - [IPMI_CMD_GET_SEL_TIME] = { get_sel_time, 6 }, - [IPMI_CMD_SET_SEL_TIME] = { set_sel_time }, + [IPMI_CMD_GET_SEL_TIME] = { get_sel_time }, + [IPMI_CMD_SET_SEL_TIME] = { set_sel_time, 6 }, }; static const IPMINetfn storage_netfn = { From patchwork Thu Feb 1 18:52:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Corey Minyard X-Patchwork-Id: 126579 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp1973976ljc; Thu, 1 Feb 2018 10:53:44 -0800 (PST) X-Google-Smtp-Source: AH8x226DOj2bByL/09o9IUSEC79/G4Pco5gGUHuuVylrctEkkBgNpRX5EBnu1k3qmQZMX8Qvn2Mw X-Received: by 10.37.133.12 with SMTP id w12mr17209907ybk.213.1517511224641; Thu, 01 Feb 2018 10:53:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517511224; cv=none; d=google.com; s=arc-20160816; b=YbdcnHvIYgkCWz0jwCZVH+CCoXUhOaR/NaMpIvtUdY/mA3DlU21y+SpJybQVmLYADr H4KV0Y2yRruEgxBXh0roe0Tf7jC8fiu+TTSYvZEzeD7fFnCzAgrpuKXOM88NyWPZw17R 3xcYD+da/Brw9DUcWRBmvF6yhVYW0PROuUbKiQK85PaXoASNtHEwoyagmTmTvp2D1F6o YiuTj1jYasPt4XBUXC4E6bYw/sWPwlE0Kj0I5RvD0BdQu0bdoqRtCJlyqKj9c4I2W1wq NvIBDrEGgLP+oEToJ/gwcdC3HpNFJfqP5cNx9udFNWo2zpcBZb6IJWhrVwZkmGx93iyF W83g== 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 :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=xEV6SmV/vklWlR0FbWcQCRcVYfv2IMVPXqrDvll5yxI=; b=uwqo5NVG6CRApG3rkfoRj6f5Rg6WyI4Ojnju1q/aWFp9czS+GgTSJZGcqs3hQvjyzh sa27MqJ4jjeiyl+nuHUSLKHXwU26BssPnuhg62+wHmxDsWddqZQ85vDEk9izInp7ejHa YXLiG8SqQx9JCn8B78uWYTGs0GrbY57g4q9z8aUqNR6FKhzpOkB4FfHIvH1NkaGz1HIS 2YYPxSRZ7rZ9ZfzZzpTLFye1tEELWt+HU5QF+fnuLDB6MOinbbgo6Dk5LtAMmzdgtCHT S+GjyLDTG7jPuuwfQK184KOv5+ziHKe8XfJFU+DwLmJoowLXXmlBigK+vbfnzVZrLXA/ NLzQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=DYE2iQcw; 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 h11si44306ywm.613.2018.02.01.10.53.44 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 01 Feb 2018 10:53:44 -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=DYE2iQcw; 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]:54682 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ehJzT-0003IS-Va for patch@linaro.org; Thu, 01 Feb 2018 13:53:44 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36366) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ehJz0-0003Fw-E4 for qemu-devel@nongnu.org; Thu, 01 Feb 2018 13:53:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ehJyz-0000A6-Fg for qemu-devel@nongnu.org; Thu, 01 Feb 2018 13:53:14 -0500 Received: from mail-ot0-x242.google.com ([2607:f8b0:4003:c0f::242]:45712) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ehJyz-00009R-BD for qemu-devel@nongnu.org; Thu, 01 Feb 2018 13:53:13 -0500 Received: by mail-ot0-x242.google.com with SMTP id 73so8756343oti.12 for ; Thu, 01 Feb 2018 10:53:13 -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 :mime-version:content-transfer-encoding; bh=xEV6SmV/vklWlR0FbWcQCRcVYfv2IMVPXqrDvll5yxI=; b=DYE2iQcwwpjXneKhB842DlrpNfrXwUs6VCk83c3cLEpHtV3y8mOUgtvsUo0TG7HkIV nsd2F3eljEnK7UxIJgh4hCCOcQOMYT6RfTIcN/LZ2PGRms6XVmdeLHhD4Rqfcq8pLAiS 9IK5NqWxN7H2BbwDwSi+qoow46LJX1si8QKwVTS+DDO+g4Mtw4PgrEAAlSs1GHLvNdAf owi7EfoCin/HtQ0J9+satfGlOLmuL4ruDvNe2ty1BgqEvCITM/n9tEgjlqOViokKnWyU s3XH4R3yHjwg3c88fE4PhIfKOzE8SgVdyIE/j/x5G1N01yTBmikccC/vycZLmq/YRb/q mfJw== 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=EIDu2wZU4AXkWE0gewwyEJlstBQSwFw1CZEZIx72YowLP+iNTRn9THc9Hv6mOLBSKR mE+uLLV5LEjGjY3BxDOFagypEu23PLpTmWbBmz2T3MUlxZJOthhKGziRKvQM9raUvMxi BbXARB9UlCmSbK7uYFjPBu3Y7YHmc+izQvJf9XaJGMZc/9UWwAXj63vZg6RyzACM4vV1 GsIl+jYVqPA+NxUFVW/KHWmguUQey7qXvIv1/Bc1d955XDMQPaMj4V5o9HHOKuoQ3F0R a7nXSqAFZLuV6mp09viqnf1mxXhg/Nl9fuO7Sss3TcS6t5Yl9U++4oW9OzQTHTv1ZV8r 4yvA== X-Gm-Message-State: AKwxytfh3TVN+4jmceKngkgWkNiy89L/ScVO4ZldfokZMhnThAOB4A8Y C5DSaUcypcNASflcdpRJ6w== X-Received: by 10.157.89.205 with SMTP id u13mr5895132otg.339.1517511192466; Thu, 01 Feb 2018 10:53:12 -0800 (PST) Received: from serve.minyard.net (serve.minyard.net. [2001:470:b8f6:1b::1]) by smtp.gmail.com with ESMTPSA id x4sm98221oie.41.2018.02.01.10.53.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Feb 2018 10:53:11 -0800 (PST) Received: from t430.minyard.net (t430m.minyard.net [192.168.27.3]) by serve.minyard.net (Postfix) with ESMTPA id 2ABE0D3B; Thu, 1 Feb 2018 12:53:07 -0600 (CST) Received: by t430.minyard.net (Postfix, from userid 1000) id ECE403000A6; Thu, 1 Feb 2018 12:53:04 -0600 (CST) From: minyard@acm.org To: Peter Maydell , qemu-devel@nongnu.org Date: Thu, 1 Feb 2018 12:52:58 -0600 Message-Id: <1517511182-9944-4-git-send-email-minyard@acm.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1517511182-9944-1-git-send-email-minyard@acm.org> References: <1517511182-9944-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:4003:c0f::242 Subject: [Qemu-devel] [PATCH 3/7] 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 Errors-To: qemu-devel-bounces+patch=linaro.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(-) -- 2.7.4 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); From patchwork Thu Feb 1 18:52:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Corey Minyard X-Patchwork-Id: 126581 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp1975475ljc; Thu, 1 Feb 2018 10:56:20 -0800 (PST) X-Google-Smtp-Source: AH8x226YB/hzvMXgovQuMXGV0zyOZQM956X/B69FcKRxuD8bazDY0fPQn26D7/cLHXNKnKaYU49z X-Received: by 10.13.201.65 with SMTP id l62mr25152909ywd.331.1517511380883; Thu, 01 Feb 2018 10:56:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517511380; cv=none; d=google.com; s=arc-20160816; b=GygAFxOSVYi6mIWWvjfBCFe87v3uyprBGhuDL+NglRxLTe0iwHP93VIdcRe8LIq2xJ TNCoowik02eZH8OpGGFpKJdc+8gBFPZTgKGnu9xK3v8hvlBhFzj1/Wy4TB+whR1aEJJv e+p3giOUZpkV8I0CDZJq9hpY2TfqaWfcRapUzV6sDBoE2BW1p91k0X8PGNilHS6IrYob NRVZGAvVftBGg8K4Qf2P3xIaeu5/6I3K3szrq95QNXNY2GISvkOaJT2kkRcL5Vu71Wml EkY5xfiKl9s/m9koRcdHBUNgTn/vhjBS8JQltn40maNylFVCBWu+weJuP5dl7oE/z9PY +6XA== 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 :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=789edMDauOWZHbsNILLacYVL9cPRbrYiExCSkLdLCNY=; b=bGk4GvkBiCRzF67xJLhjPKAXbKb0/zMMV3M7MWFeBvvSUhAGXYL+HgQCsYVdRgX+vq PUL1dj1zpYWCnWUQ5vvl/I5dP2wKdVQjx/a1yQfFRce4mPOE2sn4UIiTgdUmHPhhVBjY MzArtMbBZFqVGLTgf7Rymob8I/26U4pPAHK5XDGnWc7tH5vkTwI0wOhH+DF8kVVOBbA0 7QgoqGCECoGdtT0FEPZGLohfZRsL6DdGjXaBgX1a7a43r+x6k9vq80pw0XNp9nby27EB tfh15QPtlVwrXE7pmDcTx32wjrMb/Wp0zV/BqkJgV6sGwteqaWRPDVrPifroYmEaTZC1 /ssw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=ctMJtboR; 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 202si40583ywq.804.2018.02.01.10.56.20 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 01 Feb 2018 10:56:20 -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=ctMJtboR; 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]:54752 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ehK20-0005fu-5P for patch@linaro.org; Thu, 01 Feb 2018 13:56:20 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36375) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ehJz0-0003G8-MA for qemu-devel@nongnu.org; Thu, 01 Feb 2018 13:53:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ehJyv-0008Ve-MA for qemu-devel@nongnu.org; Thu, 01 Feb 2018 13:53:14 -0500 Received: from mail-ot0-x244.google.com ([2607:f8b0:4003:c0f::244]:40623) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ehJyv-0008UG-HP for qemu-devel@nongnu.org; Thu, 01 Feb 2018 13:53:09 -0500 Received: by mail-ot0-x244.google.com with SMTP id x4so17887548otg.7 for ; Thu, 01 Feb 2018 10:53:09 -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 :mime-version:content-transfer-encoding; bh=789edMDauOWZHbsNILLacYVL9cPRbrYiExCSkLdLCNY=; b=ctMJtboRUbtnpNX+ahVNy8jfKidVC2FphCKpD/iBCwRsFp7ZwsVk+1iU7/LcoqkPk7 NdefTbnPkkO9ZkV6kCYNLDPEDlGCRQrrP759nT3mWV2szUoLC7UeP3GAC5pYvrEiFOH0 s0WaTI+KyfLHXDJwaXL7EZ9wX3UENFgo43IQEZYo7+HXbzP+Xmw04a4olMshW/QtVnli +KEktBNjaS++GhyrvChgwS7ks1e063trYZWtyPMAxrnrFa20nCRY7clbWaMr2pm0XB6h WfqzxZxNiANm9vlFtdOYFN6ZeFEeD6lsvkGn52XDPnbsEh/pcDRusc0bRoq9R0xaOSmC nCEQ== 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=789edMDauOWZHbsNILLacYVL9cPRbrYiExCSkLdLCNY=; b=N6BnR88JpXHeeu0J8vwy4fsYtNRQs4GFaN2fCBEGTZMrWZjFltkLRDW3IfT+iZTNTK Zc1ABjpIhfL34/H9cuanLNp3jORK9RZGUVugyvusaB7Kosjw+TYDKMQj18MCsM4/MRg1 ElpXajjXEBsT9hrLDx/Xto26DrfUTHvzM2kzf6YS1axut+qFW25CjsNgbRKejZJZh3mY YANic1n4ztzGhYKHpS+30RBIcG01SjqTyjbDfMa6YHJu7eTFitO0x9YWIsdFo+fE5Dea 05f+7kA/buK839mXxcZws48pE5MGnNn570urUf+DSzZ93Ro0RC4cy1sbw7C8hKP2XYb0 R4CQ== X-Gm-Message-State: AKwxytdWRZuTVjHkpEC3BSp0Hodvhd2K6k7C2eSVKaQpn/Z/PPdmZxGM 7O++2/bzQOdAQaeTCMNwDQ== X-Received: by 10.157.60.51 with SMTP id q48mr8957597otc.288.1517511188247; Thu, 01 Feb 2018 10:53:08 -0800 (PST) Received: from serve.minyard.net ([47.184.168.85]) by smtp.gmail.com with ESMTPSA id u32sm125624otb.11.2018.02.01.10.53.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Feb 2018 10:53:07 -0800 (PST) Received: from t430.minyard.net (t430m.minyard.net [192.168.27.3]) by serve.minyard.net (Postfix) with ESMTPA id F2FD170A; Thu, 1 Feb 2018 12:53:05 -0600 (CST) Received: by t430.minyard.net (Postfix, from userid 1000) id 8CC9C3000A3; Thu, 1 Feb 2018 12:53:04 -0600 (CST) From: minyard@acm.org To: Peter Maydell , qemu-devel@nongnu.org Date: Thu, 1 Feb 2018 12:52:59 -0600 Message-Id: <1517511182-9944-5-git-send-email-minyard@acm.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1517511182-9944-1-git-send-email-minyard@acm.org> References: <1517511182-9944-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:4003:c0f::244 Subject: [Qemu-devel] [PATCH 4/7] ipmi: Add the platform event message command 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 This lets an event be added to the SEL as if a sensor had generated it. The OpenIPMI driver uses it for storing panic event information. Signed-off-by: Corey Minyard Reviewed-by: Cédric Le Goater --- hw/ipmi/ipmi_bmc_sim.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) -- 2.7.4 diff --git a/hw/ipmi/ipmi_bmc_sim.c b/hw/ipmi/ipmi_bmc_sim.c index a0bbfd5..e84d710 100644 --- a/hw/ipmi/ipmi_bmc_sim.c +++ b/hw/ipmi/ipmi_bmc_sim.c @@ -38,6 +38,7 @@ #define IPMI_NETFN_SENSOR_EVENT 0x04 +#define IPMI_CMD_PLATFORM_EVENT_MSG 0x02 #define IPMI_CMD_SET_SENSOR_EVT_ENABLE 0x28 #define IPMI_CMD_GET_SENSOR_EVT_ENABLE 0x29 #define IPMI_CMD_REARM_SENSOR_EVTS 0x2a @@ -1581,6 +1582,28 @@ static void set_sel_time(IPMIBmcSim *ibs, ibs->sel.time_offset = now.tv_sec - ((long) val); } +static void platform_event_msg(IPMIBmcSim *ibs, + uint8_t *cmd, unsigned int cmd_len, + RspBuffer *rsp) +{ + uint8_t event[16]; + + event[2] = 2; /* System event record */ + event[7] = cmd[2]; /* Generator ID */ + event[8] = 0; + event[9] = cmd[3]; /* EvMRev */ + event[10] = cmd[4]; /* Sensor type */ + event[11] = cmd[5]; /* Sensor number */ + event[12] = cmd[6]; /* Event dir / Event type */ + event[13] = cmd[7]; /* Event data 1 */ + event[14] = cmd[8]; /* Event data 2 */ + event[15] = cmd[9]; /* Event data 3 */ + + if (sel_add_event(ibs, event)) { + rsp_buffer_set_error(rsp, IPMI_CC_OUT_OF_SPACE); + } +} + static void set_sensor_evt_enable(IPMIBmcSim *ibs, uint8_t *cmd, unsigned int cmd_len, RspBuffer *rsp) @@ -1757,6 +1780,7 @@ static const IPMINetfn chassis_netfn = { }; static const IPMICmdHandler sensor_event_cmds[] = { + [IPMI_CMD_PLATFORM_EVENT_MSG] = { platform_event_msg, 10 }, [IPMI_CMD_SET_SENSOR_EVT_ENABLE] = { set_sensor_evt_enable, 4 }, [IPMI_CMD_GET_SENSOR_EVT_ENABLE] = { get_sensor_evt_enable, 3 }, [IPMI_CMD_REARM_SENSOR_EVTS] = { rearm_sensor_evts, 4 }, From patchwork Thu Feb 1 18:53:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corey Minyard X-Patchwork-Id: 126586 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp1980180ljc; Thu, 1 Feb 2018 11:02:20 -0800 (PST) X-Google-Smtp-Source: AH8x224xnPTA4pGb8Yah9o/ntnExxFCH36/Qxj6oehwRDRRMk+aBekcbPD/v+UypfI9ejhT2LSZT X-Received: by 10.129.32.197 with SMTP id g188mr25982470ywg.449.1517511740451; Thu, 01 Feb 2018 11:02:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517511740; cv=none; d=google.com; s=arc-20160816; b=gKkaGjLB1H1keMXcUMiBp/htweQ7bQA4D1ZbBrujXC3fpYslJIhnUlj1wQsP0OsEmi 1XVul4TOb33CVp6AVnNczYdL+Yhf0dWOM7tw1/hQYJQEg//Z7XLJhGx/WRdD3EbS1jam Rfz3I1c55olCKpqcti4PUnwC29neUCKWpZKvv3rjxuw/IWS9m9JG/n1ZzRn95hcsIbJf evuJIfHaQ0JZs3NoENe09kptggEnk9yzUMF8XWwwesLhq7EvDTZGMaAySAkORRlz0haD maBdKcy14GtO8r823Yn699gGzUpK9YG9gewTkYIeP3BsRoy/3Zf2Qqi6BaMOjTxrrcx2 qmMA== 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=LU1UnDBlgDqdo3POn9u4mRX5++9AzN/b7apq1erDnOc=; b=Z3gA4NN8ZyREXv6140Z8uopm7zZEqFTUdJfCHEONGxQomYmBxcDy74yIfTURTSNgkn ijEWspZn/Ap3yES0HkfWw89s7VTo5THkrPW3s45Y9TurP+6b0gk/CNGYRoYLDPLSMs9I 2357nh4n4wsjbt3XoasbincodU9XfmZVp+odOULORcK2UhyTfb3qpYMk2Ulo8QPGpXDy uMW4M+8uayK3WNo3Mq7fR735XRbm2YCtufZvY2c2g+AaC29TNcqo3ZYhQjCEdsOAK1qz WJFHsHFBR+8cFAZkv3EODM+/wFeZyGVaoNhOof6mW6DRXTkTgUycCwg+U1QUffag6Umo rwGQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=VLyF/UoG; 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 m133si52752ywd.41.2018.02.01.11.02.20 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 01 Feb 2018 11:02:20 -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=VLyF/UoG; 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]:54910 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ehK7n-0002Sr-Qz for patch@linaro.org; Thu, 01 Feb 2018 14:02:19 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36389) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ehJz0-0003GJ-WD for qemu-devel@nongnu.org; Thu, 01 Feb 2018 13:53:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ehJyw-0008W8-DB for qemu-devel@nongnu.org; Thu, 01 Feb 2018 13:53:15 -0500 Received: from mail-oi0-x243.google.com ([2607:f8b0:4003:c06::243]:40490) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ehJyw-0008Vp-8d for qemu-devel@nongnu.org; Thu, 01 Feb 2018 13:53:10 -0500 Received: by mail-oi0-x243.google.com with SMTP id 8so2947989oix.7 for ; Thu, 01 Feb 2018 10:53:10 -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=LU1UnDBlgDqdo3POn9u4mRX5++9AzN/b7apq1erDnOc=; b=VLyF/UoGk9hjrLd61GMofuqN0nKE5U8ODFVlpkTZQatQuhC1pqYs2urUUIqHzB7LJ6 BiDg/3vCUe2YX4yXoIVkW+mnhzy842INVCs0njGLpAkzCRw6FFInc4kh07xEdbKRaWIK XjTisZMOuHGZ5bs2Eb7TJIUg9RQkneeDO0L2lUZaFCSDk6VOoBUFsgz52nZpgZzOZ4W+ OCqHrTOTjqPLKa3gI3Qg7Eq4VfpuA4Bn9zQBYvpeSlASQvz3VVEm6gg69fBj7kl/GYUs ov3pN550cQe2U07gjOR0bB0wh8QGcaoIhO/lRWdN8jfKRMgkjgjcm5F974oTTGsgOf9D Zjyw== 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=LU1UnDBlgDqdo3POn9u4mRX5++9AzN/b7apq1erDnOc=; b=THk7tgUV7Z43DgBC+tmWUXiuD8ezr5tzRefKEW4JLGnPMlGksDvHIukI3WiwM5NsAD dbZCS3B/N/aiJ9xjl6v79ZbS6ZRdeWjAH1vaxDigQTuY+/9RcxBJx2bYFojMf1ZSfx8c 2z0CAhb9xBiiEbt6vK18Plvp3KMMSeyLMTyG27U3v2RA7reLGWMdYaF1WRVlsyXGYCZO n3ImmibYKMXoHJPT/fvIu7H5y5QtXz2bGeMolCdLKXqTMeRYZoycjePAPm7aVj9M6oxf yMV3rUdhD1EZJ2oiaFHh7NFoa6vKbVYgrEOzuPpuiqqqR8fWPN2ABR5EdCALYfo4pHdB 2Q/Q== X-Gm-Message-State: AKwxytcv4lsA0t1naDN2mVpb9kOKc09BcCp4FcqL+eegM/E+O+qUKYDf DmcsAt/CVe16W58ZIhuKNw== X-Received: by 10.202.67.138 with SMTP id q132mr23697186oia.245.1517511189195; Thu, 01 Feb 2018 10:53:09 -0800 (PST) Received: from serve.minyard.net ([47.184.168.85]) by smtp.gmail.com with ESMTPSA id c2sm88535oia.56.2018.02.01.10.53.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Feb 2018 10:53:08 -0800 (PST) Received: from t430.minyard.net (t430m.minyard.net [192.168.27.3]) by serve.minyard.net (Postfix) with ESMTPA id 383AF79A; Thu, 1 Feb 2018 12:53:06 -0600 (CST) Received: by t430.minyard.net (Postfix, from userid 1000) id 9F27B300965; Thu, 1 Feb 2018 12:53:04 -0600 (CST) From: minyard@acm.org To: Peter Maydell , qemu-devel@nongnu.org Date: Thu, 1 Feb 2018 12:53:00 -0600 Message-Id: <1517511182-9944-6-git-send-email-minyard@acm.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1517511182-9944-1-git-send-email-minyard@acm.org> References: <1517511182-9944-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:4003:c06::243 Subject: [Qemu-devel] [PATCH 5/7] ipmi: Fix macro issues 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 Macro parameters should almost always have () around them when used. llvm reported an error on this. Remove redundant parenthesis and put parenthesis around the entire macros with assignments in case they are used in an expression. The macros were doing ((v) & 1) for a binary input, but that only works if v == 0 or if v & 1. Changed to !!(v) so they work for all values. Remove some unused macros. Reported in https://bugs.launchpad.net/bugs/1651167 An audit of these changes found no semantic changes; this is just cleanups for proper style and to avoid a compiler warning. Signed-off-by: Corey Minyard Reviewed-by: Eric Blake --- hw/ipmi/isa_ipmi_bt.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) -- 2.7.4 diff --git a/hw/ipmi/isa_ipmi_bt.c b/hw/ipmi/isa_ipmi_bt.c index e098fd5..e946030 100644 --- a/hw/ipmi/isa_ipmi_bt.c +++ b/hw/ipmi/isa_ipmi_bt.c @@ -45,21 +45,21 @@ #define IPMI_BT_B2H_ATN_MASK (1 << IPMI_BT_B2H_ATN_BIT) #define IPMI_BT_GET_B2H_ATN(d) (((d) >> IPMI_BT_B2H_ATN_BIT) & 0x1) #define IPMI_BT_SET_B2H_ATN(d, v) ((d) = (((d) & ~IPMI_BT_B2H_ATN_MASK) | \ - (((v) & 1) << IPMI_BT_B2H_ATN_BIT))) + (!!(v) << IPMI_BT_B2H_ATN_BIT))) #define IPMI_BT_SMS_ATN_MASK (1 << IPMI_BT_SMS_ATN_BIT) #define IPMI_BT_GET_SMS_ATN(d) (((d) >> IPMI_BT_SMS_ATN_BIT) & 0x1) #define IPMI_BT_SET_SMS_ATN(d, v) ((d) = (((d) & ~IPMI_BT_SMS_ATN_MASK) | \ - (((v) & 1) << IPMI_BT_SMS_ATN_BIT))) + (!!(v) << IPMI_BT_SMS_ATN_BIT))) #define IPMI_BT_HBUSY_MASK (1 << IPMI_BT_HBUSY_BIT) #define IPMI_BT_GET_HBUSY(d) (((d) >> IPMI_BT_HBUSY_BIT) & 0x1) #define IPMI_BT_SET_HBUSY(d, v) ((d) = (((d) & ~IPMI_BT_HBUSY_MASK) | \ - (((v) & 1) << IPMI_BT_HBUSY_BIT))) + (!!(v) << IPMI_BT_HBUSY_BIT))) #define IPMI_BT_BBUSY_MASK (1 << IPMI_BT_BBUSY_BIT) #define IPMI_BT_SET_BBUSY(d, v) ((d) = (((d) & ~IPMI_BT_BBUSY_MASK) | \ - (((v) & 1) << IPMI_BT_BBUSY_BIT))) + (!!(v) << IPMI_BT_BBUSY_BIT))) /* Mask register */ @@ -69,12 +69,12 @@ #define IPMI_BT_B2H_IRQ_EN_MASK (1 << IPMI_BT_B2H_IRQ_EN_BIT) #define IPMI_BT_GET_B2H_IRQ_EN(d) (((d) >> IPMI_BT_B2H_IRQ_EN_BIT) & 0x1) #define IPMI_BT_SET_B2H_IRQ_EN(d, v) ((d) = (((d) & ~IPMI_BT_B2H_IRQ_EN_MASK) |\ - (((v) & 1) << IPMI_BT_B2H_IRQ_EN_BIT))) + (!!(v) << IPMI_BT_B2H_IRQ_EN_BIT))) #define IPMI_BT_B2H_IRQ_MASK (1 << IPMI_BT_B2H_IRQ_BIT) #define IPMI_BT_GET_B2H_IRQ(d) (((d) >> IPMI_BT_B2H_IRQ_BIT) & 0x1) #define IPMI_BT_SET_B2H_IRQ(d, v) ((d) = (((d) & ~IPMI_BT_B2H_IRQ_MASK) | \ - (((v) & 1) << IPMI_BT_B2H_IRQ_BIT))) + (!!(v) << IPMI_BT_B2H_IRQ_BIT))) typedef struct IPMIBT { IPMIBmc *bmc; From patchwork Thu Feb 1 18:53:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corey Minyard X-Patchwork-Id: 126580 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp1973997ljc; Thu, 1 Feb 2018 10:53:46 -0800 (PST) X-Google-Smtp-Source: AH8x227BsS/m828UNB2sppOow1o67I0lHKR6deTiSi0+yzR/HmDaW1g5VrOX5P52UCeEbuikmn9v X-Received: by 10.37.108.193 with SMTP id h184mr24702144ybc.209.1517511226018; Thu, 01 Feb 2018 10:53:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517511226; cv=none; d=google.com; s=arc-20160816; b=f8wYS5rViq7hAY7e/gYWswi8PQBY/CFfTpo+Izw9wP50/pPrHOnIGCnawkN80WMZYn RQlVDL8/4uL5AO/nCftn4xfPHWX/9n+p+lQFRaripMGWzRdKr9nOGOd7t0R+JEdxhQ9e gLiAqWXipeBQqmj13aWJu/6nwH84st79MKLrQyY9APKHfX/V3J/Wf5iq8v+jbRjBU84V o88STYG/rQkD3Mpwew8mToP14nfvUA2Rpw+soEajhOLDIrZ4VKHN3E/jBPn2gYR/3gIB uzB2nLw9u6MXj3o7DXaOW6UT7LzYMCWXsE3eAmSBiO4AMxQg/vZYOWEeOAMzC24kp8ja wRnw== 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=/QGOBcMrH4T9ElzJSxufobUIaeWa+5jws9ddCKX1n40=; b=NppknTFLqKuNbrpsoT/wVpY1NHOrANrKF0deU/vFD0ylq5tM9btvwg14xMNenGkZXy FMqI6KT4WWn2qwOK4+UdEAED5O54G3hSNVqn5A3W+AX14twU919rX4gyjr0C/fPW1c8f s5Fv51owayBENLgCRq1dt7Z9ZSls67aopC72Oba/AekilXIxVKlLZsq9IwLt6fusfwsf 6z/Q/doMyYECZPLmFkwoTbArFxLBOoPlQK81qtge5/JAfGow1wqDNhxpTAn5ZeobTaTw sK8JnV51G0nBsBPNRXvhznapTf03pMX8lvWnIWp2IL9I8d0SK46Kf7ThG+JqktkrYFkg Xgbg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=MbxNkC56; 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 q1si47745ybk.264.2018.02.01.10.53.45 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 01 Feb 2018 10:53:46 -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=MbxNkC56; 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]:54686 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ehJzV-0003Jn-Du for patch@linaro.org; Thu, 01 Feb 2018 13:53:45 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36419) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ehJz2-0003HT-Os for qemu-devel@nongnu.org; Thu, 01 Feb 2018 13:53:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ehJz0-0000B6-Am for qemu-devel@nongnu.org; Thu, 01 Feb 2018 13:53:16 -0500 Received: from mail-ot0-x243.google.com ([2607:f8b0:4003:c0f::243]:35261) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ehJz0-0000AT-6S for qemu-devel@nongnu.org; Thu, 01 Feb 2018 13:53:14 -0500 Received: by mail-ot0-x243.google.com with SMTP id a2so6527186otf.2 for ; Thu, 01 Feb 2018 10:53:14 -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=/QGOBcMrH4T9ElzJSxufobUIaeWa+5jws9ddCKX1n40=; b=MbxNkC56H836JEBNzx5R+GUNDnPjyA+Xp5+N7A7aExvJkpyEUzVWW+wMIqk4xJacqD YuY40p2ZiYune1+J/TDEI2Fg2NdYdY7QRFcugSHxxXnmif0en+mgW8NWzQpLy7mXco4F doHDkajNbdFOKiYreJxPK4v28zYXrTG5TRuYFrzsZSoYIIk/5m7KLfHqcoxPhNOCaBPz K1RlUzhPaq/9Ia0jYWgrvwa1MKy5tblOwGWWHE9lI7PNefHPfPQnpwc+vLEg1rlAOsnS dZBFhFdx0U7ryi+xDGfT1TG5q3TRw2DwSpWpXXQ2Uo0WpjrRwmWl+mue80k8rhBE9zE3 37YQ== 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=/QGOBcMrH4T9ElzJSxufobUIaeWa+5jws9ddCKX1n40=; b=q2qK5D3noivWr5dQ0qI1ksA/xLBOqlSjLOV84WncS+oTXnmWWgRRcVoW7cnzHRMefA 2hlxkBqes6HNi2ivGzKaF1+T9Op142PYyf9YmIlR69QfxVuoub5o94O9TZxbHl3i+CMh lR2yWhJZ7iaz3WNCaPr2o3U7st34H00a0TAMscCgBOluz24RivHv18MJn77OXAP41MHc AxxWyA08kWtTYAbjwyUdB1jIbz3Q1+8gyvebNsZA2OnbrU7cBViiwU8RdziHq00woO5t bihJvHQsakfLCMlof2HyIIPd9NvHFNaDEYwx4NncnYLysrhsOH20QgKoWZHLDxqKBfRa Kp3w== X-Gm-Message-State: AKwxytfmv0sUcffio4SabUHDAaUT+JoFWxt9OwAdx4wQQjhsWr238mHs cPA7pA+mB0mZ3mcIwNKPxyai5NY= X-Received: by 10.157.46.206 with SMTP id w72mr17780681ota.16.1517511193376; Thu, 01 Feb 2018 10:53:13 -0800 (PST) Received: from serve.minyard.net ([47.184.168.85]) by smtp.gmail.com with ESMTPSA id z51sm113383otd.72.2018.02.01.10.53.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Feb 2018 10:53:11 -0800 (PST) Received: from t430.minyard.net (t430m.minyard.net [192.168.27.3]) by serve.minyard.net (Postfix) with ESMTPA id 3E2B8DF4; Thu, 1 Feb 2018 12:53:07 -0600 (CST) Received: by t430.minyard.net (Postfix, from userid 1000) id 072FD300964; Thu, 1 Feb 2018 12:53:04 -0600 (CST) From: minyard@acm.org To: Peter Maydell , qemu-devel@nongnu.org Date: Thu, 1 Feb 2018 12:53:01 -0600 Message-Id: <1517511182-9944-7-git-send-email-minyard@acm.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1517511182-9944-1-git-send-email-minyard@acm.org> References: <1517511182-9944-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:4003:c0f::243 Subject: [Qemu-devel] [PATCH 6/7] ipmi: disable IRQ and ATN on an external disconnect 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 Otherwise there's no way to clear them without an external command, and it could lock the OS in the VM if they were stuck. Signed-off-by: Corey Minyard --- hw/ipmi/ipmi_bmc_extern.c | 5 +++++ 1 file changed, 5 insertions(+) -- 2.7.4 diff --git a/hw/ipmi/ipmi_bmc_extern.c b/hw/ipmi/ipmi_bmc_extern.c index 8c0535d..bf0b7ee 100644 --- a/hw/ipmi/ipmi_bmc_extern.c +++ b/hw/ipmi/ipmi_bmc_extern.c @@ -425,6 +425,11 @@ static void chr_event(void *opaque, int event) return; } ibe->connected = false; + /* + * Don't hang the OS trying to handle the ATN bit, other end will + * resend on a reconnect. + */ + k->set_atn(s, 0, 0); if (ibe->waiting_rsp) { ibe->waiting_rsp = false; ibe->inbuf[1] = ibe->outbuf[1] | 0x04; From patchwork Thu Feb 1 18:53:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Corey Minyard X-Patchwork-Id: 126583 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp1976823ljc; Thu, 1 Feb 2018 10:58:39 -0800 (PST) X-Google-Smtp-Source: AH8x227CT9E8cnjgFTh+CLBeYtqGb1aJY2Flm/r+XJ2fQzeR3btwPH2qkApfZCRxFrcqABPwp00M X-Received: by 10.129.95.87 with SMTP id t84mr25589234ywb.89.1517511519541; Thu, 01 Feb 2018 10:58:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517511519; cv=none; d=google.com; s=arc-20160816; b=jCoSDNwD+LG1WHtk7JTBo/O8H2KqMVFaMKj8VBal83avd1CNv/upa6nLso6lt0cjU/ 797R2DrTRBlkv4V5XZ4orQIaVA96+jAXpWWxAHBXPt7ardZl30tdG4YFbinSFUNb3PRf aqjrNLxfNo1qFsuiA0HBrAmxdE1Wz2Ju74ssQ4rHua3FOnYNamBsEjgvzJDLishESMId CzK9lu2Y/RBzP67iqPheWxSOseVtWByJF6y4tGHkz20OObkLchNP6O77ic7VwduF0R2y AaY8sK72bc33Ikm8qKXBmfk7aqNEjtjGh67oYPDtZFthN/PWBKEkiS5QIGASB1sUvpzr 2ydg== 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 :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=hk71D2cKmjGEt9+hv0BtowJB2yGT305RFq6k2wxJ06U=; b=iedxQzxtTU4TJ0nrDgULvPHVOmgVaPVPOx2iy6ANTryGo07/VaDL4+c7FhMX6BVEZH A/5baoNQ972HVMGbSYuIf4/wpIG51plgVISPQU3cs4hdnOmUuyZVIWXB9jSCJzKTTLS3 mV9X3A3FdJH+zu+bl5nkUgRG+1uq5DlL/vbmx693o899S/fLAFJ2GsGQkkzAX7uBYZqN +PabwiPiyI2IKkgnPLpCJTyT2L723nkDrI4SCpoPNBGLcUct+gO0KjRbHGNb1uSBH3Y4 aoeIugwBQcnr7UcluAYyxs7XQ12WiVKZXKuoy7TypZtwGDWN1ny9h9LSHddGXpbVNN9l BK5g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=vD/qse8f; 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 i3si44445ybk.480.2018.02.01.10.58.39 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 01 Feb 2018 10:58:39 -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=vD/qse8f; 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]:54768 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ehK4E-0006rq-Tk for patch@linaro.org; Thu, 01 Feb 2018 13:58:38 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36414) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ehJz2-0003H7-AO for qemu-devel@nongnu.org; Thu, 01 Feb 2018 13:53:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ehJz1-0000CA-7Q for qemu-devel@nongnu.org; Thu, 01 Feb 2018 13:53:16 -0500 Received: from mail-ot0-x244.google.com ([2607:f8b0:4003:c0f::244]:34090) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ehJz1-0000BX-2g for qemu-devel@nongnu.org; Thu, 01 Feb 2018 13:53:15 -0500 Received: by mail-ot0-x244.google.com with SMTP id x15so17899154ote.1 for ; Thu, 01 Feb 2018 10:53:14 -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 :mime-version:content-transfer-encoding; bh=hk71D2cKmjGEt9+hv0BtowJB2yGT305RFq6k2wxJ06U=; b=vD/qse8f6vx7GvBa5NRLuNmd07oRlW1omHl7Ts5w5nwfYBVtqw36gsSlCurs7hV92r xQIqpdCtUdIMW93BmBp+njOz7vtMHN87ah8s6cGTwFLmBl0ECAprGaeyW2MdKmxwYK4S ihNyZ8qaejxUs4uxOzMSGLPjwLhbb1Tyyh6r2ZSEzMzo5n6W8wymQ9pLGjYai2yQ3YLd yDsM7aO1lpOGCLRMcenMm5GqgBPCTy7ft2nS1vy+85lxjG94igGtL73txNjtSS+SEfqK TAGHbC7BAYjAPNHmp4m4zSH7R06Eb9i+ssOtKXrmkSufbmJzM3P++rqq6b8gLG6JdI6G uChA== 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=hk71D2cKmjGEt9+hv0BtowJB2yGT305RFq6k2wxJ06U=; b=GaT9ysLmQEMOI/K+GJ8R17nejpAJEHFOHLPw8uMvldM+/BmuvtD+F/q3QKa5q6G4WX GGESr6GgBPeIUirLBYlFMLar6gj0wjTzyZfSeLbm5nUoCmoxcoNus7jD3Vp5jlWFWW1V 7OSD+laFmSxX6foO1tz6Qu0BYWQvfkhD4VNhXkZjyb67DJvZ4PMxxQL48RfGsau/Njr4 YZZu1a5lEL+B10++1GhgApwmcYAPnq4S58/wcrFV4AxvNd+4oq29hy216VgHSrw5eFSn 4mfsWJn7rBoiCNhJAHl1pZ+s4izhazws0juMmiMUH1mRIJMxR0WAmOHyo8RVKs4PVusn OUuA== X-Gm-Message-State: AKwxytc+HDWMaJsV8hF+3pJKFMfkQquZGdEq1H00tuwZfInDS2v1ewdp zh4BA4WiWTaN+drKtGmVOGVdbKA= X-Received: by 10.157.66.236 with SMTP id c41mr7984012otj.382.1517511194195; Thu, 01 Feb 2018 10:53:14 -0800 (PST) Received: from serve.minyard.net (serve.minyard.net. [2001:470:b8f6:1b::1]) by smtp.gmail.com with ESMTPSA id p66sm115820oia.3.2018.02.01.10.53.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Feb 2018 10:53:11 -0800 (PST) Received: from t430.minyard.net (t430m.minyard.net [192.168.27.3]) by serve.minyard.net (Postfix) with ESMTPA id 4A798E1B; Thu, 1 Feb 2018 12:53:07 -0600 (CST) Received: by t430.minyard.net (Postfix, from userid 1000) id 21C7B300967; Thu, 1 Feb 2018 12:53:04 -0600 (CST) From: minyard@acm.org To: Peter Maydell , qemu-devel@nongnu.org Date: Thu, 1 Feb 2018 12:53:02 -0600 Message-Id: <1517511182-9944-8-git-send-email-minyard@acm.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1517511182-9944-1-git-send-email-minyard@acm.org> References: <1517511182-9944-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:4003:c0f::244 Subject: [Qemu-devel] [PATCH 7/7] 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 Reviewed-by: Marc-André Lureau --- hw/ipmi/ipmi_bmc_sim.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) -- 2.7.4 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(), };