From nobody Sat Oct 25 13:23:49 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 152141987909318.49267557277301; Sun, 18 Mar 2018 17:37:59 -0700 (PDT) Received: from localhost ([::1]:39624 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1exioB-0007t8-Pm for importer@patchew.org; Sun, 18 Mar 2018 20:37:51 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56171) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1exim6-0006Yr-4p for qemu-devel@nongnu.org; Sun, 18 Mar 2018 20:35:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1exim2-0000HO-UO for qemu-devel@nongnu.org; Sun, 18 Mar 2018 20:35:42 -0400 Received: from ozlabs.org ([103.22.144.67]:39989) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1exim2-00009M-56; Sun, 18 Mar 2018 20:35:38 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 404HCl3rLkz9sWB; Mon, 19 Mar 2018 11:35:31 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1521419731; bh=SvtA6ciWpPXXUOc/pYroiYW0it2wWCb2cmarytnqp54=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Pat8ZRk93FfTzxwqkrRWo++EUdO1Xnjv3pycjmneU1iTUuf8F5cYnjZKsBDkr8oXf 8k9ZQOoW6Oc+c6vtPD/p6p6twgBItacQsUqE7h+KANImrm8rWt2xLpB71mDE+Mu5oP 7ZKZl7ayLAklxYF9kCzvXczqTyRYAmxCt92+KctE= From: David Gibson To: peter.maydell@linaro.org Date: Mon, 19 Mar 2018 11:35:17 +1100 Message-Id: <20180319003524.28143-2-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180319003524.28143-1-david@gibson.dropbear.id.au> References: <20180319003524.28143-1-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 103.22.144.67 Subject: [Qemu-devel] [PULL 1/8] sii3112: Remove unneeded exit function 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: lvivier@redhat.com, surajjs@au1.ibm.com, qemu-devel@nongnu.org, groug@kaod.org, qemu-ppc@nongnu.org, David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: BALATON Zoltan An exit function was mistakenly left here but it's not needed because the PCI bars are organised differently in this device. Calling this exit function during device_del was causing an abort with memory_region_del_subregion: `Assertion subregion->container =3D=3D mr' fai= led. Reported-by: Thomas Huth Signed-off-by: BALATON Zoltan Signed-off-by: David Gibson --- hw/ide/sii3112.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/hw/ide/sii3112.c b/hw/ide/sii3112.c index e3896c65b4..743a50ed51 100644 --- a/hw/ide/sii3112.c +++ b/hw/ide/sii3112.c @@ -327,17 +327,6 @@ static void sii3112_pci_realize(PCIDevice *dev, Error = **errp) qemu_register_reset(sii3112_reset, s); } =20 -static void sii3112_pci_exitfn(PCIDevice *dev) -{ - PCIIDEState *d =3D PCI_IDE(dev); - int i; - - for (i =3D 0; i < 2; ++i) { - memory_region_del_subregion(&d->bmdma_bar, &d->bmdma[i].extra_io); - memory_region_del_subregion(&d->bmdma_bar, &d->bmdma[i].addr_iopor= t); - } -} - static void sii3112_pci_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); @@ -348,7 +337,6 @@ static void sii3112_pci_class_init(ObjectClass *klass, = void *data) pd->class_id =3D PCI_CLASS_STORAGE_RAID; pd->revision =3D 1; pd->realize =3D sii3112_pci_realize; - pd->exit =3D sii3112_pci_exitfn; dc->desc =3D "SiI3112A SATA controller"; set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); } --=20 2.14.3