From patchwork Fri Mar 2 15:26:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corey Minyard X-Patchwork-Id: 10255005 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 55D2B6037F for ; Fri, 2 Mar 2018 15:28:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 40909288CE for ; Fri, 2 Mar 2018 15:28:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3573728902; Fri, 2 Mar 2018 15:28:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B0DC5288CE for ; Fri, 2 Mar 2018 15:28:00 +0000 (UTC) Received: from localhost ([::1]:35916 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ermbH-0005yB-ST for patchwork-qemu-devel@patchwork.kernel.org; Fri, 02 Mar 2018 10:27:59 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58006) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ermaB-00051f-G6 for qemu-devel@nongnu.org; Fri, 02 Mar 2018 10:26:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1erma8-0005Lt-AI for qemu-devel@nongnu.org; Fri, 02 Mar 2018 10:26:51 -0500 Received: from mail-oi0-x241.google.com ([2607:f8b0:4003:c06::241]:33857) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1erma8-0005Lg-4W for qemu-devel@nongnu.org; Fri, 02 Mar 2018 10:26:48 -0500 Received: by mail-oi0-x241.google.com with SMTP id c83so7288615oib.1 for ; Fri, 02 Mar 2018 07:26:48 -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=xW43wuybE/Gh5PTxm4i4/rWSx+RsfVayvLsI/2XKrvQ=; b=Rvy94dPybDhsFHxYMRJ/HGCuU2VgYHKdT2NP0F2REUH1f7ZsLOxCvo3hlE4WFbz4dl ecI+KMrlRQmG5KGg/4O4Ww2WahmkiL/a0FXVbl2CwKS8t9pr6tO7BaJ63s22iI4HPniG wiwfbZxxfr4jhNkypMe+8M2ojE+Xh/GZhEdXPc+anIG2+rryNR6ETp6aFN9YANueFitC die8+NZaHsXUrr27y3OeHIDuL0SDz1GUmJkWgGrQS/zvQcV4//GRafoZZV/SSDTlUkh/ XGWlnfVbm/KX12aqrp3hLuW8/XuSbF1ykccRvSlYXYQARTT0/hv37PaMFucjI+H911eW vgBg== 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=xW43wuybE/Gh5PTxm4i4/rWSx+RsfVayvLsI/2XKrvQ=; b=Np6bHjSALXLFsFml582F85OJ57F06njdM+6Vps7kzqHvRnPXEiag+VCfY6b19hQyvP UWn9lnWkRY85wKqHXKi9x5duhla/NRlSs9fFIivnqxzhvS4O03lkrNyPSoIy8FmrM2Ei j/myLeQM23xe7VV0+tV9P2PcVINH92WH+TiADYBNVsbpv9ceOq4p2/dgVMArr4lafJKv JwjAsLDFFlp830cLqU3wpH2iF41uXIn0h9GxShIbFLTBCl0fuVMJHJJstljNYG/VvDpx g9s6SHCDYq7KAGDYxTqonGJwYWH2L4R92w5i47mDJGUlqI/tweyJNYBKPjyZOfMabbx5 mUnQ== X-Gm-Message-State: AElRT7GJaR2k5OlPoDAFHxVEV0aDxa2/KbEMSIX4uVINTK1HdBf9Co2m OirK1kc9NrUZiFSqKqiiMQ== X-Google-Smtp-Source: AG47ELsuyec6XFU2jB4IbxPspcDx54MUY4wUIo2kscZbBrxvCnQUHboHLRfTTL6/6REqICPNXcpY2w== X-Received: by 10.202.208.92 with SMTP id h89mr3777371oig.126.1520004407301; Fri, 02 Mar 2018 07:26:47 -0800 (PST) Received: from serve.minyard.net ([47.184.168.85]) by smtp.gmail.com with ESMTPSA id d143sm3357101oih.46.2018.03.02.07.26.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Mar 2018 07:26:44 -0800 (PST) Received: from t430.minyard.net (t430m.minyard.net [192.168.27.3]) by serve.minyard.net (Postfix) with ESMTPA id 31115966; Fri, 2 Mar 2018 09:26:43 -0600 (CST) Received: by t430.minyard.net (Postfix, from userid 1000) id 6E1773000A9; Fri, 2 Mar 2018 09:26:42 -0600 (CST) From: minyard@acm.org To: qemu-devel@nongnu.org, Peter Maydell Date: Fri, 2 Mar 2018 09:26:37 -0600 Message-Id: <1520004397-28521-3-git-send-email-minyard@acm.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1520004397-28521-1-git-send-email-minyard@acm.org> References: <1520004397-28521-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::241 Subject: [Qemu-devel] [PATCH v2 2/2] ipmi: Use proper struct reference for BT vmstate 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 , "Dr . David Alan Gilbert" Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Corey Minyard The vmstate for isa_ipmi_bt was referencing into the bt structure, instead create a bt structure separate and use that. The version 1 of the BT transfer was fairly broken, if a migration occured during an IPMI operation, it is likely the migration would be corrupted because I misunderstood the VMSTATE_VBUFFER_UINT32() handling, I thought it handled transferring the length field, too. So I just remove support for that. I doubt anyone is using it at this point. This also removes the transfer of use_irq, since that should come from configuration. Signed-off-by: Corey Minyard Cc: Dr. David Alan Gilbert Reviewed-by: Dr. David Alan Gilbert --- hw/ipmi/isa_ipmi_bt.c | 61 ++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 48 insertions(+), 13 deletions(-) diff --git a/hw/ipmi/isa_ipmi_bt.c b/hw/ipmi/isa_ipmi_bt.c index e946030..b64dce2 100644 --- a/hw/ipmi/isa_ipmi_bt.c +++ b/hw/ipmi/isa_ipmi_bt.c @@ -450,22 +450,57 @@ static void isa_ipmi_bt_realize(DeviceState *dev, Error **errp) isa_register_ioport(isadev, &iib->bt.io, iib->bt.io_base); } -static const VMStateDescription vmstate_ISAIPMIBTDevice = { - .name = TYPE_IPMI_INTERFACE, +static int ipmi_bt_vmstate_post_load(void *opaque, int version) +{ + IPMIBT *ib = opaque; + + /* Make sure all the values are sane. */ + if (ib->outpos >= MAX_IPMI_MSG_SIZE || ib->outlen >= MAX_IPMI_MSG_SIZE || + ib->outpos >= ib->outlen) { + ib->outpos = 0; + ib->outlen = 0; + } + + if (ib->inlen >= MAX_IPMI_MSG_SIZE) { + ib->inlen = 0; + } + + return 0; +} + +const VMStateDescription vmstate_IPMIBT = { + .name = TYPE_IPMI_INTERFACE_PREFIX "bt", .version_id = 1, .minimum_version_id = 1, + .post_load = ipmi_bt_vmstate_post_load, + .fields = (VMStateField[]) { + VMSTATE_BOOL(obf_irq_set, IPMIBT), + VMSTATE_BOOL(atn_irq_set, IPMIBT), + VMSTATE_BOOL(irqs_enabled, IPMIBT), + VMSTATE_UINT32(outpos, IPMIBT), + VMSTATE_UINT32(outlen, IPMIBT), + VMSTATE_UINT8_ARRAY(outmsg, IPMIBT, MAX_IPMI_MSG_SIZE), + VMSTATE_UINT32(inlen, IPMIBT), + VMSTATE_UINT8_ARRAY(inmsg, IPMIBT, MAX_IPMI_MSG_SIZE), + VMSTATE_UINT8(control_reg, IPMIBT), + VMSTATE_UINT8(mask_reg, IPMIBT), + VMSTATE_UINT8(waiting_rsp, IPMIBT), + VMSTATE_UINT8(waiting_seq, IPMIBT), + VMSTATE_END_OF_LIST() + } +}; + +static const VMStateDescription vmstate_ISAIPMIBTDevice = { + .name = TYPE_IPMI_INTERFACE_PREFIX "isa-bt", + .version_id = 2, + .minimum_version_id = 2, + /* + * Version 1 had messed up the array transfer, it's not even usable + * because it used VMSTATE_VBUFFER_UINT32, but it did not transfer + * the buffer length, so random things would happen. + */ .fields = (VMStateField[]) { - VMSTATE_BOOL(bt.obf_irq_set, ISAIPMIBTDevice), - VMSTATE_BOOL(bt.atn_irq_set, ISAIPMIBTDevice), - VMSTATE_BOOL(bt.use_irq, ISAIPMIBTDevice), - VMSTATE_BOOL(bt.irqs_enabled, ISAIPMIBTDevice), - VMSTATE_UINT32(bt.outpos, ISAIPMIBTDevice), - VMSTATE_VBUFFER_UINT32(bt.outmsg, ISAIPMIBTDevice, 1, NULL, bt.outlen), - VMSTATE_VBUFFER_UINT32(bt.inmsg, ISAIPMIBTDevice, 1, NULL, bt.inlen), - VMSTATE_UINT8(bt.control_reg, ISAIPMIBTDevice), - VMSTATE_UINT8(bt.mask_reg, ISAIPMIBTDevice), - VMSTATE_UINT8(bt.waiting_rsp, ISAIPMIBTDevice), - VMSTATE_UINT8(bt.waiting_seq, ISAIPMIBTDevice), + VMSTATE_STRUCT(bt, ISAIPMIBTDevice, 1, vmstate_IPMIBT, IPMIBT), VMSTATE_END_OF_LIST() } };