From nobody Sat May 18 21:15:57 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1615620289; cv=none; d=zohomail.com; s=zohoarc; b=VNIsYZmNBAvSSydbCsc7WOU6Rut7lhMx4H4NaREvdT/xCmI8/jck8tuggLDZmDXe01vfclCoRsWTV5xlXNDYhmneXpON+E8W7ETHmtA3H6dMqAW/X1ZUtmOiNhU7gn6xaZy/vYU9mUjepGWe2ntSMIVDvCAwif4Eyur5Bykq1G0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615620289; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=AgTCVE/C7+l6eI71DNp84c1Ju7HyTuadQcpb6BRDtqI=; b=IFK0zhBd0ZXgsCYy//L7GbkTdQ9cBtjao+6CE4KwmDXvWi6ZPHSdNeAQ/S/3vhgmrLERMQgI0VViRsHxw9LsDdQ0FgsGXiKrln6ZbnK/EcUBFjyUUjLamnadFsPQM+qR6tgfR3nOLAJeef6u4lOkpaGWOzKLrcNwCLW2sEzaM3A= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1615620289694987.1446037968765; Fri, 12 Mar 2021 23:24:49 -0800 (PST) Received: from localhost ([::1]:48344 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lKydj-0003W9-Tn for importer@patchew.org; Sat, 13 Mar 2021 02:24:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44824) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lKyci-00028l-6A for qemu-devel@nongnu.org; Sat, 13 Mar 2021 02:23:44 -0500 Received: from us-smtp-delivery-44.mimecast.com ([205.139.111.44]:38797) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lKycg-00060U-G5 for qemu-devel@nongnu.org; Sat, 13 Mar 2021 02:23:43 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-466-9H3O9TcfPCWTf8_Gb9BimA-1; Sat, 13 Mar 2021 02:23:35 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B966018460E4; Sat, 13 Mar 2021 07:23:33 +0000 (UTC) Received: from bahia.lan (ovpn-113-236.ams2.redhat.com [10.36.113.236]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6D21760657; Sat, 13 Mar 2021 07:23:32 +0000 (UTC) X-MC-Unique: 9H3O9TcfPCWTf8_Gb9BimA-1 Subject: [PATCH] spapr: Assert DIMM unplug state in spapr_memory_unplug() From: Greg Kurz To: qemu-devel@nongnu.org Date: Sat, 13 Mar 2021 08:23:31 +0100 Message-ID: <161562021166.948373.15092876234470478331.stgit@bahia.lan> User-Agent: StGit/0.21 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: kaod.org Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: softfail client-ip=205.139.111.44; envelope-from=groug@kaod.org; helo=us-smtp-delivery-44.mimecast.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_SOFTFAIL=0.665 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Henrique Barboza , qemu-ppc@nongnu.org, David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" spapr_memory_unplug() is the last step of the hot unplug sequence. It is indirectly called by: spapr_lmb_release() hotplug_handler_unplug() and spapr_lmb_release() already buys us that DIMM unplug state is present : it gets restored with spapr_recover_pending_dimm_state() if missing. g_assert() that spapr_pending_dimm_unplugs_find() cannot return NULL in spapr_memory_unplug() to make this clear and silence Coverity. Fixes: Coverity CID 1450767 Signed-off-by: Greg Kurz Reviewed-by: Daniel Henrique Barboza --- hw/ppc/spapr.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index d56418ca2942..73a06df3b1b1 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -3660,6 +3660,9 @@ static void spapr_memory_unplug(HotplugHandler *hotpl= ug_dev, DeviceState *dev) SpaprMachineState *spapr =3D SPAPR_MACHINE(hotplug_dev); SpaprDimmState *ds =3D spapr_pending_dimm_unplugs_find(spapr, PC_DIMM(= dev)); =20 + /* We really shouldn't get this far without anything to unplug */ + g_assert(ds); + pc_dimm_unplug(PC_DIMM(dev), MACHINE(hotplug_dev)); qdev_unrealize(dev); spapr_pending_dimm_unplugs_remove(spapr, ds);